Enemies lerp to new positions

Author: valkyrienyanko

Scripts/Netcode/Common/SPacketEnemyPositions.cs

@@ -44,12 +44,14 @@ public override async Task Handle()
         {
             var sceneGameScript = SceneManager.GetActiveSceneScript<Game.SceneGame>();
 
-            foreach (var pair in Enemies)
+            sceneGameScript.EnemyTransformQueue.Add(Enemies);
+
+            /*foreach (var pair in Enemies)
             {
                 var enemy = sceneGameScript.Enemies[pair.Key];
-                if (enemy.Position.DistanceTo(pair.Value.Position) > 100)
+                if (enemy.Position.DistanceTo(pair.Value.Position) > 100) // TODO: Lerp
                     sceneGameScript.Enemies[pair.Key].Position = pair.Value.Position;
-            }
+            }*/
 
             await Task.FromResult(1);
         }

Scripts/Scenes/Game/Enemy.cs

@@ -14,8 +14,11 @@ public override void _Ready()
         {
             Sprite = GetNode<Sprite>(NodePathSprite);
 
-            var calcTarget = new GTimer(200);
-            calcTarget.Connect(this, nameof(CalcVelocity));
+            if (NetworkManager.IsHost)
+            {
+                var calcTarget = new GTimer(200);
+                calcTarget.Connect(this, nameof(CalcVelocity));
+            }
         }
 
         public override void _PhysicsProcess(float delta)
@@ -30,7 +33,8 @@ public override void _PhysicsProcess(float delta)
 
         public override void _IntegrateForces(Physics2DDirectBodyState state)
         {
-            state.LinearVelocity = Velocity;
+            if (NetworkManager.IsHost)
+                state.LinearVelocity = Velocity;
         }
 
         public Dictionary<byte, Game.OtherPlayer> Players { get; set; }

Scripts/Scenes/Game/SceneGame.cs

@@ -12,6 +12,8 @@ public class SceneGame : AScene
         public Dictionary<byte, OtherPlayer> Players;
         public Dictionary<ushort, Enemy> Enemies;
         public ClientPlayer Player { get; set; }
+
+        public PrevCurQueue<Dictionary<ushort, DataEnemy>> EnemyTransformQueue { get; set; }
         private PrevCurQueue<Dictionary<byte, DataEntityTransform>> PlayerTransformQueue { get; set; }
 
         private List<Sprite> Bullets = new List<Sprite>();
@@ -28,6 +30,7 @@ public override void _Ready()
 
             AddChild(Player);
             PlayerTransformQueue = new PrevCurQueue<Dictionary<byte, DataEntityTransform>>(ServerIntervals.PlayerTransforms);
+            EnemyTransformQueue = new PrevCurQueue<Dictionary<ushort, DataEnemy>>(ServerIntervals.PlayerTransforms);
 
             var bullet = Prefabs.Bullet.Instance<Sprite>();
             Bullets.Add(bullet);
@@ -53,10 +56,14 @@ public override void _PhysicsProcess(float delta)
                 bullet.Position += new Vector2(0, -1f);
 
             PlayerTransformQueue.UpdateProgress(delta);
+            EnemyTransformQueue.UpdateProgress(delta);
 
             if (PlayerTransformQueue.NotReady)
                 return;
 
+            if (EnemyTransformQueue.NotReady)
+                return;
+
             foreach (var pair in PlayerTransformQueue.Current)
             {
                 if (!Players.ContainsKey(pair.Key)) // TODO: Find more optimal approach for checking this
@@ -73,6 +80,16 @@ public override void _PhysicsProcess(float delta)
                 player.Position = Utils.Lerp(prev.Position, cur.Position, PlayerTransformQueue.Progress);
                 player.PlayerSprite.Rotation = Utils.LerpAngle(player.PlayerSprite.Rotation, cur.Rotation, 0.05f);
             }
+
+            foreach (var pair in EnemyTransformQueue.Current)
+            {
+                var enemy = Enemies[pair.Key];
+
+                var prev = EnemyTransformQueue.Previous[pair.Key];
+                var cur = pair.Value;
+
+                enemy.Position = Utils.Lerp(prev.Position, cur.Position, EnemyTransformQueue.Progress);
+            }
         }
 
         public override void _Input(InputEvent @event)