lambdacube-gl 0.2.0 → 0.2.1
raw patch · 3 files changed
+9/−7 lines, 3 filesdep ~basedep ~language-glslPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: base, language-glsl
API changes (from Hackage documentation)
- LambdaCube.GL: backStencilOp :: StencilOps -> StencilOperation
- LambdaCube.GL: frontStencilOp :: StencilOps -> StencilOperation
- LambdaCube.GL: indexArrIdx :: IndexStream b -> Int
- LambdaCube.GL: indexBuffer :: IndexStream b -> b
- LambdaCube.GL: indexLength :: IndexStream b -> Int
- LambdaCube.GL: indexStart :: IndexStream b -> Int
- LambdaCube.GL: stencilComparision :: StencilTest -> ComparisonFunction
- LambdaCube.GL: stencilMask :: StencilTest -> Word32
- LambdaCube.GL: stencilReference :: StencilTest -> Int32
- LambdaCube.GL: streamArrIdx :: Stream b -> Int
- LambdaCube.GL: streamBuffer :: Stream b -> b
- LambdaCube.GL: streamLength :: Stream b -> Int
- LambdaCube.GL: streamStart :: Stream b -> Int
- LambdaCube.GL: streamType :: Stream b -> StreamType
- LambdaCube.GL: textureObject :: TextureData -> GLuint
- LambdaCube.GL.Mesh: instance Binary Mesh
- LambdaCube.GL.Mesh: instance Binary MeshAttribute
- LambdaCube.GL.Mesh: instance Binary MeshPrimitive
- LambdaCube.GL.Mesh: instance Storable a => Binary (Vector a)
- LambdaCube.GL.Mesh: mAttributes :: Mesh -> Trie MeshAttribute
- LambdaCube.GL.Mesh: mGPUData :: Mesh -> Maybe GPUData
- LambdaCube.GL.Mesh: mPrimitive :: Mesh -> MeshPrimitive
+ LambdaCube.GL: [backStencilOp] :: StencilOps -> StencilOperation
+ LambdaCube.GL: [frontStencilOp] :: StencilOps -> StencilOperation
+ LambdaCube.GL: [indexArrIdx] :: IndexStream b -> Int
+ LambdaCube.GL: [indexBuffer] :: IndexStream b -> b
+ LambdaCube.GL: [indexLength] :: IndexStream b -> Int
+ LambdaCube.GL: [indexStart] :: IndexStream b -> Int
+ LambdaCube.GL: [stencilComparision] :: StencilTest -> ComparisonFunction
+ LambdaCube.GL: [stencilMask] :: StencilTest -> Word32
+ LambdaCube.GL: [stencilReference] :: StencilTest -> Int32
+ LambdaCube.GL: [streamArrIdx] :: Stream b -> Int
+ LambdaCube.GL: [streamBuffer] :: Stream b -> b
+ LambdaCube.GL: [streamLength] :: Stream b -> Int
+ LambdaCube.GL: [streamStart] :: Stream b -> Int
+ LambdaCube.GL: [streamType] :: Stream b -> StreamType
+ LambdaCube.GL: [textureObject] :: TextureData -> GLuint
+ LambdaCube.GL: compileRendererFromCore :: N -> IO Renderer
+ LambdaCube.GL.Mesh: [mAttributes] :: Mesh -> Trie MeshAttribute
+ LambdaCube.GL.Mesh: [mGPUData] :: Mesh -> Maybe GPUData
+ LambdaCube.GL.Mesh: [mPrimitive] :: Mesh -> MeshPrimitive
+ LambdaCube.GL.Mesh: instance Data.Binary.Class.Binary LambdaCube.GL.Mesh.Mesh
+ LambdaCube.GL.Mesh: instance Data.Binary.Class.Binary LambdaCube.GL.Mesh.MeshAttribute
+ LambdaCube.GL.Mesh: instance Data.Binary.Class.Binary LambdaCube.GL.Mesh.MeshPrimitive
+ LambdaCube.GL.Mesh: instance Foreign.Storable.Storable a => Data.Binary.Class.Binary (Data.Vector.Storable.Vector a)
Files
lambdacube-gl.cabal view
@@ -1,5 +1,5 @@ Name: lambdacube-gl-Version: 0.2.0+Version: 0.2.1 Cabal-Version: >= 1.10 Build-Type: Simple License: BSD3@@ -30,7 +30,7 @@ default-language: Haskell2010 hs-source-dirs: src/lib Build-Depends: - base >=4.6 && <5,+ base >=4.7 && <5, binary >=0.7 && <0.8, bytestring >=0.10 && <0.11, containers >=0.5 && <0.6,@@ -41,7 +41,7 @@ bytestring-trie >=0.2 && <0.3, OpenGLRaw >=1.5 && <1.6, bitmap >= 0.0.2 && <0.0.3,- language-glsl >=0.1 && <0.2,+ language-glsl, lambdacube-core == 0.2.0, lambdacube-edsl == 0.2.0
src/lib/LambdaCube/GL.hs view
@@ -48,6 +48,7 @@ Renderer, compileRenderer,+ compileRendererFromCore, slotUniform, slotStream, uniformSetter,@@ -137,10 +138,12 @@ import System.IO as IO compileRenderer :: H.GPOutput H.SingleOutput -> IO Renderer-compileRenderer l = do+compileRenderer l = compileRendererFromCore $ convertGPOutput l +compileRendererFromCore :: U.N -> IO Renderer+compileRendererFromCore l = do let root = U.toExp dag l'- (l', dag) = runState (U.unN $ convertGPOutput l) U.emptyDAG+ (l', dag) = runState (U.unN l) U.emptyDAG U.DAG (BiMap _ em) tm _ _ _ = dag unis = U.mkExpUni dag gunis = U.mkGPUni dag
src/lib/LambdaCube/GL/Compile.hs view
@@ -219,8 +219,6 @@ glDepthMask (cvtBool dm) cvtC 0 xs cvt xs = do- glDepthMask (cvtBool True) -- ??? wtf probably gl bug- glDisable gl_DEPTH_TEST glDisable gl_STENCIL_TEST cvtC 0 xs@@ -400,6 +398,7 @@ cvtC 0 xs cvt (DepthImage sh d : xs) = do let --renderGL3 = with d $ \pd -> glClearBufferfv gl_DEPTH 0 $ castPtr pd+ glDepthMask 1 glClearDepth $ realToFrac d glClear $ fromIntegral gl_DEPTH_BUFFER_BIT --print " * glClear gl_DEPTH_BUFFER_BIT"