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

WIP item position syncing

Browse Source
This commit is contained in:
Regalis
2017-02-02 20:40:58 +02:00
parent 39f977535d
commit b5bac67c4a
8 changed files with 185 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Content/Items/Diving/divinggear.xml
+1 -1
View File
@@ -36,7 +36,7 @@
<Sprite texture ="DivingMask.png" depth="0.55"/> <Sprite texture ="DivingMask.png" depth="0.55"/>
<Body radius="18" density="15"/> <Body width="26" height="18" density="15"/>
<Wearable limbtype="Head" slots="Any,Face"> <Wearable limbtype="Head" slots="Any,Face">
<sprite texture="DivingMask.png" limb="Head" sourcerect="1,1,37,38"/> <sprite texture="DivingMask.png" limb="Head" sourcerect="1,1,37,38"/>
Subsurface/Content/Items/Jobgear/misc.xml
+2 -2
View File
@@ -8,7 +8,7 @@
<Sprite texture ="headset.png" depth="0.6"/> <Sprite texture ="headset.png" depth="0.6"/>
<Body radius="8" density="10"/> <Body width="12" height="8" density="10"/>
<WifiComponent range="20000.0" LinkToChat="true"> <WifiComponent range="20000.0" LinkToChat="true">
<RequiredItems name="Battery Cell" type="Contained"/> <RequiredItems name="Battery Cell" type="Contained"/>
@@ -34,7 +34,7 @@
<Sprite texture ="clownmask.png" depth="0.6"/> <Sprite texture ="clownmask.png" depth="0.6"/>
<Body radius="8" density="10"/> <Body width="10" radius="10" density="10"/>
<Wearable limbtype="Head" slots="Any,Face"> <Wearable limbtype="Head" slots="Any,Face">
<sprite texture="clownmask.png" limb="Head" origin="0.5,0.5"/> <sprite texture="clownmask.png" limb="Head" origin="0.5,0.5"/>
Subsurface/Source/Characters/Animation/Ragdoll.cs
+2 -2
View File
@@ -584,9 +584,9 @@ namespace Barotrauma
foreach (Limb limb in Limbs) foreach (Limb limb in Limbs)
{ {
if (limb.body.TargetPosition != Vector2.Zero) if (limb.body.TargetPosition != null)
{ {
Vector2 pos = ConvertUnits.ToDisplayUnits(limb.body.TargetPosition); Vector2 pos = ConvertUnits.ToDisplayUnits((Vector2)limb.body.TargetPosition);
if (currentHull != null) pos += currentHull.Submarine.DrawPosition; if (currentHull != null) pos += currentHull.Submarine.DrawPosition;
pos.Y = -pos.Y; pos.Y = -pos.Y;
Subsurface/Source/Characters/Character.cs
+1 -1
View File
@@ -1086,7 +1086,7 @@ namespace Barotrauma
if (torso == null) return null; if (torso == null) return null;
Vector2 pos = (torso.body.TargetPosition != Vector2.Zero) ? torso.body.TargetPosition : torso.SimPosition; Vector2 pos = (torso.body.TargetPosition != null) ? (Vector2)torso.body.TargetPosition : torso.SimPosition;
Vector2 pickPos = mouseSimPos; Vector2 pickPos = mouseSimPos;
if (Submarine != null) if (Submarine != null)
Subsurface/Source/Items/Components/Holdable/Pickable.cs
+2 -3
View File
@@ -195,10 +195,9 @@ namespace Barotrauma.Items.Components
Limb rightHand = picker.AnimController.GetLimb(LimbType.RightHand); Limb rightHand = picker.AnimController.GetLimb(LimbType.RightHand);
bodyDropPos = rightHand.SimPosition; bodyDropPos = rightHand.SimPosition;
if (item.body!=null) if (item.body != null)
{ {
item.body.LinearVelocity = rightHand.body.LinearVelocity; item.body.ResetDynamics();
item.body.AngularVelocity = rightHand.body.AngularVelocity;
} }
picker.Inventory.RemoveItem(item); picker.Inventory.RemoveItem(item);
Subsurface/Source/Items/Item.cs
+99 -9
View File
@@ -46,8 +46,13 @@ namespace Barotrauma
public List<IDrawableComponent> drawableComponents; public List<IDrawableComponent> drawableComponents;
public PhysicsBody body; public PhysicsBody body;
private Vector2 lastSentPos;
private bool prevBodyAwake;
private bool needsPositionUpdate;
private float lastSentCondition; private float lastSentCondition;
private float condition; private float condition;
private bool inWater; private bool inWater;
@@ -148,6 +153,18 @@ namespace Barotrauma
return (body==null) ? base.SimPosition : body.SimPosition; return (body==null) ? base.SimPosition : body.SimPosition;
} }
} }
public bool NeedsPositionUpdate
{
get
{
if (body == null || !body.Enabled) return false;
return needsPositionUpdate;
}
set
{
needsPositionUpdate = value;
}
}
protected Color spriteColor; protected Color spriteColor;
[Editable, HasDefaultValue("1.0,1.0,1.0,1.0", true)] [Editable, HasDefaultValue("1.0,1.0,1.0,1.0", true)]
@@ -358,6 +375,8 @@ namespace Barotrauma
{ {
case "body": case "body":
body = new PhysicsBody(subElement, ConvertUnits.ToSimUnits(Position)); body = new PhysicsBody(subElement, ConvertUnits.ToSimUnits(Position));
body.FarseerBody.AngularDamping = 0.2f;
body.FarseerBody.LinearDamping = 0.1f;
break; break;
case "trigger": case "trigger":
case "sprite": case "sprite":
@@ -790,18 +809,17 @@ namespace Barotrauma
body.SetTransform(body.SimPosition - Submarine.SimPosition, body.Rotation); body.SetTransform(body.SimPosition - Submarine.SimPosition, body.Rotation);
} }
//Vector2 moveAmount = body.SimPosition - body.LastSentPosition;
//if (parentInventory == null && moveAmount != Vector2.Zero && moveAmount.Length() > NetConfig.ItemPosUpdateDistance)
//{
// new NetworkEvent(NetworkEventType.PhysicsBodyPosition, ID, false);
//}
Vector2 displayPos = ConvertUnits.ToDisplayUnits(body.SimPosition); Vector2 displayPos = ConvertUnits.ToDisplayUnits(body.SimPosition);
rect.X = (int)(displayPos.X - rect.Width / 2.0f); rect.X = (int)(displayPos.X - rect.Width / 2.0f);
rect.Y = (int)(displayPos.Y + rect.Height / 2.0f); rect.Y = (int)(displayPos.Y + rect.Height / 2.0f);
} }
body.MoveToTargetPosition(); UpdateNetPosition(deltaTime);
if (GameMain.Client != null)
{
body.MoveToTargetPosition();
}
if (!inWater || Container != null || body == null) return; if (!inWater || Container != null || body == null) return;
@@ -978,7 +996,7 @@ namespace Barotrauma
(int)Math.Max((1.5f / GameScreen.Selected.Cam.Zoom), 1.0f)); (int)Math.Max((1.5f / GameScreen.Selected.Cam.Zoom), 1.0f));
} }
} }
if (!ShowLinks) return; if (!ShowLinks) return;
foreach (MapEntity e in linkedTo) foreach (MapEntity e in linkedTo)
@@ -1540,6 +1558,8 @@ namespace Barotrauma
parentInventory.RemoveItem(this); parentInventory.RemoveItem(this);
parentInventory = null; parentInventory = null;
} }
lastSentPos = SimPosition;
} }
public void Equip(Character character) public void Equip(Character character)
@@ -1556,7 +1576,6 @@ namespace Barotrauma
public List<ObjectProperty> GetProperties<T>() public List<ObjectProperty> GetProperties<T>()
{ {
List<ObjectProperty> editableProperties = ObjectProperty.GetProperties<T>(this); List<ObjectProperty> editableProperties = ObjectProperty.GetProperties<T>(this);
foreach (ItemComponent ic in components) foreach (ItemComponent ic in components)
@@ -1713,6 +1732,12 @@ namespace Barotrauma
public void ClientRead(ServerNetObject type, NetIncomingMessage msg, float sendingTime) public void ClientRead(ServerNetObject type, NetIncomingMessage msg, float sendingTime)
{ {
if (type == ServerNetObject.ENTITY_POSITION)
{
ClientReadPosition(type, msg, sendingTime);
return;
}
NetEntityEvent.Type eventType = (NetEntityEvent.Type)msg.ReadByte(); NetEntityEvent.Type eventType = (NetEntityEvent.Type)msg.ReadByte();
switch (eventType) switch (eventType)
{ {
@@ -2021,6 +2046,71 @@ namespace Barotrauma
return item; return item;
} }
private void UpdateNetPosition(float deltaTime)
{
if (GameMain.Server == null) return;
if (body == null || !body.Enabled || parentInventory != null) return;
float minDistance = !body.FarseerBody.Awake && prevBodyAwake ?
0.1f : NetConfig.ItemPosUpdateDistance;
if (Vector2.Distance(lastSentPos, SimPosition) > minDistance)
{
needsPositionUpdate = true;
}
prevBodyAwake = body.FarseerBody.Awake;
}
public void ServerWritePosition(NetBuffer msg, Client c, object[] extraData = null)
{
msg.Write(ID);
//length in bytes
msg.Write((byte)(4 + 4 + 1));
msg.Write(SimPosition.X);
msg.Write(SimPosition.Y);
msg.Write(MathUtils.AngleToByte(body.Rotation));
lastSentPos = SimPosition;
}
public void ClientReadPosition(ServerNetObject type, NetIncomingMessage msg, float sendingTime)
{
body.TargetPosition = new Vector2(
msg.ReadFloat(),
msg.ReadFloat());
body.FarseerBody.Rotation = MathUtils.ByteToAngle(msg.ReadByte());
DebugConsole.NewMessage("Received item pos, t: "+sendingTime+ " ("+Name+")", Color.LightGreen);
/* //already interpolating with more up-to-date data -> ignore
if (MemPos.Count > 1 && MemPos[0].Timestamp > sendingTime)
{
return;
}
int index = 0;
while (index < MemPos.Count && sendingTime > MemPos[index].Timestamp)
{
index++;
}
//position with the same timestamp already in the buffer (duplicate packet?)
// -> no need to add again
if (index < MemPos.Count && sendingTime == MemPos[index].Timestamp)
{
return;
}
MemPos.Insert(index, new PosInfo(newTargetPosition, Direction.None, sendingTime));*/
}
public static void Load(XElement element, Submarine submarine) public static void Load(XElement element, Submarine submarine)
{ {
string rectString = ToolBox.GetAttributeString(element, "rect", "0,0,0,0"); string rectString = ToolBox.GetAttributeString(element, "rect", "0,0,0,0");
Subsurface/Source/Networking/GameServer.cs
+18 -1
View File
@@ -77,7 +77,7 @@ namespace Barotrauma.Networking
config.SimulatedDuplicatesChance = 0.05f; config.SimulatedDuplicatesChance = 0.05f;
config.SimulatedMinimumLatency = 0.1f; config.SimulatedMinimumLatency = 0.1f;
config.ConnectionTimeout = 5.0f; config.ConnectionTimeout = 60.0f;
#endif #endif
config.Port = port; config.Port = port;
Port = port; Port = port;
@@ -503,6 +503,11 @@ namespace Barotrauma.Networking
ClientWriteLobby(c); ClientWriteLobby(c);
} }
} }
foreach (Item item in Item.ItemList)
{
item.NeedsPositionUpdate = false;
}
} }
updateTimer = DateTime.Now + updateInterval; updateTimer = DateTime.Now + updateInterval;
@@ -688,6 +693,9 @@ namespace Barotrauma.Networking
case ClientNetObject.ENTITY_STATE: case ClientNetObject.ENTITY_STATE:
entityEventManager.Read(inc, c); entityEventManager.Read(inc, c);
break; break;
case ClientNetObject.VOTE:
Voting.RegisterVote(inc, c);
break;
default: default:
return; return;
} }
@@ -766,6 +774,15 @@ namespace Barotrauma.Networking
outmsg.WritePadBits(); outmsg.WritePadBits();
} }
foreach (Item item in Item.ItemList)
{
if (!item.NeedsPositionUpdate) continue;
outmsg.Write((byte)ServerNetObject.ENTITY_POSITION);
item.ServerWritePosition(outmsg, c);
outmsg.WritePadBits();
}
entityEventManager.Write(c, outmsg); entityEventManager.Write(c, outmsg);
outmsg.Write((byte)ServerNetObject.END_OF_MESSAGE); outmsg.Write((byte)ServerNetObject.END_OF_MESSAGE);
Subsurface/Source/Physics/PhysicsBody.cs
+60 -29
View File
@@ -75,15 +75,12 @@ namespace Barotrauma
protected Vector2 prevPosition; protected Vector2 prevPosition;
protected float prevRotation; protected float prevRotation;
protected Vector2 targetPosition; protected Vector2? targetPosition;
//protected Vector2 targetVelocity; protected float? targetRotation;
protected float targetRotation;
//protected float targetAngularVelocity;
private Vector2 drawPosition; private Vector2 drawPosition;
private float drawRotation; private float drawRotation;
private float lastNetworkUpdateTime; private float lastNetworkUpdateTime;
public Vector2 LastSentPosition public Vector2 LastSentPosition
{ {
@@ -109,24 +106,41 @@ namespace Barotrauma
get { return bodyShape; } get { return bodyShape; }
} }
public Vector2 TargetPosition public Vector2? TargetPosition
{ {
get { return targetPosition; } get { return targetPosition; }
set set
{ {
if (!MathUtils.IsValid(value)) return; if (value == null)
targetPosition.X = MathHelper.Clamp(value.X, -10000.0f, 10000.0f); {
targetPosition.Y = MathHelper.Clamp(value.Y, -10000.0f, 10000.0f); targetPosition = null;
}
else
{
if (!MathUtils.IsValid((Vector2)value)) return;
targetPosition = new Vector2(
MathHelper.Clamp(((Vector2)value).X, -10000.0f, 10000.0f),
MathHelper.Clamp(((Vector2)value).Y, -10000.0f, 10000.0f));
}
} }
} }
public float TargetRotation public float? TargetRotation
{ {
get { return targetRotation; } get { return targetRotation; }
set set
{ {
if (!MathUtils.IsValid(value)) return; if (value == null)
targetRotation = value; {
targetRotation = null;
}
else
{
if (!MathUtils.IsValid((float)value)) return;
targetRotation = value;
}
} }
} }
@@ -378,25 +392,21 @@ namespace Barotrauma
public void MoveToTargetPosition(bool lerp = true) public void MoveToTargetPosition(bool lerp = true)
{ {
if (targetPosition == Vector2.Zero) if (targetPosition == null) return;
if (lerp && Vector2.Distance((Vector2)targetPosition, body.Position) < 10.0f)
{ {
offsetFromTargetPos = Vector2.Zero; offsetFromTargetPos = (Vector2)targetPosition - (body.Position - offsetFromTargetPos);
return; prevPosition = (Vector2)targetPosition;
} }
if (lerp && Vector2.Distance(targetPosition, body.Position)<10.0f) body.SetTransform((Vector2)targetPosition, targetRotation == null ? body.Rotation : (float)targetRotation);
{ targetPosition = null;
offsetFromTargetPos = targetPosition - (body.Position - offsetFromTargetPos);
prevPosition = targetPosition;
}
body.SetTransform(targetPosition, targetRotation == 0.0f ? body.Rotation : targetRotation);
targetPosition = Vector2.Zero;
} }
public void MoveToPos(Vector2 pos, float force, Vector2? pullPos = null) public void MoveToPos(Vector2 pos, float force, Vector2? pullPos = null)
{ {
if (pullPos==null) pullPos = body.Position; if (pullPos == null) pullPos = body.Position;
Vector2 vel = body.LinearVelocity; Vector2 vel = body.LinearVelocity;
Vector2 deltaPos = pos - (Vector2)pullPos; Vector2 deltaPos = pos - (Vector2)pullPos;
@@ -445,7 +455,7 @@ namespace Barotrauma
} }
else else
{ {
offsetFromTargetPos = Vector2.Lerp(offsetFromTargetPos, Vector2.Zero, 0.1f); offsetFromTargetPos = Vector2.Lerp(offsetFromTargetPos, Vector2.Zero, 0.05f);
} }
} }
@@ -459,12 +469,33 @@ namespace Barotrauma
SpriteEffects spriteEffect = (dir == 1.0f) ? SpriteEffects.None : SpriteEffects.FlipHorizontally; SpriteEffects spriteEffect = (dir == 1.0f) ? SpriteEffects.None : SpriteEffects.FlipHorizontally;
if (GameMain.DebugDraw && !body.Awake) if (GameMain.DebugDraw)
{ {
color = Color.Blue; if (!body.Awake) color = Color.Blue;
if (targetPosition != null)
{
Vector2 pos = ConvertUnits.ToDisplayUnits((Vector2)targetPosition);
if (Submarine != null) pos += Submarine.DrawPosition;
GUI.DrawRectangle(spriteBatch,
new Vector2(pos.X - 5, -(pos.Y + 5)),
Vector2.One*10.0f, Color.Red, false, 0, 3);
}
if (offsetFromTargetPos != Vector2.Zero)
{
Vector2 pos = ConvertUnits.ToDisplayUnits(body.Position);
if (Submarine != null) pos += Submarine.DrawPosition;
GUI.DrawLine(spriteBatch,
new Vector2(pos.X, -pos.Y),
new Vector2(DrawPosition.X, -DrawPosition.Y),
Color.Cyan, 0, 5);
}
} }
sprite.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y), color, -drawRotation, scale, spriteEffect, depth); sprite.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y), color, -drawRotation, scale, spriteEffect, depth);
} }
public void DebugDraw(SpriteBatch spriteBatch, Color color) public void DebugDraw(SpriteBatch spriteBatch, Color color)