To openglraw

2023-03-09 21:24:03 +00:00
parent cc049db29f
commit 653de7226e
3 changed files with 47 additions and 59 deletions
@@ -1,57 +1,56 @@
-{-# LANGUAGE StrictData
-  , TemplateHaskell 
-  #-}
--{-# OPTIONS_GHC -Wno-unused-top-binds #-}
-module Data.Preload.Render
-    where
-import Shader.Data
+{-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
+--{-# OPTIONS_GHC -Wno-unused-top-binds #-}
+module Data.Preload.Render where

-import Graphics.Rendering.OpenGL hiding (Point,translate,scale,imageHeight)
 import Control.Lens
-import qualified Data.Vector.Mutable as MV
 import Control.Monad.Primitive
+import qualified Data.Vector.Mutable as MV
+import Graphics.GL.Core45
+import Shader.Data

 newtype FBO = FBO {_unFBO :: GLuint}

 newtype TO = TO {_unTO :: GLuint}

 data RenderData = RenderData
-    { _lightingWallShadShader   :: FullShader
+    { _lightingWallShadShader :: FullShader
    , _lightingLineShadowShader :: FullShader
-    , _positionalBlankShader    :: FullShader
-    , _lightingCapShader        :: FullShader
-    , _wallBlankShader          :: FullShader
-    , _windowShader             :: FullShader
-    , _wallTextureShader        :: FullShader
-    , _textureArrayShader       :: FullShader
-    , _fullscreenShader         :: FullShader
-    , _lightingTextureShader    :: FullShader
-    --, _fullscreenAlphaHalveShader         :: FullShader
-    , _bloomBlurShader          :: FullShader
-    , _colorBlurShader          :: FullShader
-    , _barrelShader             :: FullShader
-    , _grayscaleShader          :: FullShader
-    , _shapeShader              :: FullShader
-    , _shapeEBO         :: EBO
-    , _silhouetteEBO    :: EBO
-    , _pictureShaders   :: MV.MVector (PrimState IO) FullShader
-    , _fbo2             :: (FBO, TO)
-    , _fbo3             :: (FBO, TO)
-    , _fboHalf1         :: (FBO, TO)
-    , _fboHalf2         :: (FBO, TO)
-    , _fboHalf3         :: (FBO, TO)
-    , _fboBase          :: (FBO, (TO, TO))
-    , _fboCloud         :: (FBO, (TO, TO))
-    , _fboBloom         :: (FBO, TO)
-    , _fboColor         :: (FBO, TO)
-    , _fboPos           :: (FBO, TO)
-    , _fboLighting      :: (FBO, TO)
-    , _fboLightingHigh  :: (FBO, TO)
-    , _fboShadow        :: (FBO, (TO,TO))
-    , _rboBaseBloom     :: GLuint -- RenderbufferObject id
-    , _matUBO           :: GLuint -- BufferObject id
+    , _positionalBlankShader :: FullShader
+    , _lightingCapShader :: FullShader
+    , _wallBlankShader :: FullShader
+    , _windowShader :: FullShader
+    , _wallTextureShader :: FullShader
+    , _textureArrayShader :: FullShader
+    , _fullscreenShader :: FullShader
+    , _lightingTextureShader :: FullShader
+    , --, _fullscreenAlphaHalveShader         :: FullShader
+      _bloomBlurShader :: FullShader
+    , _colorBlurShader :: FullShader
+    , _barrelShader :: FullShader
+    , _grayscaleShader :: FullShader
+    , _shapeShader :: FullShader
+    , _shapeEBO :: EBO
+    , _silhouetteEBO :: EBO
+    , _pictureShaders :: MV.MVector (PrimState IO) FullShader
+    , _fbo2 :: (FBO, TO)
+    , _fbo3 :: (FBO, TO)
+    , _fboHalf1 :: (FBO, TO)
+    , _fboHalf2 :: (FBO, TO)
+    , _fboHalf3 :: (FBO, TO)
+    , _fboBase :: (FBO, (TO, TO))
+    , _fboCloud :: (FBO, (TO, TO))
+    , _fboBloom :: (FBO, TO)
+    , _fboColor :: (FBO, TO)
+    , _fboPos :: (FBO, TO)
+    , _fboLighting :: (FBO, TO)
+    , _fboLightingHigh :: (FBO, TO)
+    , _fboShadow :: (FBO, (TO, TO))
+    , _rboBaseBloom :: GLuint -- RenderbufferObject id
+    , _matUBO :: GLuint -- BufferObject id
    }
+
 makeLenses ''RenderData
 makeLenses ''FBO
 makeLenses ''TO
-