Continue render refactor

2023-03-14 14:11:14 +00:00
parent 35f401d8c8
commit 378af69ca5
12 changed files with 118 additions and 112 deletions
@@ -22,23 +22,23 @@ data RenderData = RenderData
    , _shadowEdgeShader :: FullShader
    , _shadowCapShader :: FullShader
    , _shadowWallShader :: FullShader
-    , _shadowLightShader :: FullShader
-    , _shadowCombineShader :: FullShader
-    , _positionalBlankShader :: FullShader
+    , _shadowLightShader :: (FullShader,VBO)
+    , _shadowCombineShader :: (FullShader,VBO)
+    , _positionalBlankShader :: (FullShader,VBO)
    , _wallBlankShader :: FullShader
    , _windowShader :: FullShader
    , _wallTextureShader :: FullShader
-    , _textureArrayShader :: FullShader
-    , _fullscreenShader :: FullShader
-    , --, _fullscreenAlphaHalveShader         :: FullShader
+    , _textureArrayShader :: (FullShader,VBO)
+    , _fullscreenShader :: (FullShader,VBO)
+    , --, _fullscreenAlphaHalveShader         :: (FullShader,VBO)
      _bloomBlurShader :: FullShader
    , _colorBlurShader :: FullShader
-    , _barrelShader :: FullShader
+    , _barrelShader :: (FullShader,VBO)
    , _grayscaleShader :: FullShader
-    , _shapeShader :: FullShader
+    , _shapeShader :: (FullShader,VBO)
    , _shapeEBO :: EBO
    , _silhouetteEBO :: EBO
-    , _pictureShaders :: MV.MVector (PrimState IO) FullShader
+    , _pictureShaders :: MV.MVector (PrimState IO) (FullShader,VBO)
    , _fbo2 :: (FBO, TO)
    , _fbo3 :: (FBO, TO)
    , _fboHalf1 :: (FBO, TO)
@@ -56,6 +56,9 @@ data RenderData = RenderData
    , _matUBO :: GLuint -- BufferObject id
    , _isoMatUBO :: GLuint -- BufferObject id
    , _lightsUBO :: GLuint -- BufferObject id
+    , _vboWalls :: VBO
+    , _vboWindows :: VBO
+    , _vboShapes :: VBO
    }

 makeLenses ''RenderData