diff options
Diffstat (limited to 'src/Codec/Wavefront/Object.hs')
-rw-r--r-- | src/Codec/Wavefront/Object.hs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/Codec/Wavefront/Object.hs b/src/Codec/Wavefront/Object.hs index 26d85c2..65c062e 100644 --- a/src/Codec/Wavefront/Object.hs +++ b/src/Codec/Wavefront/Object.hs | |||
@@ -13,6 +13,7 @@ module Codec.Wavefront.Object where | |||
13 | 13 | ||
14 | import Codec.Wavefront.Element | 14 | import Codec.Wavefront.Element |
15 | import Codec.Wavefront.Face | 15 | import Codec.Wavefront.Face |
16 | import Codec.Wavefront.FreeForm | ||
16 | import Codec.Wavefront.Lexer ( Ctxt(..) ) | 17 | import Codec.Wavefront.Lexer ( Ctxt(..) ) |
17 | import Codec.Wavefront.Line | 18 | import Codec.Wavefront.Line |
18 | import Codec.Wavefront.Location | 19 | import Codec.Wavefront.Location |
@@ -38,6 +39,12 @@ data WavefrontOBJ = WavefrontOBJ { | |||
38 | , objLines :: Vector (Element Line) | 39 | , objLines :: Vector (Element Line) |
39 | -- |Faces. | 40 | -- |Faces. |
40 | , objFaces :: Vector (Element Face) | 41 | , objFaces :: Vector (Element Face) |
42 | -- |Curves. | ||
43 | , objCurves :: Vector (Element Curve) | ||
44 | -- |Curves on surfaces. | ||
45 | , objEmbeddedCurves :: Vector (Element EmbeddedCurve) | ||
46 | -- |Surfaces. | ||
47 | , objSurfaces :: Vector (Element Surface) | ||
41 | -- |Material libraries. | 48 | -- |Material libraries. |
42 | , objMtlLibs :: Vector Text | 49 | , objMtlLibs :: Vector Text |
43 | } deriving (Eq,Show) | 50 | } deriving (Eq,Show) |
@@ -51,6 +58,9 @@ ctxtToWavefrontOBJ ctxt = WavefrontOBJ { | |||
51 | , objPoints = fromDList (ctxtPoints ctxt) | 58 | , objPoints = fromDList (ctxtPoints ctxt) |
52 | , objLines = fromDList (ctxtLines ctxt) | 59 | , objLines = fromDList (ctxtLines ctxt) |
53 | , objFaces = fromDList (ctxtFaces ctxt) | 60 | , objFaces = fromDList (ctxtFaces ctxt) |
61 | , objCurves = fromDList (ctxtCurves ctxt) | ||
62 | , objEmbeddedCurves = fromDList (ctxtEmbeddedCurves ctxt) | ||
63 | , objSurfaces = fromDList (ctxtSurfaces ctxt) | ||
54 | , objMtlLibs = fromDList (ctxtMtlLibs ctxt) | 64 | , objMtlLibs = fromDList (ctxtMtlLibs ctxt) |
55 | } | 65 | } |
56 | 66 | ||