FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-19 07:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(zones/client): debug DrawPoly and DrawLine

Browse Source 
Debug for boxes broke with the oal fixes, since vectors don't unpack.
Also fixes flicker when entering a debug zone.
This commit is contained in:
Linden
2022-08-13 17:08:39 +10:00
parent f3ca6ee504
commit 46a525e057
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
imports/zones/client.lua
View File

@@ -250,7 +250,9 @@ CreateThread(function()
if zone.onExit then if zone.onExit then
zone:onExit() zone:onExit()
end end
elseif zone.debug then end
if zone.debug then
insideCount += 1 insideCount += 1
inside[insideCount] = zone inside[insideCount] = zone
end end
@@ -262,12 +264,13 @@ CreateThread(function()
for i = 1, insideCount do for i = 1, insideCount do
local zone = inside[i] local zone = inside[i]
if zone.insideZone then
zone:inside()
end
if zone.debug then if zone.debug then
if zone.inside then zone:inside() end
zone:debug() zone:debug()
elseif zone.insideZone then
zone:inside()
end end
end end
end) end)
@@ -286,14 +289,18 @@ local DrawPoly = DrawPoly
local function debugPoly(self) local function debugPoly(self)
for i = 1, #self.triangles do for i = 1, #self.triangles do
local triangle = self.triangles[i] local triangle = self.triangles[i]
DrawPoly(triangle[1], triangle[2], 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], triangle[1], triangle[3], 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 end
for i = 1, #self.polygon do for i = 1, #self.polygon do
local thickness = vec(0, 0, self.thickness / 2) local thickness = vec(0, 0, self.thickness / 2)
DrawLine(self.polygon[i] + thickness, self.polygon[i] - thickness, 255, 42, 24, 225) local a = self.polygon[i] + thickness
DrawLine(self.polygon[i] + thickness, (self.polygon[i + 1] or self.polygon[1]) + thickness, 255, 42, 24, 225) local b = self.polygon[i] - thickness
DrawLine(self.polygon[i] - thickness, (self.polygon[i + 1] or self.polygon[1]) - thickness, 255, 42, 24, 225) 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
end end