Commit before changing text rendering

This commit is contained in:
2021-03-07 18:21:45 +01:00
parent 6d34b79764
commit 80a38eca58
2 changed files with 7 additions and 2 deletions
+4 -1
View File
@@ -1,6 +1,6 @@
#version 430 core #version 430 core
layout (points) in; layout (points) in;
layout (triangle_strip, max_vertices = 8) out; layout (triangle_strip, max_vertices = 12) out;
in vec4 vBackPoss[]; in vec4 vBackPoss[];
uniform vec2 lightPos; uniform vec2 lightPos;
@@ -31,11 +31,14 @@ void main()
vec2 backR = backR4.xy; vec2 backR = backR4.xy;
if (isLHS( lightPos - frontL, frontR - frontL) < 0) if (isLHS( lightPos - frontL, frontR - frontL) < 0)
// if (isLHS( lightPos - backL, backR - backL) < 0)
{ {
emitLine (frontL);
emitLine (backL); emitLine (backL);
emitLine (frontL); emitLine (frontL);
emitLine (frontR); emitLine (frontR);
emitLine (backR); emitLine (backR);
emitLine (frontR);
} }
else else
{ {
+3 -1
View File
@@ -396,6 +396,7 @@ lineOnScreen w (p1:p2:_) = errorPointInPolygon 8 p1 sp || errorPointInPolygon 9
drawWallShadow :: World -> Wall -> Drawing drawWallShadow :: World -> Wall -> Drawing
--drawWallShadow w _ = blank
drawWallShadow w wall drawWallShadow w wall
| isRHS sightFrom x y = blank | isRHS sightFrom x y = blank
-- | otherwise = onLayerL l $ color shadCol $ polygon $ points -- | otherwise = onLayerL l $ color shadCol $ polygon $ points
@@ -404,7 +405,8 @@ drawWallShadow w wall
colorAndLayer | _wlIsSeeThrough wall = setLayer 2 colorAndLayer | _wlIsSeeThrough wall = setLayer 2
. onLayerL [levLayer ShadowLayer] . onLayerL [levLayer ShadowLayer]
. color (withAlpha 0.2 $ _wlColor wall) . color (withAlpha 0.2 $ _wlColor wall)
| otherwise = onLayerL [levLayer ShadowLayer,2] | otherwise = setLayer 1
. onLayerL [levLayer ShadowLayer,2]
. color black . color black
(x:y:_) = _wlLine wall (x:y:_) = _wlLine wall
ps = linePointsBetween x y ps = linePointsBetween x y