Continue shader refactor

src/Preload/Render.hs

@@ -68,7 +68,7 @@ preloadRender = do
 
     -- setup shape geometry/cap VBO and two VAOs
     putStrLn "Setup shape VBO, VAO, EBO"
-    shVBO <- setupVBO (nShapeVerxComp)
+    shVBO <- setupVBO' (floatSize * nShapeVerxComp)
     shPosVAO <- setupVAOUsingVBO [VertexAttribute 4 GL_FLOAT GL_FALSE 0] shVBO
     shEBO <- setupEBO shPosVAO
     -- note the shape shader vao is distinct from the position vao, but they
@@ -83,8 +83,8 @@ preloadRender = do
 
     putStrLn "Setup wall/windows VBO, VAO, EBO, shader"
     let wallverxstrd = 8
-    wallvbo <- setupVBO (wallverxstrd)
-    winvbo <- setupVBO (8)
+    wallvbo <- setupVBO' (floatSize * wallverxstrd)
+    winvbo <- setupVBO' (floatSize * 8)
     windowshader <- makeShaderUsingVBO "wall/blank" [vert, geom, frag] (toFloatVAs [4, 4]) pmPoints winvbo
     wallshader <- makeShaderUsingVBO "wall/basic" [vert, geom, frag] (toFloatVAs [4, 4]) pmPoints wallvbo
     putStrLn "Setup lighting shaders"
@@ -143,7 +143,7 @@ preloadRender = do
 
     putStrLn "Setup cloud VBO, shader"
     let cloudverxsizes = [4, 4, 4, 4]
-    cloudvbo <- setupVBO (sum cloudverxsizes)
+    cloudvbo <- setupVBO' (floatSize * sum cloudverxsizes)
     (cloudshader, cloudebo) <-
         makeShaderEBO "cloud/basic" [vert, frag] cloudverxsizes pmTriangles cloudvbo
     framebuf2 <- newTextureFramebuffer