Commit before adding coloured light sources
This commit is contained in:
+2
-1
@@ -131,7 +131,8 @@ doDrawing pdata w = do
|
|||||||
--textureBinding Texture2D $= Just (snd3 $ _fbo2 pdata)
|
--textureBinding Texture2D $= Just (snd3 $ _fbo2 pdata)
|
||||||
textureBinding Texture2D $= Just (snd $ _fboLighting pdata)
|
textureBinding Texture2D $= Just (snd $ _fboLighting pdata)
|
||||||
blend $= Enabled
|
blend $= Enabled
|
||||||
blendFunc $= (Zero, OneMinusSrcAlpha)
|
--blendFunc $= (Zero, OneMinusSrcAlpha)
|
||||||
|
blendFunc $= (Zero, OneMinusSrcColor)
|
||||||
drawShader (_fullscreenShader pdata) 4
|
drawShader (_fullscreenShader pdata) 4
|
||||||
blendFunc $= (SrcAlpha, OneMinusSrcAlpha)
|
blendFunc $= (SrcAlpha, OneMinusSrcAlpha)
|
||||||
|
|
||||||
|
|||||||
+3
-2
@@ -34,7 +34,7 @@ createLightMap pdata lightPoints nWalls nSils nsurfVs = do
|
|||||||
depthFunc $= Just Less
|
depthFunc $= Just Less
|
||||||
-- clear buffer to full alpha and furthest depth
|
-- clear buffer to full alpha and furthest depth
|
||||||
-- clearColor is specified in preloadRender
|
-- clearColor is specified in preloadRender
|
||||||
clearColor $= Color4 0 0 0 1
|
clearColor $= Color4 1 1 1 1
|
||||||
clear [ColorBuffer,DepthBuffer]
|
clear [ColorBuffer,DepthBuffer]
|
||||||
--colorMask $= Color4 Disabled Disabled Disabled Disabled
|
--colorMask $= Color4 Disabled Disabled Disabled Disabled
|
||||||
cullFace $= Just Back
|
cullFace $= Just Back
|
||||||
@@ -82,7 +82,8 @@ createLightMap pdata lightPoints nWalls nSils nsurfVs = do
|
|||||||
|
|
||||||
-- draw geometry surfaces
|
-- draw geometry surfaces
|
||||||
cullFace $= Just Back
|
cullFace $= Just Back
|
||||||
colorMask $= Color4 Disabled Disabled Disabled Enabled
|
--colorMask $= Color4 Disabled Disabled Disabled Enabled
|
||||||
|
colorMask $= Color4 Enabled Enabled Enabled Enabled
|
||||||
stencilFunc $= (Equal, 0, 255)
|
stencilFunc $= (Equal, 0, 255)
|
||||||
currentProgram $= Just (_shaderProgram $ _lightingSurfaceShader pdata)
|
currentProgram $= Just (_shaderProgram $ _lightingSurfaceShader pdata)
|
||||||
uniform (head $ _shaderCustomUnis $ _lightingSurfaceShader pdata)
|
uniform (head $ _shaderCustomUnis $ _lightingSurfaceShader pdata)
|
||||||
|
|||||||
Reference in New Issue
Block a user