Seriously improved client smoothness at higher latency (the game is n…

…ow still playable at 80ms ping!)
Ohmnivore · Jun 14, 2014 · fe3bbcf · fe3bbcf
1 parent 1db5002
commit fe3bbcf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/Client/export/windows/cpp/bin/SkullRush.exe b/Client/export/windows/cpp/bin/SkullRush.exe
diff --git a/Client/export/windows/cpp/bin/config.txt b/Client/export/windows/cpp/bin/config.txt
@@ -1,4 +1,4 @@
-version=0.3.4
+version=0.3.6
 name=NOOB
 team=1
 ip=

diff --git a/Client/source/SkullClient.hx b/Client/source/SkullClient.hx
@@ -168,7 +168,7 @@ class SkullClient extends Client
 			Reg.state.playermap.set(Reg.state.player.ID, Reg.state.player);
 
 			FlxG.camera.follow(Reg.state.player);
-			FlxG.camera.followLerp = 15.0;
+			FlxG.camera.followLerp = 30.0;
 		}
 
 		if (MsgID == Msg.PlayerInfoAnnounce.ID)

diff --git a/Shared/code/PlayerBase.hx b/Shared/code/PlayerBase.hx
@@ -1,4 +1,5 @@
 package ;
+import enet.ENet;
 import flash.utils.Timer;
 import flixel.addons.effects.FlxTrail;
 import flixel.addons.weapon.FlxBullet;
@@ -402,19 +403,28 @@ class PlayerBase extends FlxSprite
 		return Serializer.run(_arr);
 	}
 
+	public function lerp(v0:Float, v1:Float, t:Float):Float
+	{
+		return (1 - t) * v0 + t * v1;
+	}
+
 	public function c_unserialize(Arr:Array<Dynamic>):Void
 	{
 		_arr = Arr;
 
 		if (_arr.length == 14) //used to be 7
 		{
-			x = _arr[1];
-			y = _arr[2];
+			//velocity.x = ((_arr[1] - x) * 0.3 + _arr[7] * 0.5 + velocity.x * 0.2);
+			//velocity.y = ((_arr[2] - y) * 0.3 + _arr[8] * 0.4 + velocity.y * 0.3);
+
+			velocity.x = lerp(velocity.x, _arr[7], 0.4);
+			velocity.y = lerp(velocity.y, _arr[8], 0.4);
+
+			x = lerp(x, _arr[1], 0.8);
+			y = lerp(y, _arr[2], 0.8);
 
-			//velocity.x = (_arr[1] - x);
-			//velocity.y = (_arr[2] - y);
-			velocity.x = _arr[7];
-			velocity.y = _arr[8];
+			//x = _arr[1];
+			//y = _arr[2];
 
 			a = _arr[3];
 			isRight = _arr[4];