From 46a525e057170907cb44689c6347361f2d6ba108 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Sat, 13 Aug 2022 17:08:39 +1000
Subject: [PATCH] fix(zones/client): debug DrawPoly and DrawLine

Debug for boxes broke with the oal fixes, since vectors don't unpack.
Also fixes flicker when entering a debug zone.
---
 imports/zones/client.lua | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/imports/zones/client.lua b/imports/zones/client.lua
index a5e48f2..a1c8a0b 100644
--- a/imports/zones/client.lua
+++ b/imports/zones/client.lua
@@ -250,7 +250,9 @@ CreateThread(function()
 				if zone.onExit then
 					zone:onExit()
 				end
-			elseif zone.debug then
+			end
+
+			if zone.debug then
 				insideCount += 1
 				inside[insideCount] = zone
 			end
@@ -262,12 +264,13 @@ CreateThread(function()
 					for i = 1, insideCount do
 						local zone = inside[i]
 
-						if zone.insideZone then
-							zone:inside()
-						end
 
 						if zone.debug then
+							if zone.inside then zone:inside() end
+
 							zone:debug()
+						elseif zone.insideZone then
+							zone:inside()
 						end
 					end
 				end)
@@ -286,14 +289,18 @@ local DrawPoly = DrawPoly
 local function debugPoly(self)
 	for i = 1, #self.triangles do
 		local triangle = self.triangles[i]
-		DrawPoly(triangle[1], triangle[2], triangle[3], 255, 42, 24, 100)
-		DrawPoly(triangle[2], triangle[1], triangle[3], 255, 42, 24, 100)
+		DrawPoly(triangle[1].x, triangle[1].y, triangle[1].z, triangle[2].x, triangle[2].y, triangle[2].z, triangle[3].x, triangle[3].y, triangle[3].z, 255, 42, 24, 100)
+		DrawPoly(triangle[2].x, triangle[2].y, triangle[2].z, triangle[1].x, triangle[1].y, triangle[1].z, triangle[3].x, triangle[3].y, triangle[3].z, 255, 42, 24, 100)
 	end
 	for i = 1, #self.polygon do
 		local thickness = vec(0, 0, self.thickness / 2)
-		DrawLine(self.polygon[i] + thickness, self.polygon[i] - thickness, 255, 42, 24, 225)
-		DrawLine(self.polygon[i] + thickness, (self.polygon[i + 1] or self.polygon[1]) + thickness, 255, 42, 24, 225)
-		DrawLine(self.polygon[i] - thickness, (self.polygon[i + 1] or self.polygon[1]) - thickness, 255, 42, 24, 225)
+		local a = self.polygon[i] + thickness
+		local b = self.polygon[i] - thickness
+		local c = (self.polygon[i + 1] or self.polygon[1]) + thickness
+		local d = (self.polygon[i + 1] or self.polygon[1]) - thickness
+		DrawLine(a.x, a.y, a.z, b.x, b.y, b.z, 255, 42, 24, 225)
+		DrawLine(a.x, a.y, a.z, c.x, c.y, c.z, 255, 42, 24, 225)
+		DrawLine(b.x, b.y, b.z, d.x, d.y, d.z, 255, 42, 24, 225)
 	end
 end