Refactor shaders, commit before major deletion of old code

src/Picture/Preload.hs

@@ -55,7 +55,38 @@ makeShader s shaderlist alocs pm renStrat = do
                         , _shaderVAO = vao
                         , _shaderPokeStrategy = renStrat
                         , _shaderDrawPrimitive = pm
+                        , _shaderTexture = Nothing
                         }
+makeTextureShader :: String -> [ShaderType] -> [(GLuint,Int)] 
+            -> PrimitiveMode -> (RenderType -> [[[Float]]]) 
+            -> String
+            -> IO FullShader
+makeTextureShader s shaderlist alocs pm renStrat texturePath = do
+    (prog,unis)  <- makeSourcedShader s shaderlist
+
+    Right cmap <- readImage texturePath
+    let tex = convertRGBA8 cmap
+    textureOb <- genObjectName
+    textureBinding Texture2D $= Just textureOb
+    let texData = V.toList $ imageData tex
+        wtex = fromIntegral $ imageWidth  tex
+        htex = fromIntegral $ imageHeight tex
+    withArray texData $ \ptr -> do
+        texImage2D Texture2D NoProxy 0 RGBA8 (TextureSize2D wtex htex) 0 
+                        (PixelData RGBA UnsignedByte ptr)
+    generateMipmap' Texture2D
+    textureFilter Texture2D $= ((Linear',Just Linear') , Nearest)
+
+    vao        <- setupVAO alocs
+
+    return $ FullShader { _shaderProgram = prog
+                        , _shaderUniforms = unis
+                        , _shaderVAO = vao
+                        , _shaderPokeStrategy = renStrat
+                        , _shaderDrawPrimitive = pm
+                        , _shaderTexture = Just $ ShaderTexture {_textureObject = textureOb}
+                        }
+
 
 mkS :: IO FullShader
 mkS = do 
@@ -150,7 +181,9 @@ preloadRender = do
 
     bslist <- makeShader "basic"        [vert,frag] [(0,3),(1,4)] Triangles pokeTriStrat
     lslist <- makeShader "basic"        [vert,frag] [(0,3),(1,4)] Lines pokeLineStrat
-    cslist <- makeShader "character"    [vert,geom,frag] [(0,3),(1,4),(2,3)] Points pokeCharStrat
+    cslist <- makeTextureShader "character" [vert,geom,frag] 
+                                [(0,3),(1,4),(2,3)] Points pokeCharStrat
+                                "data/texture/charMap.png"
     aslist <- makeShader "arc"          [vert,geom,frag] [(0,3),(1,4),(2,3)] Points pokeArcStrat
     eslist <- makeShader "ellipseInterpolate" [vert,geom,frag] [(0,3),(1,4)] Triangles pokeEllStrat