Cleanup

src/Data/Preload/Render.hs

@@ -17,7 +17,7 @@ data RenderData = RenderData
     , _lightingTextureShader :: Shader
     , _ceilingStencilShader :: Shader
     , _alphaDivideShader :: Shader
-    , _windowShader :: Shader
+--    , _windowShader :: Shader
     , _windowPullShader :: Shader
     , _fullscreenShader :: Shader
     , _transparencyCompShader :: Shader

src/Dodge/Render.hs

@@ -97,8 +97,8 @@ doDrawing' win pdata u = do
     bufferShaderLayers shadV pokeCounts
     mapM_
         (uncurry bufferPokedVBO)
-        [ (pdata ^. vboWindows, nWins)
+        [ --(pdata ^. vboWindows, nWins)
-        , (pdata ^. wallVBO, trueNWalls)
+         (pdata ^. wallVBO, trueNWalls)
         , (_vboShapes pdata, nShapeVs)
         , (pdata ^. cloudVBO, nCloudVs)
         ]

src/Preload/Render.hs

@@ -41,20 +41,14 @@ preloadRender = do
 
     winssbo <- mglCreate glCreateBuffers
     let winssbosize = sizeOf (0::Float) * 8 * 1024
---    winssboptr <- mallocBytes winssbosize
+
     glNamedBufferStorage winssbo (fromIntegral winssbosize) nullPtr GL_DYNAMIC_STORAGE_BIT
     glBindBufferBase GL_SHADER_STORAGE_BUFFER 1 winssbo
 
-    --dummyvao <- mglCreate glCreateVertexArrays
     dummyvao <- mglCreate glGenVertexArrays
 
     winpull <- makeShaderUsingVAO "pull/window" [vert,frag] pmTriangles (VAO dummyvao)
 
---    lightsubo <- mglCreate glCreateBuffers
---    --glNamedBufferData lightsubo 640 nullPtr GL_STREAM_DRAW
---    glNamedBufferStorage lightsubo 640 nullPtr GL_DYNAMIC_STORAGE_BIT
---    glBindBufferBase GL_UNIFORM_BUFFER 1 lightsubo
-
     -- setup shape geometry/cap VBO and two VAOs
     putStrLn "Setup shape VBO, VAO, EBO"
     shVBO <- setupVBO shapeVerxSize
@@ -80,13 +74,6 @@ preloadRender = do
     let wallverxstrd = 8
     wallvbo <- setupVBO (floatSize * wallverxstrd)
     winvbo <- setupVBO (floatSize * 8)
-    windowshader <-
-        makeShaderUsingVBO
-            "wall/window"
-            [vert, geom, frag]
-            (toFloatVAs [4, 4])
-            pmPoints
-            winvbo
     wallshader <- makeShaderUsingVBO "wall/basic" [vert, geom, frag] (toFloatVAs [4, 4]) pmPoints wallvbo
     putStrLn "Setup lighting shaders"
     lightingWallShadShad <-
@@ -193,7 +180,7 @@ preloadRender = do
             , _lightingLineShadowShader = lightingLineShadowShad
             , _lightingWallShadShader = lightingWallShadShad
             , _ceilingStencilShader = ceilingstencilshader
-            , _windowShader = windowshader
+--            , _windowShader = windowshader
             , _windowPullShader = winpull
             , _fullscreenShader = fsShad
             , _transparencyCompShader = transcompshader

src/Shader/Compile.hs

@@ -331,3 +331,5 @@ withByteString :: Num t => BS.ByteString -> (Ptr b -> t -> IO a) -> IO a
 withByteString bs act =
     BU.unsafeUseAsCStringLen bs $ \(ptr, size) ->
         act (castPtr ptr) (fromIntegral size)
+
+--boVertex

src/Shader/Data.hs

@@ -83,6 +83,14 @@ data VBO = VBO
     -- add int for AMOUNT of data poked!
     }
 
+data BOType = WindowPoss
+
+data FloatBO = FloatBO
+    { _boName :: GLuint
+    , _boPtr :: Ptr Float
+    , _boType :: BOType
+    }
+
 data EBO = EBO
     { _eboName :: GLuint
     , _eboPtr :: Ptr GLushort