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

Fixed the door collision bug at docking ports

Browse Source
This commit is contained in:
Regalis
2016-08-16 20:21:33 +03:00
parent 26b6847bca
commit 7c8e866030
5 changed files with 113 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Subsurface/Source/Physics/PhysicsBody.cs
View File

@@ -42,8 +42,8 @@ namespace Barotrauma
private set;
}
public readonly Shape bodyShape;
public readonly float height, width, radius;
private Shape bodyShape;
public float height, width, radius;
private float density;
@@ -53,6 +53,11 @@ namespace Barotrauma
Vector2 offsetFromTargetPos;
public Shape BodyShape
{
get { return bodyShape; }
}
public Vector2 TargetPosition
{
get { return targetPosition; }
@@ -192,14 +197,12 @@ namespace Barotrauma
{
}
public PhysicsBody(Body body)
{
this.body = body;
density = 10.0f;
public PhysicsBody(float width, float height, float radius, float density)
{
CreateBody(width, height, radius, density);
dir = 1.0f;
LastSentPosition = body.Position;
list.Add(this);
@@ -213,29 +216,7 @@ namespace Barotrauma
density = ToolBox.GetAttributeFloat(element, "density", 10.0f);
if (width != 0.0f && height != 0.0f)
{
body = BodyFactory.CreateRectangle(GameMain.World, width, height, density);
bodyShape = Shape.Rectangle;
}
else if (radius != 0.0f && height != 0.0f)
{
body = BodyFactory.CreateCapsule(GameMain.World, height, radius, density);
bodyShape = Shape.Capsule;
}
else if (radius != 0.0f)
{
body = BodyFactory.CreateCircle(GameMain.World, radius, density);
bodyShape = Shape.Circle;
}
else
{
DebugConsole.ThrowError("Invalid body dimensions in " + element);
}
this.width = width;
this.height = height;
this.radius = radius;
CreateBody(width, height, radius, density);
dir = 1.0f;
@@ -257,6 +238,33 @@ namespace Barotrauma
list.Add(this);
}
private void CreateBody(float width, float height, float radius, float density)
{
if (width != 0.0f && height != 0.0f)
{
body = BodyFactory.CreateRectangle(GameMain.World, width, height, density);
bodyShape = Shape.Rectangle;
}
else if (radius != 0.0f && height != 0.0f)
{
body = BodyFactory.CreateCapsule(GameMain.World, height, radius, density);
bodyShape = Shape.Capsule;
}
else if (radius != 0.0f)
{
body = BodyFactory.CreateCircle(GameMain.World, radius, density);
bodyShape = Shape.Circle;
}
else
{
DebugConsole.ThrowError("Invalid physics body dimensions (width: " + width + ", height: " + height + ", radius: " + radius + ")");
}
this.width = width;
this.height = height;
this.radius = radius;
}
public void ResetDynamics()
{
body.ResetDynamics();