diff options
Diffstat (limited to 'src/Graphics/WaveFront/Parse/Common.hs')
-rw-r--r-- | src/Graphics/WaveFront/Parse/Common.hs | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/Graphics/WaveFront/Parse/Common.hs b/src/Graphics/WaveFront/Parse/Common.hs index bfeb2d8..1554d45 100644 --- a/src/Graphics/WaveFront/Parse/Common.hs +++ b/src/Graphics/WaveFront/Parse/Common.hs | |||
@@ -33,10 +33,11 @@ module Graphics.WaveFront.Parse.Common where | |||
33 | -- We'll need these | 33 | -- We'll need these |
34 | -------------------------------------------------------------------------------------------------------------------------------------------- | 34 | -------------------------------------------------------------------------------------------------------------------------------------------- |
35 | import Data.Text (Text, pack) | 35 | import Data.Text (Text, pack) |
36 | import Data.Maybe | ||
36 | import qualified Data.Attoparsec.Text as Atto | 37 | import qualified Data.Attoparsec.Text as Atto |
37 | 38 | ||
38 | import Control.Applicative (pure, liftA2, (<$>), (<*>), (<*), (*>), (<|>)) | 39 | import Control.Applicative (pure, liftA2, (<$>), (<*>), (<*), (*>), (<|>)) |
39 | import Linear (V2(..), V3(..)) | 40 | import Linear (V2(..), V3(..),V4(..)) |
40 | 41 | ||
41 | import Graphics.WaveFront.Types | 42 | import Graphics.WaveFront.Types |
42 | 43 | ||
@@ -151,6 +152,20 @@ point2D :: Fractional f => Atto.Parser (V2 f) | |||
151 | point2D = V2 <$> coord <*> coord | 152 | point2D = V2 <$> coord <*> coord |
152 | 153 | ||
153 | 154 | ||
155 | pointTo3 :: Fractional f => Int -> f -> Atto.Parser (V3 f) | ||
156 | pointTo3 3 def = V3 <$> coord <*> coord <*> coord | ||
157 | pointTo3 2 def = V3 <$> coord <*> coord <*> (fromMaybe def <$> optional coord) | ||
158 | pointTo3 1 def = (\x m -> case m of { Just (y,z) -> V3 x y z; Nothing -> V3 x def def }) | ||
159 | <$> coord <*> optional ( do y <- coord | ||
160 | z <- fromMaybe def <$> optional coord | ||
161 | return (y,z) ) | ||
162 | pointTo3 0 def = fromMaybe (V3 def def def) <$> optional (pointTo3 1 def) | ||
163 | |||
164 | |||
165 | pointTo4 :: Fractional f => Int -> f -> Atto.Parser (V4 f) | ||
166 | pointTo4 4 def = V4 <$> coord <*> coord <*> coord <*> coord | ||
167 | pointTo4 n def = (\(V3 x y z) mw -> V4 x y z $ fromMaybe def mw) <$> pointTo3 n def <*> optional coord | ||
168 | |||
154 | -- | | 169 | -- | |
155 | clamp :: Ord n => n -> n -> n -> Atto.Parser n | 170 | clamp :: Ord n => n -> n -> n -> Atto.Parser n |
156 | clamp lower upper n | 171 | clamp lower upper n |
@@ -163,4 +178,4 @@ clamp lower upper n | |||
163 | -- | | 178 | -- | |
164 | -- TODO | - Clean up and generalise | 179 | -- TODO | - Clean up and generalise |
165 | clamped :: Integral i => i -> i -> Atto.Parser i | 180 | clamped :: Integral i => i -> i -> Atto.Parser i |
166 | clamped lower upper = Atto.decimal >>= clamp lower upper \ No newline at end of file | 181 | clamped lower upper = Atto.decimal >>= clamp lower upper |