From 5bfdbef76a3070bb080fefab056321efa8a85384 Mon Sep 17 00:00:00 2001 From: Dan Date: Fri, 29 Nov 2019 19:34:31 +0000 Subject: [PATCH] Cleaned up ray thread code a bit, swapped light if for inline if --- cl_radar.lua | 17 +++++++---------- nui/radar.js | 6 ++++-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/cl_radar.lua b/cl_radar.lua index 9e195ad..2290777 100644 --- a/cl_radar.lua +++ b/cl_radar.lua @@ -127,8 +127,8 @@ RADAR.rayTraces = { -- { startVec = { x = 0.0, y = 5.0 }, endVec = { x = 0.0, y = 150.0 }, rayType = "same" }, -- { startVec = { x = -5.0, y = 15.0 }, endVec = { x = -5.0, y = 150.0 }, rayType = "same" }, -- { startVec = { x = 5.0, y = 15.0 }, endVec = { x = 5.0, y = 150.0 }, rayType = "same" }, - { startVec = { x = 0.0, y = 5.0 }, endVec = { x = 0.0, y = 150.0 }, rayType = "same" }, - { startVec = { x = -10.0, y = 15.0 }, endVec = { x = -10.0, y = 150.0 }, rayType = "opp" } + { startVec = { x = 0.0 }, endVec = { x = 0.0, y = 150.0 }, rayType = "same" }, + { startVec = { x = -10.0 }, endVec = { x = -10.0, y = 150.0 }, rayType = "opp" } } -- Each of these are used for sorting the captured vehicle data, depending on what the @@ -336,17 +336,14 @@ function RADAR:GetVehsHitByRay( ownVeh, vehs, s, e ) end function RADAR:CreateRayThread( vehs, from, startX, endX, endY, rayType ) - -- Citizen.CreateThread( function() - local startP = GetOffsetFromEntityInWorldCoords( from, startX, 0.0, 0.0 ) - local endP = GetOffsetFromEntityInWorldCoords( from, endX, endY, 0.0 ) + local startP = GetOffsetFromEntityInWorldCoords( from, startX, 0.0, 0.0 ) + local endP = GetOffsetFromEntityInWorldCoords( from, endX, endY, 0.0 ) - local hitVehs = self:GetVehsHitByRay( from, vehs, startP, endP ) + local hitVehs = self:GetVehsHitByRay( from, vehs, startP, endP ) - self:InsertCapturedVehicleData( hitVehs, rayType ) + self:InsertCapturedVehicleData( hitVehs, rayType ) - -- UTIL:DebugPrint( "Ray thread: increasing ray state from " .. tostring( self:GetRayTraceState() ) .. " to " .. tostring( self:GetRayTraceState() + 1 ) ) - self:IncreaseRayTraceState() - -- end ) + self:IncreaseRayTraceState() end function RADAR:CreateRayThreads( ownVeh, vehicles ) diff --git a/nui/radar.js b/nui/radar.js index 18e491b..84e2f94 100644 --- a/nui/radar.js +++ b/nui/radar.js @@ -156,9 +156,11 @@ function setLight( ant, cat, item, state ) let obj = elements.antennas[ant][cat][item]; if ( state ) { - if ( cat == "dirs" ) { obj.addClass( "active_arrow" ) } else { obj.addClass( "active" ) }; + // if ( cat == "dirs" ) { obj.addClass( "active_arrow" ) } else { obj.addClass( "active" ) }; + cat == "dirs" ? obj.addClass( "active_arrow" ) : obj.addClass( "active" ); } else { - if ( cat == "dirs" ) { obj.removeClass( "active_arrow" ) } else { obj.removeClass( "active" ) }; + // if ( cat == "dirs" ) { obj.removeClass( "active_arrow" ) } else { obj.removeClass( "active" ) }; + cat == "dirs" ? obj.removeClass( "active_arrow" ) : obj.removeClass( "active" ); } }