Cleanup, start to add creature silhouettes

src/Shader.hs

@@ -24,27 +24,33 @@ drawShaderLay :: Int -> UMV.MVector (PrimState IO) Int -> Int -> FullShader -> I
 {-# INLINE drawShaderLay #-}
 drawShaderLay l countsVector shadIn fs = do 
     i <- UMV.read countsVector shadIn
-    currentProgram $= Just (_shaderProgram fs)
-    bindVertexArrayObject $= Just (_vao $ _shaderVAO fs)
-    case _shaderTexture fs of 
+    currentProgram $= Just (_shadProg fs)
+    bindVertexArrayObject $= Just (_vao $ _shadVAO fs)
+    case _shadTex fs of 
         Just ShaderTexture{_textureObject = txo}
             -> textureBinding Texture2D $= Just txo
         _   -> return ()
-    glDrawArrays (marshalEPrimitiveMode $ _shaderDrawPrimitive fs) (fromIntegral $ l*numSubElements) (fromIntegral i)
+    glDrawArrays 
+        (marshalEPrimitiveMode $ _shadPrim fs) 
+        (fromIntegral $ l*numSubElements) 
+        (fromIntegral i)
 
 drawShader :: FullShader -> Int -> IO ()
 {-# INLINE drawShader #-}
 drawShader fs i = do 
-    currentProgram $= Just (_shaderProgram fs)
-    bindVertexArrayObject $= Just (_vao $ _shaderVAO fs)
-    case _shaderTexture fs of 
+    currentProgram $= Just (_shadProg fs)
+    bindVertexArrayObject $= Just (_vao $ _shadVAO fs)
+    case _shadTex fs of 
         Just ShaderTexture{_textureObject = txo}
             -> textureBinding Texture2D $= Just txo
         _   -> return ()
-    glDrawArrays (marshalEPrimitiveMode $ _shaderDrawPrimitive fs) 0 (fromIntegral i)
+    glDrawArrays 
+        (marshalEPrimitiveMode $ _shadPrim fs) 
+        0 
+        (fromIntegral i)
 
 freeShaderPointers :: FullShader -> IO ()
-freeShaderPointers fs = free $ _vboPtr $ _vaoVBO $ _shaderVAO fs
+freeShaderPointers fs = free $ _vboPtr $ _vaoVBO $ _shadVAO fs
 
 pokeBindFoldable
     :: MV.MVector (PrimState IO) FullShader
@@ -66,4 +72,4 @@ pokeBindFoldableLayer shadV counts m = do
 
 shadVBOptr :: FullShader -> Ptr Float
 {-# INLINE shadVBOptr #-}
-shadVBOptr = _vboPtr . _vaoVBO . _shaderVAO
+shadVBOptr = _vboPtr . _vaoVBO . _shadVAO