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 | |
parent | 6f8fc2ca99d1943977697920940d4bcadaef0374 (diff) |
Brighter cube colors.
-rw-r--r-- | LoadMesh.hs | 2 | ||||
-rw-r--r-- | cube.mtl | 4 | ||||
-rw-r--r-- | cube.obj | 1 |
3 files changed, 4 insertions, 3 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)) |
@@ -6,7 +6,7 @@ newmtl logo | |||
6 | Tf 1.0000 1.0000 1.0000 | 6 | Tf 1.0000 1.0000 1.0000 |
7 | illum 2 | 7 | illum 2 |
8 | Ka 0.0000 0.0000 0.0000 | 8 | Ka 0.0000 0.0000 0.0000 |
9 | Kd 0.5880 0.5880 0.5880 | 9 | Kd 0.8880 0.8880 0.8880 |
10 | Ks 0.0000 0.0000 0.0000 | 10 | Ks 0.0000 0.0000 0.0000 |
11 | Ke 0.0000 0.0000 0.0000 | 11 | Ke 0.0000 0.0000 0.0000 |
12 | map_Ka logo.png | 12 | map_Ka logo.png |
@@ -20,7 +20,7 @@ newmtl grid | |||
20 | Tf 1.0000 1.0000 1.0000 | 20 | Tf 1.0000 1.0000 1.0000 |
21 | illum 2 | 21 | illum 2 |
22 | Ka 0.0000 0.0000 0.0000 | 22 | Ka 0.0000 0.0000 0.0000 |
23 | Kd 0.5880 0.5880 0.5880 | 23 | Kd 0.8880 0.8880 0.8880 |
24 | Ks 0.0000 0.0000 0.0000 | 24 | Ks 0.0000 0.0000 0.0000 |
25 | Ke 0.0000 0.0000 0.0000 | 25 | Ke 0.0000 0.0000 0.0000 |
26 | map_Ka UV_Grid_Sm.jpg | 26 | map_Ka UV_Grid_Sm.jpg |
@@ -44,5 +44,6 @@ s 5 | |||
44 | f 2/1/5 8/2/5 4/3/5 | 44 | f 2/1/5 8/2/5 4/3/5 |
45 | f 4/3/5 8/2/5 6/4/5 | 45 | f 4/3/5 8/2/5 6/4/5 |
46 | s 6 | 46 | s 6 |
47 | g left-side | ||
47 | f 7/1/6 1/2/6 5/3/6 | 48 | f 7/1/6 1/2/6 5/3/6 |
48 | f 5/3/6 1/2/6 3/4/6 | 49 | f 5/3/6 1/2/6 3/4/6 |