diff --git a/shader/lighting/lineShadow.geom b/shader/lighting/lineShadow.geom index 54c422921..a6c56a243 100644 --- a/shader/lighting/lineShadow.geom +++ b/shader/lighting/lineShadow.geom @@ -3,7 +3,7 @@ layout (lines_adjacency) in; layout (triangle_strip, max_vertices = 4) out; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; uniform vec3 lightPos; -vec4 shift (vec4 p) { return (vec4 (p.xyz + (1000*(p.xyz-lightPos)), 1));} +vec4 shift (vec4 p) { return (vec4 (p.xyz + (100000*(p.xyz-lightPos)), 1));} vec4 f (vec4 p) {return (theMat * p);} void main() { diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index 62d02d4e5..c97c8341e 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -173,7 +173,7 @@ startInventory = IM.fromList (zip [0..20] ,remoteLauncher ,remoteBomb ,grenade - ,spawnGun (lamp 20) + ,spawnGun (lamp 5) ,lasGun ,flamer ,poisonSprayer diff --git a/src/Dodge/Item/Weapon/TriggerType.hs b/src/Dodge/Item/Weapon/TriggerType.hs index 5d1620220..dd419fab4 100644 --- a/src/Dodge/Item/Weapon/TriggerType.hs +++ b/src/Dodge/Item/Weapon/TriggerType.hs @@ -35,7 +35,7 @@ module Dodge.Item.Weapon.TriggerType import Dodge.Data import Dodge.SoundLogic import Dodge.Creature.Action (startReloadingWeapon) -import Dodge.WorldEvent (muzzleFlashAt,tempLightForAt) +import Dodge.WorldEvent (tempLightForAt) import Dodge.WorldEvent.Cloud import Dodge.RandomHelp import Dodge.Item.Attachment.Data diff --git a/src/Dodge/Render.hs b/src/Dodge/Render.hs index 683d72147..905a36c13 100644 --- a/src/Dodge/Render.hs +++ b/src/Dodge/Render.hs @@ -53,7 +53,9 @@ doDrawing pdata w = do -- poke wall points and colors nWalls <- poke224s (shadVBOptr $ _wallTextureShader pdata) wallPointsCol nSils <- pokePoint3s (shadVBOptr $ _lightingLineShadowShader pdata) - $ youSil w ++ _foregroundEdgeVerx w + $ + --youSil w ++ + _foregroundEdgeVerx w -- poke foreground geometry and floor let addC (V2 xx yy) = V3 xx yy 0 nsurfVs <- pokePoint3s (shadVBOptr $ _lightingSurfaceShader pdata) diff --git a/src/Render.hs b/src/Render.hs index 5e4be149e..2e2c85dc4 100644 --- a/src/Render.hs +++ b/src/Render.hs @@ -72,14 +72,18 @@ createLightMap pdata lightPoints nWalls nSils nsurfVs = do currentProgram $= Just (_shaderProgram $ _lightingLineShadowShader pdata) uniform (head $ _shaderCustomUnis $ _lightingLineShadowShader pdata) $= Vector3 x y z + depthClamp $= Enabled drawShader (_lightingLineShadowShader pdata) nSils + depthClamp $= Disabled cullFace $= Just Front stencilOp $= (OpKeep,OpKeep,OpDecr) currentProgram $= Just (_shaderProgram $ _lightingOccludeShader pdata) drawShader (_lightingOccludeShader pdata) nWalls currentProgram $= Just (_shaderProgram $ _lightingLineShadowShader pdata) + depthClamp $= Enabled drawShader (_lightingLineShadowShader pdata) nSils + depthClamp $= Disabled -- draw geometry surfaces cullFace $= Just Back