Add picture shader container datatype

src/Preload/Render.hs

@@ -38,7 +38,7 @@ preloadRender = do
         , nullPtr
         , DynamicDraw
         )
-    let wpVBO = VBO {_vbo = wpVBOname, _vboPointer = wpVBOptr, _vboAttribSizes = [4,4]}
+    let wpVBO = VBO {_vbo = wpVBOname, _vboPointer = wpVBOptr, _vboAttribSizes = [4,4], _vboStride = 8}
     wpVAOname <- genObjectName
     bindVertexArrayObject $= Just wpVAOname
     bindBuffer ArrayBuffer $= Just wpVBOname
@@ -119,8 +119,14 @@ preloadRender = do
     clearColor $= Color4 0 0 0 1
 
     return $ RenderData
-        { _pictureShaders           = 
-            [bslist,cslist,aslist,eslist,bezierQuadShader,basicTweakZShad]
+        { _pictureShaders           = PicShads
+            { _psPoly = bslist 
+            , _psText = cslist 
+            , _psArc = aslist
+            , _psEll = eslist
+            , _psBez = bezierQuadShader
+            , _psPolyz = basicTweakZShad
+            }
         , _lightingSurfaceShader    = lightingSurfaceShad
         , _lightingLineShadowShader = lightingLineShadowShad
         , _lightingOccludeShader    = wsShad        {_shaderVAO = wpVAO}
@@ -238,6 +244,7 @@ poke33 :: RenderType -> [[Float]]
 poke33 Render3x3{_unRender3x3=((x,y,z),(a,b,c))} = [[x,y,z,a,b,c]]
 poke33 _ = undefined
 
+isPolyV, isArcV, isEllV, isTextV, isBezV, isPolyzV :: VertexType -> Bool
 isPolyV PolyV = True
 isPolyV _ = False
 isArcV (ArcV _) = True