justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Continue va change

Browse Source
This commit is contained in:
justin
2023-04-12 23:19:41 +01:00
parent 11b8fe2e06
commit 589f663b65
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Preload/Render.hs
+6 -6
View File
@@ -73,7 +73,7 @@ preloadRender = do
shEBO <- setupEBO shPosVAO shEBO <- setupEBO shPosVAO
-- note the shape shader vao is distinct from the position vao, but they -- note the shape shader vao is distinct from the position vao, but they
-- share an EBO -- share an EBO
shapeshader <- makeShaderUsingVBO "shape/basic" [vert, frag] shapeVerxSizes pmTriangles shVBO shapeshader <- makeShaderUsingVBO "shape/basic" [vert, frag] (toFloatVAs shapeVerxSizes) pmTriangles shVBO
glVertexArrayElementBuffer (shapeshader ^. shaderVAO . vaoName) (shEBO ^. eboName) glVertexArrayElementBuffer (shapeshader ^. shaderVAO . vaoName) (shEBO ^. eboName)
--setup silhouette edge VAO --setup silhouette edge VAO
@@ -85,11 +85,11 @@ preloadRender = do
let wallverxstrd = 8 let wallverxstrd = 8
wallvbo <- setupVBO wallverxstrd wallvbo <- setupVBO wallverxstrd
winvbo <- setupVBO 8 winvbo <- setupVBO 8
windowshader <- makeShaderUsingVBO "wall/blank" [vert, geom, frag] [4, 4] pmPoints winvbo windowshader <- makeShaderUsingVBO "wall/blank" [vert, geom, frag] (toFloatVAs [4, 4]) pmPoints winvbo
wallshader <- makeShaderUsingVBO "wall/basic" [vert, geom, frag] [4, 4] pmPoints wallvbo wallshader <- makeShaderUsingVBO "wall/basic" [vert, geom, frag] (toFloatVAs [4, 4]) pmPoints wallvbo
putStrLn "Setup lighting shaders" putStrLn "Setup lighting shaders"
lightingWallShadShad <- lightingWallShadShad <-
makeShaderUsingVBO "lighting/wallShadow" [vert, geom] [4] pmPoints wallvbo makeShaderUsingVBO "lighting/wallShadow" [vert, geom] (toFloatVAs [4]) pmPoints wallvbo
lightingCapShad <- lightingCapShad <-
makeShaderUsingVAO "lighting/cap" [vert, geom] pmTriangles shPosVAO makeShaderUsingVAO "lighting/cap" [vert, geom] pmTriangles shPosVAO
lightingLineShadowShad <- lightingLineShadowShad <-
@@ -99,7 +99,7 @@ preloadRender = do
shadowcapshader <- shadowcapshader <-
makeShaderUsingVAO "shadow/cap" [vert, geom] pmTriangles shPosVAO makeShaderUsingVAO "shadow/cap" [vert, geom] pmTriangles shPosVAO
shadowwallshader <- shadowwallshader <-
makeShaderUsingVBO "shadow/wallShadow" [vert, geom] [4] pmPoints wallvbo makeShaderUsingVBO "shadow/wallShadow" [vert, geom] (toFloatVAs [4]) pmPoints wallvbo
shadowlightshader <- shadowlightshader <-
makeShaderFixedVertices makeShaderFixedVertices
"shadow/light" "shadow/light"
@@ -144,7 +144,7 @@ preloadRender = do
putStrLn "Setup floor VBO, shader" putStrLn "Setup floor VBO, shader"
let floorverxstrd = 8 let floorverxstrd = 8
floorvbo <- setupVBOStatic floorverxstrd floorvbo <- setupVBOStatic floorverxstrd
floorshader <- makeShaderUsingVBO "floor/arrayPos" [vert, frag] [4, 4] pmTriangles floorvbo floorshader <- makeShaderUsingVBO "floor/arrayPos" [vert, frag] (toFloatVAs [4, 4]) pmTriangles floorvbo
initTexture2DArraySquare 40 3 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR "data/normalMaps/diffuseArray.png" initTexture2DArraySquare 40 3 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR "data/normalMaps/diffuseArray.png"
initTexture2DArraySquare 41 3 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR "data/normalMaps/normalArray.png" initTexture2DArraySquare 41 3 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR "data/normalMaps/normalArray.png"
src/Shader/Compile.hs
+3 -3
View File
@@ -65,7 +65,7 @@ makeShaderEBO ::
VBO -> VBO ->
IO (Shader, EBO) IO (Shader, EBO)
makeShaderEBO s shaderlist sizes pm vbo = do makeShaderEBO s shaderlist sizes pm vbo = do
shad <- makeShaderUsingVBO s shaderlist sizes pm vbo shad <- makeShaderUsingVBO s shaderlist (toFloatVAs sizes) pm vbo
ebo <- setupEBO (shad ^. shaderVAO) ebo <- setupEBO (shad ^. shaderVAO)
glVertexArrayElementBuffer (shad ^. shaderVAO . vaoName) (ebo ^. eboName) glVertexArrayElementBuffer (shad ^. shaderVAO . vaoName) (ebo ^. eboName)
return return
@@ -79,12 +79,12 @@ makeShaderUsingVBO ::
-- | shader types -- | shader types
[GLenum] -> [GLenum] ->
-- | The input vertex sizes -- | The input vertex sizes
[Int] -> [VertexAttribute] ->
PrimitiveMode -> PrimitiveMode ->
VBO -> VBO ->
IO Shader IO Shader
makeShaderUsingVBO s shaderlist sizes pm vbo = do makeShaderUsingVBO s shaderlist sizes pm vbo = do
vao <- setupVAOUsingVBO (toFloatVAs sizes) vbo vao <- setupVAOUsingVBO sizes vbo
makeShaderUsingVAO s shaderlist pm vao makeShaderUsingVAO s shaderlist pm vao
setupVBO :: Int -> IO VBO setupVBO :: Int -> IO VBO