summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Crayne <joe@jerkface.net>2019-07-24 12:39:57 -0400
committerJoe Crayne <joe@jerkface.net>2019-07-24 12:39:57 -0400
commitb79975c689f7c84e39c6ca326e93c58857ac6c37 (patch)
tree4c601ea020dbc020984bc7f4f222850500762311
parent6f8fc2ca99d1943977697920940d4bcadaef0374 (diff)
Brighter cube colors.
-rw-r--r--LoadMesh.hs2
-rw-r--r--cube.mtl4
-rw-r--r--cube.obj1
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
49loadOBJ :: String -> IO (Either String MeshData) 49loadOBJ :: String -> IO (Either String MeshData)
50loadOBJ fname = L.readFile fname >>= \bs -> do 50loadOBJ 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))
diff --git a/cube.mtl b/cube.mtl
index 470f397..b27c4ac 100644
--- a/cube.mtl
+++ b/cube.mtl
@@ -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
diff --git a/cube.obj b/cube.obj
index 21aeeac..8dd8ae8 100644
--- a/cube.obj
+++ b/cube.obj
@@ -44,5 +44,6 @@ s 5
44f 2/1/5 8/2/5 4/3/5 44f 2/1/5 8/2/5 4/3/5
45f 4/3/5 8/2/5 6/4/5 45f 4/3/5 8/2/5 6/4/5
46s 6 46s 6
47g left-side
47f 7/1/6 1/2/6 5/3/6 48f 7/1/6 1/2/6 5/3/6
48f 5/3/6 1/2/6 3/4/6 49f 5/3/6 1/2/6 3/4/6