From b79975c689f7c84e39c6ca326e93c58857ac6c37 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Wed, 24 Jul 2019 12:39:57 -0400 Subject: Brighter cube colors. --- LoadMesh.hs | 2 +- cube.mtl | 4 ++-- 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 loadOBJ :: String -> IO (Either String MeshData) loadOBJ fname = L.readFile fname >>= \bs -> do - let obj@OBJ{..} = parse bs + let obj@OBJ{..} = Wavefront.parse bs -- load materials mtlLib <- mapM (readMtlWithFallback . relativeFrom fname . unpack) objMtlLibs 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 Tf 1.0000 1.0000 1.0000 illum 2 Ka 0.0000 0.0000 0.0000 - Kd 0.5880 0.5880 0.5880 + Kd 0.8880 0.8880 0.8880 Ks 0.0000 0.0000 0.0000 Ke 0.0000 0.0000 0.0000 map_Ka logo.png @@ -20,7 +20,7 @@ newmtl grid Tf 1.0000 1.0000 1.0000 illum 2 Ka 0.0000 0.0000 0.0000 - Kd 0.5880 0.5880 0.5880 + Kd 0.8880 0.8880 0.8880 Ks 0.0000 0.0000 0.0000 Ke 0.0000 0.0000 0.0000 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 f 2/1/5 8/2/5 4/3/5 f 4/3/5 8/2/5 6/4/5 s 6 +g left-side f 7/1/6 1/2/6 5/3/6 f 5/3/6 1/2/6 3/4/6 -- cgit v1.2.3