Michatec/wk_wars2x
1
1
Fork 0
mirror of https://github.com/Michatec/wk_wars2x.git synced 2026-04-01 08:26:27 +02:00
Code Issues Packages Projects Releases Activity

End Y trace coordinate cached on setting change

Browse Source
This commit is contained in:
Dan
2019-12-01 17:22:32 +00:00
parent 6877d61267
commit 50a2a74a52
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cl_radar.lua
View File

@@ -140,10 +140,10 @@ RADAR.rayTraces = {
-- { startVec = { x = 0.0 }, endVec = { x = 0.0, y = 200.0 }, rayType = "same" }, -- { startVec = { x = 0.0 }, endVec = { x = 0.0, y = 200.0 }, rayType = "same" },
-- { startVec = { x = -5.0 }, endVec = { x = -5.0, y = 200.0 }, rayType = "same" }, -- { startVec = { x = -5.0 }, endVec = { x = -5.0, y = 200.0 }, rayType = "same" },
-- { startVec = { x = 5.0 }, endVec = { x = 5.0, y = 200.0 }, rayType = "same" }, -- { startVec = { x = 5.0 }, endVec = { x = 5.0, y = 200.0 }, rayType = "same" },
{ startVec = { x = 3.0 }, endVec = { x = 3.0, y = 200.0 }, rayType = "same" }, { startVec = { x = 3.0 }, endVec = { x = 3.0, y = 200.0, baseY = 200.0 }, rayType = "same" },
{ startVec = { x = -3.0 }, endVec = { x = -3.0, y = 200.0 }, rayType = "same" }, { startVec = { x = -3.0 }, endVec = { x = -3.0, y = 200.0, baseY = 200.0 }, rayType = "same" },
{ startVec = { x = -10.0 }, endVec = { x = -10.0, y = 200.0 }, rayType = "opp" }, { startVec = { x = -10.0 }, endVec = { x = -10.0, y = 200.0, baseY = 200.0 }, rayType = "opp" },
{ startVec = { x = -16.0 }, endVec = { x = -16.0, y = 200.0 }, rayType = "opp" } { startVec = { x = -16.0 }, endVec = { x = -16.0, y = 200.0, baseY = 200.0 }, rayType = "opp" }
} }
-- Each of these are used for sorting the captured vehicle data, the 'strongest' filter is used for the main -- Each of these are used for sorting the captured vehicle data, the 'strongest' filter is used for the main
@@ -196,6 +196,10 @@ end
function RADAR:SetSettingValue( setting, value ) function RADAR:SetSettingValue( setting, value )
if ( value ~= nil ) then if ( value ~= nil ) then
self.vars.settings[setting] = value self.vars.settings[setting] = value
if ( value == "same" or value == "opp" ) then
self:UpdateRayEndCoords()
end
end end
end end
@@ -469,11 +473,17 @@ end
function RADAR:CreateRayThreads( ownVeh, vehicles ) function RADAR:CreateRayThreads( ownVeh, vehicles )
for _, v in pairs( self.rayTraces ) do for _, v in pairs( self.rayTraces ) do
local endY = ( self:GetSettingValue( v.rayType ) * 0.2 ) * v.endVec.y self:CreateRayThread( vehicles, ownVeh, v.startVec.x, v.endVec.x, v.endVec.y, v.rayType )
self:CreateRayThread( vehicles, ownVeh, v.startVec.x, v.endVec.x, endY, v.rayType )
end end
end end
function RADAR:UpdateRayEndCoords()
for k, v in pairs( self.rayTraces ) do
local endY = ( self:GetSettingValue( v.rayType ) * 0.2 ) * v.endVec.y
v.endVec.y = endY
end
end
--[[------------------------------------------------------------------------ --[[------------------------------------------------------------------------
Radar stage functions Radar stage functions
@@ -937,6 +947,7 @@ Citizen.CreateThread( function()
SetNuiFocus( false, false ) SetNuiFocus( false, false )
RADAR:CacheNumRays() RADAR:CacheNumRays()
RADAR:UpdateRayEndCoords()
while ( true ) do while ( true ) do
RADAR:Main() RADAR:Main()