Cleanup, start to add creature silhouettes

src/Shader/Data.hs

@@ -10,11 +10,11 @@ module Shader.Data
 -- | Lens functions
     , vao
     , vaoVBO
-    , shaderProgram
-    , shaderVAO
-    , shaderDrawPrimitive
-    , shaderTexture
-    , shaderCustomUnis
+    , shadProg
+    , shadVAO
+    , shadPrim
+    , shadTex
+    , shadUnis
     , vbo
     , vboPtr
     , vboAttribSizes
@@ -29,11 +29,11 @@ import Foreign
 import Control.Lens
 {- | Datatype containing the necessary information for a single shader.  -}
 data FullShader = FullShader
-    { _shaderProgram        :: Program
-    , _shaderVAO            :: VAO
-    , _shaderDrawPrimitive  :: EPrimitiveMode
-    , _shaderTexture        :: Maybe ShaderTexture
-    , _shaderCustomUnis     :: [UniformLocation]
+    { _shadProg :: Program
+    , _shadVAO  :: VAO
+    , _shadPrim :: EPrimitiveMode
+    , _shadTex  :: Maybe ShaderTexture
+    , _shadUnis :: [UniformLocation]
     }
 {- | Vertex array object: contains the reference to the object,
 and its buffer targets.  -}