Commit AFTER playing around with poking/vector sizing a little
This commit is contained in:
@@ -83,6 +83,15 @@ preloadRender = do
|
||||
eslist <- makeShaderVBO "dualTwoD/ellipse" [vert, geom, frag] (toFloatVAs [3, 4]) pmTriangles
|
||||
cslist <-
|
||||
makeShaderVBO "picture/charArray" [vert, frag] (toFloatVAs [3, 4, 4]) pmTriangles
|
||||
shadV <- MV.new 4
|
||||
zipWithM_
|
||||
(MV.write shadV)
|
||||
[0 .. 3]
|
||||
[ bslist -- note the ordering is very important
|
||||
, cslist
|
||||
, aslist
|
||||
, eslist
|
||||
]
|
||||
-- initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_NEAREST_MIPMAP_LINEAR GL_LINEAR
|
||||
--initTexture2DArray 50 "data/texture/charMapVert16Block.png" 2 16 32 95 GL_NEAREST GL_NEAREST
|
||||
initTexture2DArray 50 "data/charMaps/charMapVert16Tall.png" 2 16 32 95 GL_NEAREST GL_NEAREST
|
||||
@@ -136,15 +145,6 @@ preloadRender = do
|
||||
-- reset to default framebuffer, ready for drawing direct to screen
|
||||
glBindFramebuffer GL_FRAMEBUFFER 0
|
||||
|
||||
shadV <- MV.new 4
|
||||
zipWithM_
|
||||
(MV.write shadV)
|
||||
[0 .. 3]
|
||||
[ bslist -- note the ordering is very important
|
||||
, cslist
|
||||
, aslist
|
||||
, eslist
|
||||
]
|
||||
|
||||
initializeGLState
|
||||
putStrLn "Return preload"
|
||||
|
||||
Reference in New Issue
Block a user