Merge pull request #331 from Astralcircle/moreperf

More entity __index optimizations

Author: StyledStrike

lua/entities/base_glide/cl_init.lua

@@ -70,20 +70,36 @@ end
 local IsValid = IsValid
 
 function ENT:GetWheelSpin( index )
-    local wheel = self.wheels and self.wheels[index]
+    local wheels = self.wheels
 
-    if IsValid( wheel ) and wheel.GetLastSpin then
-        return wheel:GetLastSpin()
+    if wheels then
+        local wheel = wheels[index]
+
+        if IsValid( wheel ) then
+            local GetLastSpin = wheel.GetLastSpin
+
+            if GetLastSpin then
+                return GetLastSpin( wheel )
+            end
+        end
     end
 
     return 0
 end
 
 function ENT:GetWheelOffset( index )
-    local wheel = self.wheels and self.wheels[index]
+    local wheels = self.wheels
 
-    if IsValid( wheel ) and wheel.GetBaseZPos then
-        return wheel:GetLocalPos()[3] - wheel:GetBaseZPos()
+    if wheels then
+        local wheel = wheels[index]
+
+        if IsValid( wheel ) then
+            local GetBaseZPos = wheel.GetBaseZPos
+
+            if GetBaseZPos then
+                return wheel:GetLocalPos()[3] - GetBaseZPos( wheel )
+            end
+        end
     end
 
     return 0
@@ -182,7 +198,6 @@ end
 
 local RealTime = RealTime
 local Effect = util.Effect
-local IsGameUIVisible = gui.IsGameUIVisible
 local GetTable = FindMetaTable( "Entity" ).GetTable
 
 local DEFAULT_FLAME_ANGLE = Angle()
@@ -192,12 +207,11 @@ function ENT:InternalUpdateFeatures()
     local selfTbl = GetTable( self )
 
     -- Keep particles consistent even at high FPS
-    if t > selfTbl.particleCD and self:WaterLevel() < 3 and not IsGameUIVisible() then
+    if t > selfTbl.particleCD and self:WaterLevel() < 3 then
         selfTbl.particleCD = t + 0.03
+        selfTbl.OnUpdateParticles( self )
 
-        self:OnUpdateParticles()
-
-        if self:GetIsEngineOnFire() then
+        if selfTbl.GetIsEngineOnFire( self ) then
             local velocity = self:GetVelocity()
             local eff = EffectData()
 
@@ -212,35 +226,33 @@ function ENT:InternalUpdateFeatures()
     end
 
     -- Manually manage the engine fire sound instead of using ENT:CreateLoopingSound
-    if self:GetIsEngineOnFire() then
+    if selfTbl.GetIsEngineOnFire( self ) then
         if not selfTbl.engineFireSound then
             selfTbl.engineFireSound = CreateSound( self, "glide/fire/fire_loop_1.wav" )
             selfTbl.engineFireSound:SetSoundLevel( 80 )
             selfTbl.engineFireSound:PlayEx( 0.9, 100 )
         end
-
     elseif selfTbl.engineFireSound then
         selfTbl.engineFireSound:Stop()
         selfTbl.engineFireSound = nil
     end
 
     if selfTbl.shouldThinkNow then
-        local isSoundActive = self:ShouldActivateSounds()
+        local isSoundActive = selfTbl.ShouldActivateSounds( self )
 
         if isSoundActive then
             if not selfTbl.isSoundActive then
                 selfTbl.isSoundActive = true
-                self:OnActivateSounds()
+                selfTbl.OnActivateSounds( self )
             end
 
             -- Let children classes do their own thing
-            self:OnUpdateSounds()
-
+            selfTbl.OnUpdateSounds( self )
         elseif selfTbl.isSoundActive then
-            self:InternalDeactivateSounds()
+            selfTbl.InternalDeactivateSounds( self )
         end
 
-        local signal = self:GetTurnSignalState()
+        local signal = selfTbl.GetTurnSignalState( self )
 
         if signal > 0 and selfTbl.TurnSignalVolume > 0 then
             local signalBlink = ( CurTime() % selfTbl.TurnSignalCycle ) > selfTbl.TurnSignalCycle * 0.5
@@ -259,7 +271,7 @@ function ENT:InternalUpdateFeatures()
 
         local sounds = selfTbl.sounds
 
-        if sounds.start and self:GetEngineState() ~= 1 then
+        if sounds.start and selfTbl.GetEngineState( self ) ~= 1 then
             sounds.start:Stop()
             sounds.start = nil
 
@@ -270,11 +282,11 @@ function ENT:InternalUpdateFeatures()
     end
 
     -- Update lights and sprites
-    self:UpdateLights( selfTbl )
+    selfTbl.UpdateLights( self, selfTbl )
 
     -- Let children classes do their own thing
-    self:OnUpdateMisc()
-    self:OnUpdateAnimations()
+    selfTbl.OnUpdateMisc( self )
+    selfTbl.OnUpdateAnimations( self )
 end
 
 function ENT:Think()
@@ -283,20 +295,21 @@ function ENT:Think()
     -- Run some things less frequently when the
     -- local player is not inside this vehicle.
     local t = RealTime()
