vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed IsKeyHit (ladder climbing being inconsistent) + optimized interaction syncing

Browse Source 
Instead of sending over mouse position as two floats (8 bytes total), the game will send the aim angle represented as a short (0 to 65535, so it's fairly precise) and the selected item ID (up to 4 bytes total, 2 bytes if it's only one of the inputs).

The problem with IsKeyHit is that it checked when the player started a key press, when it should've been checking for the key being released.
This commit is contained in:
juanjp600
2017-01-09 15:06:19 -03:00
parent a75ef8ee51
commit cfeb720836
3 changed files with 83 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
+1 -1
View File
@@ -832,7 +832,7 @@ namespace Barotrauma
trigger = character.SelectedConstruction.TransformTrigger(trigger); trigger = character.SelectedConstruction.TransformTrigger(trigger);
bool notClimbing = false; bool notClimbing = false;
if (character.IsRemotePlayer) if (character.IsRemotePlayer && GameMain.Server == null)
{ {
notClimbing = character.IsKeyDown(InputType.Left) || character.IsKeyDown(InputType.Right); notClimbing = character.IsKeyDown(InputType.Left) || character.IsKeyDown(InputType.Right);
} }
Subsurface/Source/Characters/Animation/Ragdoll.cs
-1
View File
@@ -1285,7 +1285,6 @@ namespace Barotrauma
Vector2 positionError = serverPos.Position - localPos.Position; Vector2 positionError = serverPos.Position - localPos.Position;
float errorMagnitude = positionError.Length(); float errorMagnitude = positionError.Length();
DebugConsole.NewMessage(positionError.X.ToString()+" "+positionError.Y.ToString(),Color.Red);
/*if (errorMagnitude > 8.0f) /*if (errorMagnitude > 8.0f)
{ {
Subsurface/Source/Characters/Character.cs
+80 -33
View File
@@ -46,8 +46,15 @@ namespace Barotrauma
private InputNetFlags dequeuedInput = 0; private InputNetFlags dequeuedInput = 0;
private InputNetFlags prevDequeuedInput = 0; private InputNetFlags prevDequeuedInput = 0;
private List<InputNetFlags> memInput = new List<InputNetFlags>(); private struct NetInputMem
private List<Vector2> memMousePos = new List<Vector2>(); {
public InputNetFlags states; //keys pressed/other boolean states at this step
public UInt16 intAim; //aim angle, represented as an unsigned short where 0=0º, 65535=just a bit under 360º
public UInt16 interact; //id of the item being interacted with
}
private List<NetInputMem> memInput = new List<NetInputMem>();
//private List<Vector2> memMousePos = new List<Vector2>();
private List<PosInfo> memPos = new List<PosInfo>(); private List<PosInfo> memPos = new List<PosInfo>();
private List<PosInfo> memLocalPos = new List<PosInfo>(); private List<PosInfo> memLocalPos = new List<PosInfo>();
@@ -689,22 +696,22 @@ namespace Barotrauma
switch (inputType) switch (inputType)
{ {
case InputType.Left: case InputType.Left:
return (dequeuedInput.HasFlag(InputNetFlags.Left)) && !(prevDequeuedInput.HasFlag(InputNetFlags.Left)); return !(dequeuedInput.HasFlag(InputNetFlags.Left)) && (prevDequeuedInput.HasFlag(InputNetFlags.Left));
//break; //break;
case InputType.Right: case InputType.Right:
return (dequeuedInput.HasFlag(InputNetFlags.Right)) && !(prevDequeuedInput.HasFlag(InputNetFlags.Right)); return !(dequeuedInput.HasFlag(InputNetFlags.Right)) && (prevDequeuedInput.HasFlag(InputNetFlags.Right));
//break; //break;
case InputType.Up: case InputType.Up:
return (dequeuedInput.HasFlag(InputNetFlags.Up)) && !(prevDequeuedInput.HasFlag(InputNetFlags.Up)); return !(dequeuedInput.HasFlag(InputNetFlags.Up)) && (prevDequeuedInput.HasFlag(InputNetFlags.Up));
//break; //break;
case InputType.Down: case InputType.Down:
return (dequeuedInput.HasFlag(InputNetFlags.Down)) && !(prevDequeuedInput.HasFlag(InputNetFlags.Down)); return !(dequeuedInput.HasFlag(InputNetFlags.Down)) && (prevDequeuedInput.HasFlag(InputNetFlags.Down));
//break; //break;
case InputType.Run: case InputType.Run:
return (dequeuedInput.HasFlag(InputNetFlags.Run)) && !(prevDequeuedInput.HasFlag(InputNetFlags.Run)); return !(dequeuedInput.HasFlag(InputNetFlags.Run)) && (prevDequeuedInput.HasFlag(InputNetFlags.Run));
//break; //break;
case InputType.Select: case InputType.Select:
return (dequeuedInput.HasFlag(InputNetFlags.Select)) && !(prevDequeuedInput.HasFlag(InputNetFlags.Select)); return dequeuedInput.HasFlag(InputNetFlags.Select); //TODO: clean up the way this input is registered
//break; //break;
default: default:
return false; return false;
@@ -732,7 +739,7 @@ namespace Barotrauma
case InputType.Run: case InputType.Run:
return dequeuedInput.HasFlag(InputNetFlags.Run); return dequeuedInput.HasFlag(InputNetFlags.Run);
case InputType.Select: case InputType.Select:
return dequeuedInput.HasFlag(InputNetFlags.Select); return false; //TODO: clean up the way this input is registered
case InputType.Aim: case InputType.Aim:
return dequeuedInput.HasFlag(InputNetFlags.Aim); return dequeuedInput.HasFlag(InputNetFlags.Aim);
case InputType.Use: case InputType.Use:
@@ -1354,22 +1361,27 @@ namespace Barotrauma
AnimController.Frozen = false; AnimController.Frozen = false;
prevDequeuedInput = dequeuedInput; prevDequeuedInput = dequeuedInput;
dequeuedInput = memInput[memInput.Count - 1]; dequeuedInput = memInput[memInput.Count - 1].states;
memInput.RemoveAt(memInput.Count - 1);
cursorPosition = memMousePos[memMousePos.Count - 1]; double aimAngle = ((double)memInput[memInput.Count - 1].intAim/65535.0)*2.0*Math.PI;
memMousePos.RemoveAt(memMousePos.Count - 1); cursorPosition = AnimController.Collider.Position+new Vector2((float)Math.Cos(aimAngle), (float)Math.Sin(aimAngle))*60.0f;
closestItem = Item.ItemList.Find(it => it.ID == memInput[memInput.Count - 1].interact);
if (IsKeyDown(InputType.Select) && closestItem==null)
{
DebugConsole.NewMessage("whoops!",Color.Green);
}
memInput.RemoveAt(memInput.Count - 1);
TransformCursorPos(); TransformCursorPos();
if (dequeuedInput == InputNetFlags.None && Math.Abs(AnimController.Collider.LinearVelocity.X) < 0.005f && Math.Abs(AnimController.Collider.LinearVelocity.Y) < 0.2f) if ((dequeuedInput == InputNetFlags.None || dequeuedInput == InputNetFlags.FacingLeft) && Math.Abs(AnimController.Collider.LinearVelocity.X) < 0.005f && Math.Abs(AnimController.Collider.LinearVelocity.Y) < 0.2f)
{ {
while (memInput.Count > 5 && memInput[memInput.Count - 1] == 0) while (memInput.Count > 5 && memInput[memInput.Count - 1].states == dequeuedInput)
{ {
//remove inputs where the player is not moving at all //remove inputs where the player is not moving at all
//helps the server catch up, shouldn't affect final position //helps the server catch up, shouldn't affect final position
memInput.RemoveAt(memInput.Count - 1); memInput.RemoveAt(memInput.Count - 1);
memMousePos.RemoveAt(memMousePos.Count - 1);
} }
} }
} }
@@ -1385,19 +1397,28 @@ namespace Barotrauma
if (IsKeyDown(InputType.Up)) newInput |= InputNetFlags.Up; if (IsKeyDown(InputType.Up)) newInput |= InputNetFlags.Up;
if (IsKeyDown(InputType.Down)) newInput |= InputNetFlags.Down; if (IsKeyDown(InputType.Down)) newInput |= InputNetFlags.Down;
if (IsKeyDown(InputType.Run)) newInput |= InputNetFlags.Run; if (IsKeyDown(InputType.Run)) newInput |= InputNetFlags.Run;
if (IsKeyDown(InputType.Select)) newInput |= InputNetFlags.Select; if (IsKeyHit(InputType.Select)) newInput |= InputNetFlags.Select; //TODO: clean up the way this input is registered
if (IsKeyDown(InputType.Use)) newInput |= InputNetFlags.Use; if (IsKeyDown(InputType.Use)) newInput |= InputNetFlags.Use;
if (IsKeyDown(InputType.Aim)) newInput |= InputNetFlags.Aim; if (IsKeyDown(InputType.Aim)) newInput |= InputNetFlags.Aim;
if (AnimController.TargetDir == Direction.Left) newInput |= InputNetFlags.FacingLeft; if (AnimController.TargetDir == Direction.Left) newInput |= InputNetFlags.FacingLeft;
memInput.Insert(0, newInput);
memMousePos.Insert(0, /*closestItem!=null ? closestItem.Position : */cursorPosition);
Vector2 relativeCursorPos = cursorPosition - AnimController.Collider.Position;
relativeCursorPos.Normalize();
UInt16 intAngle = (UInt16)(65535.0*Math.Atan2(relativeCursorPos.Y,relativeCursorPos.X)/(2.0*Math.PI));
NetInputMem newMem = new NetInputMem();
newMem.states = newInput;
newMem.intAim = intAngle;
newMem.interact = closestItem != null ? closestItem.ID : (UInt16)0;
memInput.Insert(0, newMem);
LastNetworkUpdateID++; LastNetworkUpdateID++;
if (memInput.Count > 60) if (memInput.Count > 60)
{ {
memInput.RemoveRange(60, memInput.Count - 60); memInput.RemoveRange(60, memInput.Count - 60);
memMousePos.RemoveRange(60, memMousePos.Count - 60);
} }
} }
@@ -1479,7 +1500,7 @@ namespace Barotrauma
{ {
Vector2 mouseSimPos = ConvertUnits.ToSimUnits(cursorPosition); Vector2 mouseSimPos = ConvertUnits.ToSimUnits(cursorPosition);
if (IsKeyHit(InputType.Select)) if (IsKeyHit(InputType.Select) && GameMain.Server==null)
{ {
closestCharacter = FindClosestCharacter(mouseSimPos); closestCharacter = FindClosestCharacter(mouseSimPos);
if (closestCharacter != null && closestCharacter.info == null) if (closestCharacter != null && closestCharacter.info == null)
@@ -1492,6 +1513,7 @@ namespace Barotrauma
if (closestCharacter != null && closestItem != null) if (closestCharacter != null && closestItem != null)
{ {
if (closestItem != null) closestItemDist = (closestItem.Position - AnimController.Collider.Position).Length();
if (Vector2.Distance(closestCharacter.SimPosition, mouseSimPos) < ConvertUnits.ToSimUnits(closestItemDist)) if (Vector2.Distance(closestCharacter.SimPosition, mouseSimPos) < ConvertUnits.ToSimUnits(closestItemDist))
{ {
if (selectedConstruction != closestItem) closestItem = null; if (selectedConstruction != closestItem) closestItem = null;
@@ -1505,10 +1527,14 @@ namespace Barotrauma
if (selectedCharacter == null && closestItem != null) if (selectedCharacter == null && closestItem != null)
{ {
closestItem.IsHighlighted = true; //DebugConsole.NewMessage(closestItem.ToString(), Color.Yellow);
//closestItem.IsHighlighted = true;
if (!LockHands && closestItem.Pick(this)) if (!LockHands && closestItem.Pick(this))
{ {
if (AnimController.Anim == AnimController.Animation.Climbing)
{
//DebugConsole.NewMessage("ladder woo",Color.Lime);
}
} }
} }
@@ -1978,7 +2004,6 @@ namespace Barotrauma
if (memInput.Count > 60) if (memInput.Count > 60)
{ {
memInput.RemoveRange(60,memInput.Count - 60); memInput.RemoveRange(60,memInput.Count - 60);
memMousePos.RemoveRange(60,memMousePos.Count - 60);
} }
msg.Write(LastNetworkUpdateID); msg.Write(LastNetworkUpdateID);
@@ -1986,12 +2011,20 @@ namespace Barotrauma
msg.Write(inputCount); msg.Write(inputCount);
for (int i = 0; i < inputCount; i++) for (int i = 0; i < inputCount; i++)
{ {
msg.WriteRangedInteger(0, (int)InputNetFlags.MaxVal,(int)memInput[i]); msg.WriteRangedInteger(0, (int)InputNetFlags.MaxVal,(int)memInput[i].states);
if (memInput[i].HasFlag(InputNetFlags.Select) || memInput[i].HasFlag(InputNetFlags.Aim)) if (memInput[i].states.HasFlag(InputNetFlags.Aim))
{
msg.Write(memInput[i].intAim);
}
if (memInput[i].states.HasFlag(InputNetFlags.Select))
{
msg.Write(memInput[i].interact);
}
/*if (memInput[i].HasFlag(InputNetFlags.Select) || memInput[i].HasFlag(InputNetFlags.Aim))
{ {
msg.Write(memMousePos[i].X); msg.Write(memMousePos[i].X);
msg.Write(memMousePos[i].Y); msg.Write(memMousePos[i].Y);
} }*/
} }
} }
} }
@@ -2009,19 +2042,34 @@ namespace Barotrauma
for (int i = 0; i < inputCount; i++) for (int i = 0; i < inputCount; i++)
{ {
InputNetFlags newInput = (InputNetFlags)msg.ReadRangedInteger(0, (int)InputNetFlags.MaxVal); InputNetFlags newInput = (InputNetFlags)msg.ReadRangedInteger(0, (int)InputNetFlags.MaxVal);
Vector2 newMousePos = Position; //Vector2 newMousePos = Position;
UInt16 newAim = 0;
UInt16 newInteract = 0;
if (newInput.HasFlag(InputNetFlags.Aim))
{
newAim = msg.ReadUInt16();
}
if (newInput.HasFlag(InputNetFlags.Select))
{
newInteract = msg.ReadUInt16();
}
if (AllowInput) if (AllowInput)
{ {
if (newInput.HasFlag(InputNetFlags.Select) || newInput.HasFlag(InputNetFlags.Aim)) /*if (newInput.HasFlag(InputNetFlags.Select) || newInput.HasFlag(InputNetFlags.Aim))
{ {
newMousePos.X = msg.ReadSingle(); newMousePos.X = msg.ReadSingle();
newMousePos.Y = msg.ReadSingle(); newMousePos.Y = msg.ReadSingle();
} }*/
if ((i < ((long)networkUpdateID - (long)LastNetworkUpdateID)) && (i < 60)) if ((i < ((long)networkUpdateID - (long)LastNetworkUpdateID)) && (i < 60))
{ {
memInput.Insert(i, newInput); NetInputMem newMem = new NetInputMem();
memMousePos.Insert(i, newMousePos); newMem.states = newInput;
newMem.intAim = newAim;
newMem.interact = newInteract;
memInput.Insert(i, newMem);
} }
} }
} }
@@ -2035,7 +2083,6 @@ namespace Barotrauma
//deleting inputs from the queue here means the server is way behind and data needs to be dropped //deleting inputs from the queue here means the server is way behind and data needs to be dropped
//we'll make the server drop down to 30 inputs for good measure //we'll make the server drop down to 30 inputs for good measure
memInput.RemoveRange(30, memInput.Count - 30); memInput.RemoveRange(30, memInput.Count - 30);
memMousePos.RemoveRange(30, memMousePos.Count - 30);
} }
break; break;