diff --git a/shader/lightmapWall.geom b/shader/lightmapWall.geom index 07e5a31a0..ca1cf858a 100644 --- a/shader/lightmapWall.geom +++ b/shader/lightmapWall.geom @@ -13,8 +13,8 @@ float isLHS (vec2 startV, vec2 testV) { return sign( -startV.x * testV.y + startV.y * testV.x); } -vec4 shiftUp (vec4 v) -{ return vec4 (v.xy , v.z-0.1 , v.w) ; } +vec4 shiftCloser (vec4 v) +{ return vec4 (v.xy , v.z-0.0001 , v.w) ; } void main() { @@ -31,10 +31,10 @@ if (isLHS (p1.xy - lightPos, p2.xy - lightPos) < 0) vec2 d1 = p1.xy - lightPos; vec2 d2 = p2.xy - lightPos; - vec4 a1 = shiftUp( perpMat * p1 ); - vec4 a2 = shiftUp( perpMat * p2 ); - vec4 a3 = shiftUp( perpMat * p3 ); - vec4 a4 = shiftUp( perpMat * p4 ); + vec4 a1 = shiftCloser( perpMat * p1 ); + vec4 a2 = shiftCloser( perpMat * p2 ); + vec4 a3 = shiftCloser( perpMat * p3 ); + vec4 a4 = shiftCloser( perpMat * p4 ); dField = vec3( d1.x/rad, d1.y/rad, 0); gl_Position = a1; diff --git a/src/Dodge/Floor.hs b/src/Dodge/Floor.hs index eac928237..977c2be27 100644 --- a/src/Dodge/Floor.hs +++ b/src/Dodge/Floor.hs @@ -32,7 +32,7 @@ lev1 = do ( [return $ return $ Right deadEndRoom ] - ++ [slowDoorRoom] + ++ [roomMiniIntro] ++ [return $ connectRoom corridor ,return $ connectRoom door] ++ firstWeapon diff --git a/src/Dodge/Rendering.hs b/src/Dodge/Rendering.hs index e06603b3c..47a3be055 100644 --- a/src/Dodge/Rendering.hs +++ b/src/Dodge/Rendering.hs @@ -70,6 +70,7 @@ worldPictures w , ptPicts' , afterPtPicts' , wlPicts' + , wlPicts -- , wallShadows , smokeShadows -- , itLabels @@ -337,7 +338,8 @@ drawWall' w wall f (bpa,bpb) = intersectSegLineFrom' bpa bpb x (head p's) f' (bpa,bpb) = intersectSegLineFrom' bpa bpb y (last p's) points = orderPolygon (borderps ++ ps) - --points = orderPolygon (borderps ++ p's) + wallBase | _wlIsSeeThrough wall = polygon $ _wlLine wall + | otherwise = blank drawWallShadow :: World -> Wall -> Drawing drawWallShadow w wall