Add completed circle shader, add incomplete arc shader

This commit is contained in:
2021-02-19 13:54:40 +01:00
parent f6efe98181
commit defc8da088
9 changed files with 184 additions and 27 deletions
+6 -2
View File
@@ -50,6 +50,10 @@ data PreloadData = PreloadData
, _asWinUni :: UniformLocation
, _asZoomUni :: UniformLocation
}
data VAO = VAO
{ _vao :: VertexArrayObject
, _vaoBufferTargets :: [(BufferObject,Ptr Float,Int)]
}
makeLenses ''PreloadData
@@ -125,7 +129,7 @@ doPreload' = do
basicVAO <- setupVAO [(posVBO,0,3),(colVBO,1,4)]
textVAO <- setupVAO [(posVBO,0,3),(colVBO,1,4),(texVBO,2,2)]
circVAO <- setupVAO [(posVBO,0,3),(colVBO,1,4),(texVBO,2,1)]
arcVAO <- setupVAO [(posVBO,0,3),(colVBO,1,4),(texVBO,2,3)]
arcVAO <- setupVAO [(posVBO,0,3),(colVBO,1,4),(texVBO,2,4)]
-- allocate memory for vertex attributes
-- for triangles
@@ -145,7 +149,7 @@ doPreload' = do
-- for arcs
ptrArcPos <- mallocArray (3*20000)
ptrArcCol <- mallocArray (4*20000)
ptrArcSca <- mallocArray (3*20000)
ptrArcSca <- mallocArray (4*20000)
return $ PreloadData
{ _charMap = convertRGBA8 cmap