+    local selfTbl = GetTable( self )
     local shouldThinkNow = true
 
-    if not self.isLocalPlayerInVehicle then
-        shouldThinkNow = t > self.lazyThinkCD
+    if not selfTbl.isLocalPlayerInVehicle then
+        shouldThinkNow = t > selfTbl.lazyThinkCD
 
         if shouldThinkNow then
-            self.lazyThinkCD = t + 0.05
+            selfTbl.lazyThinkCD = t + 0.05
         end
     end
 
-    self.shouldThinkNow = shouldThinkNow
+    selfTbl.shouldThinkNow = shouldThinkNow
 
-    if self.rfMisc then
-        self.rfMisc:Think()
+    if selfTbl.rfMisc then
+        selfTbl.rfMisc:Think()
     end
 
     return true

lua/entities/base_glide/cl_lights.lua

@@ -65,10 +65,10 @@ local colorHeadlight = Color( 255, 255, 255 )
 
 --- Draw sprites depending on which type of lights are active.
 function ENT:UpdateLights( selfTbl )
-    local headlightState = self:GetHeadlightState()
+    local headlightState = selfTbl.GetHeadlightState( self )
 
     if headlightState > 0 then
-        local colorVec = self:GetHeadlightColor()
+        local colorVec = selfTbl.GetHeadlightColor( self )
         colorHeadlight.r = colorVec[1] * 255
         colorHeadlight.g = colorVec[2] * 255
         colorHeadlight.b = colorVec[3] * 255
@@ -77,7 +77,7 @@ function ENT:UpdateLights( selfTbl )
     -- Handle projected lights
     if selfTbl.headlightState ~= headlightState then
         selfTbl.headlightState = headlightState
-        self:RemoveHeadlights()
+        selfTbl.RemoveHeadlights( self )
 
         if headlightState == 0 then return end
 
@@ -93,7 +93,7 @@ function ENT:UpdateLights( selfTbl )
 
             if enable then
                 v.angles = v.angles or Angle( 10, 0, 0 )
-                self:CreateHeadlight( index, v.offset, v.angles, v.color or colorHeadlight, v.texture, v.fovScale )
+                selfTbl.CreateHeadlight( self, index, v.offset, v.angles, v.color or colorHeadlight, v.texture, v.fovScale )
             end
         end
     end
@@ -119,14 +119,14 @@ function ENT:UpdateLights( selfTbl )
     end
 
     -- Handle sprites
-    local allowLights = self:IsEngineOn() or headlightState > 0
+    local allowLights = selfTbl.IsEngineOn( self ) or headlightState > 0
 
-    lightState.brake = allowLights and self:IsBraking()
-    lightState.reverse = allowLights and self:IsReversing()
+    lightState.brake = allowLights and selfTbl.IsBraking( self )
+    lightState.reverse = allowLights and selfTbl.IsReversing( self )
     lightState.headlight = headlightState > 0
     lightState.taillight = headlightState > 0
 
-    local signal = self:GetTurnSignalState()
+    local signal = selfTbl.GetTurnSignalState( self )
     local signalBlink = ( CurTime() % selfTbl.TurnSignalCycle ) > selfTbl.TurnSignalCycle * 0.5
 
     lightState.signal_left = signal == 1 or signal == 3

lua/entities/base_glide/init.lua

@@ -665,11 +665,14 @@ function ENT:Think()
     self:NextThink( time )
 
     -- Update speed variables
-    selfTbl.localVelocity = self:WorldToLocal( self:GetPos() + self:GetVelocity() )
+    local pos = self:GetPos()
+    local velocity = self:GetVelocity()
+    velocity:Add( pos )
+
+    selfTbl.localVelocity = self:WorldToLocal( velocity )
     selfTbl.totalSpeed = selfTbl.localVelocity:Length()
 
     local forwardSpeed = selfTbl.localVelocity[1]
-
     selfTbl.forwardAcceleration = ( forwardSpeed - selfTbl.forwardSpeed ) / dt
     selfTbl.forwardSpeed = forwardSpeed
 
@@ -679,25 +682,25 @@ function ENT:Think()
         local driverSeat = selfTbl.seats[1]
         local driver = IsValid( driverSeat ) and driverSeat:GetDriver() or NULL
 
-        if driver ~= self:GetDriver() then
-            self:SetDriver( driver )
-            self:ClearLockOnTarget()
+        if driver ~= selfTbl.GetDriver( self ) then
+            selfTbl.SetDriver( self, driver )
+            selfTbl.ClearLockOnTarget( self )
 
             if IsValid( driver ) then
                 if TriggerOutput then
                     TriggerOutput( self, "Active", 1 )
                     TriggerOutput( self, "Driver", driver )
                 end
 
-                self:OnDriverEnter()
+                selfTbl.OnDriverEnter( self )
                 selfTbl.lastDriver = driver
             else
                 if TriggerOutput then
                     TriggerOutput( self, "Active", 0 )
                     TriggerOutput( self, "Driver", NULL )
                 end
 
