diff options
| author | Joe Crayne <joe@jerkface.net> | 2019-06-11 02:21:46 -0400 |
|---|---|---|
| committer | Joe Crayne <joe@jerkface.net> | 2019-06-11 02:21:46 -0400 |
| commit | d866df206e703854cfa95e6aabe3ed5ed3bfbcaa (patch) | |
| tree | 3beb584ce3a21c8df2bb11e6780c8867a1960b82 /src/Graphics/WaveFront/Parse/OBJ.hs | |
| parent | 254c7813344075b6a2c915d9724a5e7a18091b87 (diff) | |
Fixed Sundqvist v and vt parsing.
Diffstat (limited to 'src/Graphics/WaveFront/Parse/OBJ.hs')
| -rw-r--r-- | src/Graphics/WaveFront/Parse/OBJ.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Graphics/WaveFront/Parse/OBJ.hs b/src/Graphics/WaveFront/Parse/OBJ.hs index 37aa5a0..69cce47 100644 --- a/src/Graphics/WaveFront/Parse/OBJ.hs +++ b/src/Graphics/WaveFront/Parse/OBJ.hs | |||
| @@ -139,12 +139,12 @@ normal = OBJNormal <$> point3D | |||
| 139 | 139 | ||
| 140 | -- | Two coordinates, separated by whitespace | 140 | -- | Two coordinates, separated by whitespace |
| 141 | texcoord :: (Fractional f) => Atto.Parser (OBJToken f Text i m) | 141 | texcoord :: (Fractional f) => Atto.Parser (OBJToken f Text i m) |
| 142 | texcoord = OBJTexCoord <$> point2D | 142 | texcoord = OBJTexCoord <$> pointTo3 1 0.0 |
| 143 | 143 | ||
| 144 | 144 | ||
| 145 | -- | Three coordinates, separated by whitespace | 145 | -- | Three coordinates, separated by whitespace |
| 146 | vertex :: (Fractional f) => Atto.Parser (OBJToken f s i m) | 146 | vertex :: (Fractional f) => Atto.Parser (OBJToken f s i m) |
| 147 | vertex = OBJVertex <$> point3D | 147 | vertex = OBJVertex <$> pointTo4 3 1.0 |
| 148 | 148 | ||
| 149 | 149 | ||
| 150 | -- | Object names, separated by whitespace | 150 | -- | Object names, separated by whitespace |
| @@ -170,4 +170,4 @@ lib = LibMTL <$> (space *> name) | |||
| 170 | 170 | ||
| 171 | -- | An MTL material name | 171 | -- | An MTL material name |
| 172 | use :: Atto.Parser (OBJToken f Text i m) | 172 | use :: Atto.Parser (OBJToken f Text i m) |
| 173 | use = UseMTL <$> (space *> name) \ No newline at end of file | 173 | use = UseMTL <$> (space *> name) |