Merge pull request #24 from kirillbrest123/rotorwash-fix

Rotorwash fix
StyledStrike · Dec 28, 2024 · b300ee8 · b300ee8
2 parents b370ec1 + a3777b7
commit b300ee8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/lua/entities/base_glide/init.lua b/lua/entities/base_glide/init.lua
@@ -541,3 +541,6 @@ function ENT:GetSpawnColor()
     local color = colors[math.random( #colors )]
     return Color( color.r, color.g, color.b )
 end
+
+function ENT:RotorStartSpinningFast( _rotor ) end
+function ENT:RotorStopSpinningFast( _rotor ) end
diff --git a/lua/entities/base_glide_aircraft/init.lua b/lua/entities/base_glide_aircraft/init.lua
@@ -502,3 +502,11 @@ function ENT:TriggerInput( name, value )
         self:SelectWeaponIndex( Clamp( value, 1, self.weaponCount ) )
     end
 end
+
+function ENT:RotorStartSpinningFast( rotor )
+    rotor:SetModel( rotor.modelFast or rotor.modelSlow )
+end
+
+function ENT:RotorStopSpinningFast( rotor )
+    rotor:SetModel( rotor.modelSlow )
+end
diff --git a/lua/entities/base_glide_heli/init.lua b/lua/entities/base_glide_heli/init.lua
@@ -40,7 +40,7 @@ function ENT:Repair()
         self.mainRotor:SetBaseAngles( self.MainRotorAngle )
     end
 
-    -- Create tail rotor, if it doesn't exist and we have a model for it 
+    -- Create tail rotor, if it doesn't exist and we have a model for it
     if not IsValid( self.tailRotor ) then
         self.tailRotor = self:CreateRotor( self.TailRotorOffset, self.TailRotorRadius, self.TailRotorModel, self.TailRotorFastModel )
         self.tailRotor:SetBaseAngles( self.TailRotorAngle )
@@ -247,3 +247,14 @@ function ENT:OnSimulatePhysics( phys, _, outLin, outAng )
         self:SimulateHelicopter( phys, params, effectiveness, outLin, outAng )
     end
 end
+
+
+function ENT:RotorStartSpinningFast( rotor )
+    BaseClass.RotorStartSpinningFast( self, rotor )
+    self:CreateRotorWash()
+end
+
+function ENT:RotorStopSpinningFast( rotor )
+    BaseClass.RotorStopSpinningFast( self, rotor )
+    self:RemoveRotorWash()
+end
diff --git a/lua/entities/glide_rotor.lua b/lua/entities/glide_rotor.lua
@@ -136,11 +136,10 @@ function ENT:Think()
 
     if self.isSpinningFast ~= isSpinningFast then
         self.isSpinningFast = isSpinningFast
-        self:SetModel( isSpinningFast and self.modelFast or self.modelSlow )
         if isSpinningFast then
-            self:GetParent():CreateRotorWash()
+            self:GetParent():RotorStartSpinningFast( self )
         else
-            self:GetParent():RemoveRotorWash()
+            self:GetParent():RotorStopSpinningFast( self )
         end
     end