Make base_glide_aircraft handle rotor model/spin

StyledStrike · Dec 28, 2024 · 6de461a · 6de461a
1 parent 94f239c
commit 6de461a
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 35 deletions.
diff --git a/lua/entities/base_glide_aircraft/init.lua b/lua/entities/base_glide_aircraft/init.lua
@@ -15,6 +15,9 @@ function ENT:OnPostInitialize()
     self.inputRoll = 0
     self.inputYaw = 0
 
+    self.rotors = {}
+    self.areRotorsSpinningFast = false
+
     -- Setup damage variables
     self.engineDamageCD = -1
     self.engineDamageSoundCD = -1
@@ -221,6 +224,38 @@ function ENT:OnPostThink( dt, selfTbl )
     if selfTbl.HasLandingGear then
         self:LandingGearThink( dt )
     end
+
+    -- Update rotors
+    self:RotorsThink()
+end
+
+function ENT:RotorsThink()
+    local power = self:GetPower()
+
+    -- Spin the rotors
+    for _, rotor in ipairs( self.rotors ) do
+        if IsValid( rotor ) then
+            rotor.spinMultiplier = power
+        end
+    end
+
+    -- Call `RotorStartSpinningFast` or `RotorStopSpinningFast`
+    -- when the result from `ShouldRotorsSpinFast` changes.
+    local areRotorsSpinningFast = self:ShouldRotorsSpinFast()
+
+    if self.areRotorsSpinningFast ~= areRotorsSpinningFast then
+        self.areRotorsSpinningFast = areRotorsSpinningFast
+
+        for _, rotor in ipairs( self.rotors ) do
+            if IsValid( rotor ) then
+                if areRotorsSpinningFast then
+                    self:RotorStartSpinningFast( rotor )
+                else
+                    self:RotorStopSpinningFast( rotor )
+                end
+            end
+        end
+    end
 end
 
 do

diff --git a/lua/entities/base_glide_aircraft/shared.lua b/lua/entities/base_glide_aircraft/shared.lua
@@ -70,9 +70,13 @@ if SERVER then
         [3] = { "glide/aircraft/gear_down.wav", 0.65, 90 }
     }
 
-    -- You can override this on your child classes.
+    -- You can override these on your child classes.
     function ENT:OnLandingGearStateChange( _state ) end
 
+    function ENT:ShouldRotorsSpinFast()
+        return self:GetPower() > 0.65
+    end
+
     function ENT:RotorStartSpinningFast( rotor )
         rotor:SetModel( rotor.modelFast or rotor.modelSlow )
     end

diff --git a/lua/entities/base_glide_heli/init.lua b/lua/entities/base_glide_heli/init.lua
@@ -208,13 +208,6 @@ function ENT:OnPostThink( dt, selfTbl )
         self:SetPower( power )
     end
 
-    -- Spin the rotors
-    for _, rotor in ipairs( selfTbl.rotors ) do
-        if IsValid( rotor ) then
-            rotor.spinMultiplier = power
-        end
-    end
-
     -- Handle out-of-control state
     if self:IsEngineOn() then
         local isOutOfControl = self:GetOutOfControl()

diff --git a/lua/entities/base_glide_plane/init.lua b/lua/entities/base_glide_plane/init.lua
@@ -10,7 +10,6 @@ function ENT:OnPostInitialize()
     BaseClass.OnPostInitialize( self )
 
     -- Setup variables used on all planes
-    self.propellers = {}
     self.powerResponse = 0.15
 
     self.isGrounded = false
@@ -39,7 +38,7 @@ function ENT:Repair()
     local validPropellers = {}
     local validCount = 0
 
-    for _, prop in ipairs( self.propellers ) do
+    for _, prop in ipairs( self.rotors ) do
         if IsValid( prop ) then
             prop:Repair()
 
@@ -48,7 +47,7 @@ function ENT:Repair()
         end
     end
 
-    self.propellers = validPropellers
+    self.rotors = validPropellers
 end
 
 --- Creates and stores a new propeller entity.
@@ -74,7 +73,7 @@ function ENT:CreatePropeller( offset, radius, slowModel, fastModel )
     prop:SetSpinAxis( "Forward" )
     prop.maxSpinSpeed = 5000
 
-    self.propellers[#self.propellers + 1] = prop
+    self.rotors[#self.rotors + 1] = prop
 
     return prop
 end
@@ -206,13 +205,6 @@ function ENT:OnPostThink( dt, selfTbl )
         end
     end
 
-    -- Spin the propellers
-    for _, prop in ipairs( selfTbl.propellers ) do
-        if IsValid( prop ) then
-            prop.spinMultiplier = power
-        end
-    end
-
     if TriggerOutput then
         TriggerOutput( self, "Power", power )
     end

diff --git a/lua/entities/glide_rotor.lua b/lua/entities/glide_rotor.lua
@@ -39,9 +39,7 @@ function ENT:Initialize()
     self.baseAngles = Angle()
     self.spinAngle = 0
     self.spinAxis = "Up"
-
     self.spinMultiplier = 0
-    self.isSpinningFast = false
 
     -- Prepare damage & trace variables
     self.rotorHealth = 400
@@ -68,7 +66,7 @@ function ENT:SetupRotor( offset, radius, modelSlow, modelFast )
     self.radius = radius
     self.modelSlow = modelSlow
     self.modelFast = modelFast
-    self:SetModel( self.isSpinningFast and modelFast or modelSlow )
+    self:SetModel( modelSlow )
 end
 
 function ENT:SetBaseAngles( angles )
@@ -131,18 +129,6 @@ function ENT:Think()
         return
     end
 
-    -- Switch between fast/slow models depending on the spinMultiplier
-    local isSpinningFast = self.spinMultiplier > 0.65
-
-    if self.isSpinningFast ~= isSpinningFast then
-        self.isSpinningFast = isSpinningFast
-        if isSpinningFast then
-            self:GetParent():RotorStartSpinningFast( self )
-        else
-            self:GetParent():RotorStopSpinningFast( self )
-        end
-    end
-
     local dt = FrameTime()
 
     self.spinAngle = ( self.spinAngle + self.maxSpinSpeed * self.spinMultiplier * dt ) % 360

diff --git a/lua/weapons/glide_repair.lua b/lua/weapons/glide_repair.lua
@@ -96,7 +96,7 @@ function SWEP:PrimaryAttack()
     local chassisHealth = ent:GetChassisHealth()
 
     if chassisHealth >= ent.MaxChassisHealth and engineHealth >= 1 then
-        local rotors = ent.rotors or ent.propellers
+        local rotors = ent.rotors
         if not rotors then return end
 
         for i = 1, #rotors do