diff options
| author | Joe Crayne <joe@jerkface.net> | 2019-07-24 12:39:57 -0400 |
|---|---|---|
| committer | Joe Crayne <joe@jerkface.net> | 2019-07-24 12:39:57 -0400 |
| commit | b79975c689f7c84e39c6ca326e93c58857ac6c37 (patch) | |
| tree | 4c601ea020dbc020984bc7f4f222850500762311 /LoadMesh.hs | |
| parent | 6f8fc2ca99d1943977697920940d4bcadaef0374 (diff) | |
Brighter cube colors.
Diffstat (limited to 'LoadMesh.hs')
| -rw-r--r-- | LoadMesh.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LoadMesh.hs b/LoadMesh.hs index d8ce42b..aaf0e06 100644 --- a/LoadMesh.hs +++ b/LoadMesh.hs | |||
| @@ -48,7 +48,7 @@ relativeFrom path file = takeDirectory path </> file | |||
| 48 | 48 | ||
| 49 | loadOBJ :: String -> IO (Either String MeshData) | 49 | loadOBJ :: String -> IO (Either String MeshData) |
| 50 | loadOBJ fname = L.readFile fname >>= \bs -> do | 50 | loadOBJ fname = L.readFile fname >>= \bs -> do |
| 51 | let obj@OBJ{..} = parse bs | 51 | let obj@OBJ{..} = Wavefront.parse bs |
| 52 | -- load materials | 52 | -- load materials |
| 53 | mtlLib <- mapM (readMtlWithFallback . relativeFrom fname . unpack) objMtlLibs | 53 | mtlLib <- mapM (readMtlWithFallback . relativeFrom fname . unpack) objMtlLibs |
| 54 | return $ Right (objToMesh obj,(mtlLib,fname)) | 54 | return $ Right (objToMesh obj,(mtlLib,fname)) |