From 0b8ec4d169ced2f102bbd342d28fe1042c765882 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Sun, 29 May 2016 17:16:11 -0600
Subject: [PATCH] light: CalcPoints: increase distance to pull back from
 obstructions to from 0.1 to 1.0. fixes room corner seams on
 calcpointstest.map

---
 light/ltface.c              |   2 +-
 testmaps/calcpointstest.map | 106 ++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 testmaps/calcpointstest.map

diff --git a/light/ltface.c b/light/ltface.c
index c8dc1172..080d516f 100644
--- a/light/ltface.c
+++ b/light/ltface.c
@@ -611,7 +611,7 @@ CheckObstructed(const lightsurf_t *surf, const vec3_t offset, const vec_t us, co
                 VectorSubtract(hitpoint, surf->midpoint, tracedir);
                 const vec_t hitdist = VectorNormalize(tracedir);
                 
-                VectorMA(surf->midpoint, qmax(0.0f, hitdist - 0.1f), tracedir, corrected);
+                VectorMA(surf->midpoint, qmax(0.0f, hitdist - 1.0f), tracedir, corrected);
                 return true;
             }
         }
diff --git a/testmaps/calcpointstest.map b/testmaps/calcpointstest.map
new file mode 100644
index 00000000..3063a7a4
--- /dev/null
+++ b/testmaps/calcpointstest.map
@@ -0,0 +1,106 @@
+// Game: Quake
+// Format: Standard
+// entity 0
+{
+"classname" "worldspawn"
+"wad" "free_wad.wad"
+"_sunlight" "100"
+// brush 0
+{
+( 528 64 16 ) ( 528 64 17 ) ( 528 65 16 ) sgrate4 0 0 0 1 1
+( -64 -64 -16 ) ( -64 -63 -16 ) ( -64 -64 -15 ) sgrate4 0 0 0 1 1
+( 64 256 16 ) ( 65 256 16 ) ( 64 256 17 ) sgrate4 0 0 0 1 1
+( -64 -320 -16 ) ( -64 -320 -15 ) ( -63 -320 -16 ) sgrate4 0 0 0 1 1
+( 64 64 16 ) ( 64 65 16 ) ( 65 64 16 ) sgrate4 0 0 0 1 1
+( -64 -64 -16 ) ( -63 -64 -16 ) ( -64 -63 -16 ) sgrate4 0 0 0 1 1
+}
+// brush 1
+{
+( 544 -288 16 ) ( 544 -288 17 ) ( 544 -287 16 ) gray_brick 0 0 0 1 1
+( -64 -416 -16 ) ( -64 -415 -16 ) ( -64 -416 -15 ) gray_brick 0 0 0 1 1
+( 64 -320 16 ) ( 65 -320 16 ) ( 64 -320 17 ) gray_brick 0 0 0 1 1
+( -64 -352 -16 ) ( -64 -352 -15 ) ( -63 -352 -16 ) gray_brick 0 0 0 1 1
+( 64 -288 800 ) ( 64 -287 800 ) ( 65 -288 800 ) gray_brick 0 0 0 1 1
+( -64 -416 -16 ) ( -63 -416 -16 ) ( -64 -415 -16 ) gray_brick 0 0 0 1 1
+}
+// brush 2
+{
+( -64 64 16 ) ( -64 64 17 ) ( -64 65 16 ) gray_brick 0 0 0 1 1
+( -96 -64 -16 ) ( -96 -63 -16 ) ( -96 -64 -15 ) gray_brick 0 0 0 1 1
+( 32 256 16 ) ( 33 256 16 ) ( 32 256 17 ) gray_brick 0 0 0 1 1
+( -96 -320 -16 ) ( -96 -320 -15 ) ( -95 -320 -16 ) gray_brick 0 0 0 1 1
+( 32 64 800 ) ( 32 65 800 ) ( 33 64 800 ) gray_brick 0 0 0 1 1
+( -96 -64 -16 ) ( -95 -64 -16 ) ( -96 -63 -16 ) gray_brick 0 0 0 1 1
+}
+// brush 3
+{
+( 544 64 16 ) ( 544 64 17 ) ( 544 65 16 ) gray_brick 0 0 0 1 1
+( 512 -64 -16 ) ( 512 -63 -16 ) ( 512 -64 -15 ) gray_brick 0 0 0 1 1
+( 640 256 16 ) ( 641 256 16 ) ( 640 256 17 ) gray_brick 0 0 0 1 1
+( 512 -320 -16 ) ( 512 -320 -15 ) ( 513 -320 -16 ) gray_brick 0 0 0 1 1
+( 640 64 800 ) ( 640 65 800 ) ( 641 64 800 ) gray_brick 0 0 0 1 1
+( 512 -64 -16 ) ( 513 -64 -16 ) ( 512 -63 -16 ) gray_brick 0 0 0 1 1
+}
+// brush 4
+{
+( 528 320 16 ) ( 528 320 17 ) ( 528 321 16 ) gray_brick 0 0 0 1 1
+( 192 192 -16 ) ( 192 193 -16 ) ( 192 192 -15 ) gray_brick 0 0 0 1 1
+( -32 288 16 ) ( -31 288 16 ) ( -32 288 17 ) gray_brick 0 0 0 1 1
+( -160 256 -16 ) ( -160 256 -15 ) ( -159 256 -16 ) gray_brick 0 0 0 1 1
+( -32 320 800 ) ( -32 321 800 ) ( -31 320 800 ) gray_brick 0 0 0 1 1
+( -160 192 -16 ) ( -159 192 -16 ) ( -160 193 -16 ) gray_brick 0 0 0 1 1
+}
+// brush 5
+{
+( 512 64 816 ) ( 512 64 817 ) ( 512 65 816 ) sky3 0 0 0 1 1
+( -64 -64 784 ) ( -64 -63 784 ) ( -64 -64 785 ) sky3 0 0 0 1 1
+( 64 256 816 ) ( 65 256 816 ) ( 64 256 817 ) sky3 0 0 0 1 1
+( -64 -320 784 ) ( -64 -320 785 ) ( -63 -320 784 ) sky3 0 0 0 1 1
+( 64 64 816 ) ( 64 65 816 ) ( 65 64 816 ) sky3 0 0 0 1 1
+( -64 -64 800 ) ( -63 -64 800 ) ( -64 -63 800 ) sky3 0 0 0 1 1
+}
+// brush 6
+{
+( 192 320 16 ) ( 192 320 17 ) ( 192 321 16 ) gray_brick 0 0 0 1 1
+( -112 192 -16 ) ( -112 193 -16 ) ( -112 192 -15 ) gray_brick 0 0 0 1 1
+( -192 288 16 ) ( -191 288 16 ) ( -192 288 17 ) gray_brick 0 0 0 1 1
+( -320 256 -16 ) ( -320 256 -15 ) ( -319 256 -16 ) gray_brick 0 0 0 1 1
+( -192 320 800 ) ( -192 321 800 ) ( -191 320 800 ) gray_brick 0 0 0 1 1
+( -320 192 -16 ) ( -319 192 -16 ) ( -320 193 -16 ) gray_brick 0 0 0 1 1
+}
+// brush 7
+{
+( 176 -320 128 ) ( 288 -320 144 ) ( 288 -320 128 ) shuttledoor1 0 0 0 1 1
+( 176 -320 128 ) ( 176 -192 144 ) ( 176 -320 144 ) shuttledoor1 0 0 0 1 1
+( 176 -320 272 ) ( 288 -192 272 ) ( 176 -192 272 ) shuttledoor1 0 0 0 1 1
+( 176 -320 288 ) ( 288 -192 288 ) ( 288 -320 288 ) shuttledoor1 0 0 0 1 1
+( 176 -80 128 ) ( 288 -80 144 ) ( 176 -80 144 ) shuttledoor1 0 0 0 1 1
+( 288 -320 128 ) ( 288 -192 144 ) ( 288 -192 128 ) shuttledoor1 0 0 0 1 1
+}
+}
+// entity 1
+{
+"classname" "info_player_start"
+"origin" "-32 96 40"
+"angle" "-0"
+}
+// entity 2
+{
+"classname" "func_wall"
+// brush 0
+{
+( 80 -112 96 ) ( 288 -112 112 ) ( 288 -112 96 ) hedge2 0 0 0 1 1
+( 80 -112 96 ) ( 80 80 112 ) ( 80 -112 112 ) hedge2 0 0 0 1 1
+( 80 -112 96 ) ( 288 80 96 ) ( 80 80 96 ) hedge2 0 0 0 1 1
+( 80 -112 112 ) ( 288 80 112 ) ( 288 -112 112 ) hedge2 0 0 0 1 1
+( 80 80 96 ) ( 288 80 112 ) ( 80 80 112 ) hedge2 0 0 0 1 1
+( 288 -112 96 ) ( 288 80 112 ) ( 288 80 96 ) hedge2 0 0 0 1 1
+}
+}
+// entity 3
+{
+"classname" "light"
+"origin" "64 16 24"
+"angle" "-0"
+"_color" "0 0 255"
+}