From f72f1d38e940647381bdfc380b9b7f25ee9a117d Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Tue, 11 Jun 2019 04:10:57 -0400 Subject: Add parameter coords to WavefrontOBJ. --- src/Codec/Wavefront/Object.hs | 3 +++ src/Codec/Wavefront/TexCoord.hs | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Codec/Wavefront/Object.hs b/src/Codec/Wavefront/Object.hs index 15557fe..bdd756f 100644 --- a/src/Codec/Wavefront/Object.hs +++ b/src/Codec/Wavefront/Object.hs @@ -30,6 +30,8 @@ data WavefrontOBJ = WavefrontOBJ { , objTexCoords :: Vector TexCoord -- |Normals. , objNormals :: Vector Normal + -- |Parameter-space coordinates. + , objParamCoords :: Vector ParamCoord -- |Points. , objPoints :: Vector (Element Point) -- |Lines. @@ -45,6 +47,7 @@ ctxtToWavefrontOBJ ctxt = WavefrontOBJ { objLocations = fromDList (ctxtLocations ctxt) , objTexCoords = fromDList (ctxtTexCoords ctxt) , objNormals = fromDList (ctxtNormals ctxt) + , objParamCoords = fromDList (ctxtParamCoords ctxt) , objPoints = fromDList (ctxtPoints ctxt) , objLines = fromDList (ctxtLines ctxt) , objFaces = fromDList (ctxtFaces ctxt) diff --git a/src/Codec/Wavefront/TexCoord.hs b/src/Codec/Wavefront/TexCoord.hs index 0eb09f4..000ed06 100644 --- a/src/Codec/Wavefront/TexCoord.hs +++ b/src/Codec/Wavefront/TexCoord.hs @@ -35,8 +35,8 @@ data TexCoord = TexCoord { -- -- That type is strict and unboxed. data ParamCoord = ParamCoord { - paramcoordR :: {-# UNPACK #-} !Float - , paramcoordS :: {-# UNPACK #-} !Float - , paramcoordT :: {-# UNPACK #-} !Float + paramcoordU :: {-# UNPACK #-} !Float + , paramcoordV :: {-# UNPACK #-} !Float + , paramcoordW :: {-# UNPACK #-} !Float } deriving (Eq,Show) -- cgit v1.2.3