Partial implementation of interleaving VBO

src/Shader.hs

@@ -146,9 +146,45 @@ setupVAO :: [(GLuint,Int)] -> IO VAO
 setupVAO ps = do
     theVAO <- genObjectName
     bindVertexArrayObject $= Just theVAO
+    theVBO <- setupVBO $ map snd ps
     vbos <- forM ps setupArrayBuffer
     ptrs <- forM (zip vbos $ map snd ps) setupVBOPointers
-    return $ VAO theVAO ptrs
+    return $ VAO 
+        { _vao = theVAO
+        , _vaoBufferTargets = ptrs
+        , _vaoVBO = theVBO
+        }
+
+setupVBO :: [Int] -> IO VBO
+setupVBO sizes = do
+    vboName <- genObjectName
+    bindBuffer ArrayBuffer $= Just vboName
+    forM_ (zip3 [0..] sizes offs) $ \(loc,siz,off) -> do
+        setupVertexAttribPointer loc siz strd off
+    thePtr <- mallocArray (strd * numDrawableElements)
+    return $ VBO
+        { _vbo = vboName
+        , _vboPoint = thePtr
+        , _vboAttribSizes = sizes
+        }
+  where
+    strd = sum sizes
+    offs = scanl (+) 0 sizes
+    
+{- | Assumes the correct VBO is bound -}
+setupVertexAttribPointer 
+    :: Int  -- ^ Atrib location
+    -> Int  -- ^ Size
+    -> Int  -- ^ Stride 
+    -> Int  -- ^ Offset
+    -> IO ()
+setupVertexAttribPointer loc siz strd off = do
+    vertexAttribPointer (AttribLocation (fi loc)) $=
+        (ToFloat, VertexArrayDescriptor (fi' siz) Float (fi'' $ floatSize * strd) (bufferOffset off))
+  where
+    fi = fromIntegral
+    fi' = fromIntegral
+    fi'' = fromIntegral
 
 setupVBOPointers :: (BufferObject,Int) -> IO (BufferObject,Ptr Float,Int)
 setupVBOPointers (vbo,vsize) = do