-                self:OnDriverExit()
+                selfTbl.OnDriverExit( self )
             end
 
             selfTbl.hasTheDriverBeenRagdolled = nil
@@ -706,16 +709,16 @@ function ENT:Think()
 
     -- Update weapons
     if selfTbl.weaponCount > 0 then
-        self:WeaponThink( selfTbl )
+        selfTbl.WeaponThink( self, selfTbl )
     end
 
     -- Update water logic
-    self:WaterThink( selfTbl )
+    selfTbl.WaterThink( self, selfTbl )
 
     -- Deal engine fire damage over time
-    if self:GetIsEngineOnFire() then
+    if selfTbl.GetIsEngineOnFire( self ) then
         if self:WaterLevel() > 2 then
-            self:SetIsEngineOnFire( false )
+            selfTbl.SetIsEngineOnFire( self, false )
         else
             local attacker = IsValid( selfTbl.lastDamageAttacker ) and selfTbl.lastDamageAttacker or self
             local inflictor = IsValid( selfTbl.lastDamageInflictor ) and selfTbl.lastDamageInflictor or self
@@ -726,42 +729,42 @@ function ENT:Think()
             dmg:SetInflictor( inflictor )
             dmg:SetDamageType( 0 )
             dmg:SetDamageForce( Vector() )
-            dmg:SetDamagePosition( self:GetPos() )
+            dmg:SetDamagePosition( pos )
             self:TakeDamageInfo( dmg )
         end
     end
 
     -- Update wheels
     if selfTbl.wheelCount > 0 then
-        self:WheelThink( dt, selfTbl )
+        selfTbl.WheelThink( self, dt, selfTbl )
     end
 
     -- Update trailer sockets
     if selfTbl.socketCount > 0 then
-        self:SocketThink( dt, time )
+        selfTbl.SocketThink( self, dt, time, selfTbl )
     end
 
     -- Handle hold input actions
     for action, data in pairs( selfTbl.holdInputActions ) do
         -- If this action has been held for long enough...
         if data.timer and time > data.timer then
             data.timer = nil
-            self:OnHoldInputAction( action, data )
+            selfTbl.OnHoldInputAction( self, action, data )
 
         elseif data.shouldRelease then
             data.shouldRelease = nil
-            self:SetInputBool( 1, action, false )
+            selfTbl.SetInputBool( self, 1, action, false )
         end
     end
 
     -- Update bodygroups
-    self:UpdateLightBodygroups()
+    selfTbl.UpdateLightBodygroups( self, selfTbl )
 
     -- Let children classes do their own stuff
-    self:OnPostThink( dt, selfTbl )
+    selfTbl.OnPostThink( self, dt, selfTbl )
 
     -- Let children classes update their features
-    self:OnUpdateFeatures( dt )
+    selfTbl.OnUpdateFeatures( self, dt )
 
     local phys = self:GetPhysicsObject()
 
@@ -775,10 +778,10 @@ function ENT:Think()
         -- Make sure the physics stay awake when necessary,
         -- otherwise the driver's input won't do anything.
         local driverInput =
-            self:GetInputFloat( 1, "accelerate", selfTbl ) +
-            self:GetInputFloat( 1, "brake", selfTbl ) +
-            self:GetInputFloat( 1, "steer", selfTbl ) +
-            self:GetInputFloat( 1, "throttle", selfTbl )
+            selfTbl.GetInputFloat( self, 1, "accelerate", selfTbl ) +
+            selfTbl.GetInputFloat( self, 1, "brake", selfTbl ) +
+            selfTbl.GetInputFloat( self, 1, "steer", selfTbl ) +
+            selfTbl.GetInputFloat( self, 1, "throttle", selfTbl )
 
         if phys:IsAsleep() and Abs( driverInput ) > 0.01 then
             phys:Wake()

lua/entities/base_glide/shared.lua

@@ -435,7 +435,7 @@ if SERVER then
     function ENT:OnWeaponStop( _weapon, _weaponIndex ) end
 
     function ENT:OnPostThink( _dt, _selfTbl ) end
-    function ENT:OnSimulatePhysics( _phys, _dt, _outLin, _outAng ) end
+    function ENT:OnSimulatePhysics( _phys, _dt, _outLin, _outAng, _selfTbl ) end
     function ENT:OnUpdateFeatures( _dt ) end
 
     function ENT:OnSocketConnect( _socket, _otherVehicle ) end

lua/entities/base_glide/sv_input.lua

@@ -27,7 +27,7 @@ function ENT:ResetInputs( seatIndex )
 end
 
 --- Mark a input action as one the vehicle's driver can hold.
---- 
+---
 --- When `action` is held for a specified amount of time,
 --- the `ENT:OnHoldInputAction` function runs instead of
 --- performing the original action.
@@ -114,7 +114,7 @@ function ENT:SetInputBool( seatIndex, action, pressed )
             -- Don't run the default logic for this action
             return
         else
-            -- If the driver released this action before the hold timer expired... 
+            -- If the driver released this action before the hold timer expired...
             if holdData.timer then
                 -- Clear the timer, run the original press action,
                 -- and then run the release action on the next tick.