Fix wall normals

src/Shader/AuxAddition.hs

@@ -93,4 +93,4 @@ addUniforms uniStrings shad = do foldM addUniform shad uniStrings
 addUniform :: FullShader -> String -> IO FullShader
 addUniform shad unistr = BS.useAsCString (pack unistr) $ \cstr -> do
     loc <- glGetUniformLocation (_shadName shad) cstr
-    return $ shad & shadUnis' %~ (V.++ V.fromList [loc])
+    return $ shad & shadUnis %~ (V.++ V.fromList [loc])

src/Shader/Bind.hs

@@ -47,6 +47,3 @@ bufferShaderVector :: MV.MVector (PrimState IO) (FullShader, VBO) -> UMV.MVector
 bufferShaderVector shads counts = MV.imapM_ f shads
   where
     f i shad = UMV.read counts i >>= bufferPokedVBO (snd shad)
-
---bindShaderBuffers :: [VBO] -> [Int] -> IO ()
---bindShaderBuffers = zipWithM_ bufferPokedVBO

src/Shader/Compile.hs

@@ -42,7 +42,7 @@ makeShader s shaderlist sizes pm = do
             , _shadVAO = vao
             , _shadPrim' = pm
             , _shadTex' = Nothing
-            , _shadUnis' = mempty
+            , _shadUnis = mempty
             }
             , vbo)
 
@@ -66,7 +66,7 @@ makeShader4 s shaderlist sizes strd pm vbo = do
             , _shadVAO = vao
             , _shadPrim' = pm
             , _shadTex' = Nothing
-            , _shadUnis' = mempty
+            , _shadUnis = mempty
             }
 
 setupVBO :: Int -> IO VBO
@@ -96,7 +96,7 @@ makeByteStringShaderUsingVAO s shaderlist pm vao = do
             , _shadVAO = vao
             , _shadPrim' = pm
             , _shadTex' = Nothing
-            , _shadUnis' = mempty
+            , _shadUnis = mempty
             }
 
 -- | Takes the VAO from elsewhere
@@ -116,7 +116,7 @@ makeShaderUsingVAO s shaderlist pm theVAO = do
             , _shadVAO = theVAO
             , _shadPrim' = pm
             , _shadTex' = Nothing
-            , _shadUnis' = mempty
+            , _shadUnis = mempty
             }
 
 {- |
@@ -142,7 +142,7 @@ makeShaderSized s shaderlist sizes ndraw pm = do
             , _shadVAO = vao
             , _shadPrim' = pm
             , _shadTex' = Nothing
-            , _shadUnis' = mempty
+            , _shadUnis = mempty
             }
         , vbo)
 

src/Shader/Data.hs

@@ -26,7 +26,7 @@ module Shader.Data
     , shadVAO
     , shadPrim'
     , shadTex'
-    , shadUnis'
+    , shadUnis
 -- | Synonyms
     , vert
     , geom
@@ -42,7 +42,7 @@ data FullShader = FullShader
     , _shadVAO  :: VAO
     , _shadPrim' :: EPrimitiveMode
     , _shadTex'  :: Maybe ShaderTexture
-    , _shadUnis' :: Vector GLint
+    , _shadUnis :: Vector GLint
     }
 {- | Vertex array object: contains the reference to the object,
 and its buffer targets.  -}