Try to centralize the number of components per vertex in shapes

This commit is contained in:
2023-03-14 23:28:21 +00:00
parent cfddd1515f
commit 21f87b96d8
7 changed files with 27 additions and 32 deletions
+3 -7
View File
@@ -1,5 +1,5 @@
module Shader.Compile (
setupVBO4,
setupVBO,
makeShader,
makeShader4,
makeByteStringShaderUsingVAO,
@@ -67,8 +67,8 @@ makeShader4 s shaderlist sizes pm vbo = do
, _shadUnis' = mempty
}
setupVBO4 :: Int -> IO VBO
setupVBO4 vertexsize = do
setupVBO :: Int -> IO VBO
setupVBO vertexsize = do
vboname <- mglCreate glCreateBuffers
thePtr <- mallocArray (vertexsize * numDrawableElements)
-- Allocate space
@@ -170,8 +170,6 @@ setupVAOvbo sizes vbo = do
setupVertexAttribs vbo vaoname sizes
return $ VAO
{ _vaoName = vaoname
, _vaoAttribSizes = sizes
, _vaoStride = sum sizes
}
setupVAOSized :: Int -> [Int] -> IO (VAO,VBO)
@@ -181,8 +179,6 @@ setupVAOSized ndraw sizes = do
theVBO <- setupVBOSized ndraw vaoname sizes
return ( VAO
{ _vaoName = vaoname
, _vaoAttribSizes = sizes
, _vaoStride = sum sizes
}
, theVBO)