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

Option to hide waypoints and spawnpoints in editor, fixed cam "twitching" in multiplayer, additional light sprites for lightcomponents, wire bugfixes, fixed excessive camera shake when firing the railgun

Browse Source
This commit is contained in:
Regalis
2016-01-04 22:36:39 +02:00
parent bc9ff32023
commit ca7febfcab
20 changed files with 123 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Subsurface/Source/Map/SubmarineBody.cs
View File

@@ -35,7 +35,7 @@ namespace Barotrauma
private Body body;
private Vector2 targetPosition;
private Vector2? targetPosition;
float mass = 10000.0f;
@@ -60,7 +60,7 @@ namespace Barotrauma
public Vector2 TargetPosition
{
get { return targetPosition; }
//get { return targetPosition; }
set
{
if (!MathUtils.IsValid(value)) return;
@@ -210,26 +210,33 @@ namespace Barotrauma
public void Update(float deltaTime)
{
if (targetPosition != Vector2.Zero && targetPosition != Position)
if (targetPosition != null && targetPosition != Position)
{
float dist = Vector2.Distance(targetPosition, Position);
Vector2 targetSimPos = ConvertUnits.ToSimUnits((Vector2)targetPosition);
float dist = Vector2.Distance((Vector2)targetPosition, Position);
if (dist > 1000.0f)
{
body.SetTransform(ConvertUnits.ToSimUnits(targetPosition), 0.0f);
targetPosition = Vector2.Zero;
body.SetTransform(targetSimPos, 0.0f);
targetPosition = null;
}
else if (dist > 50.0f)
{
body.SetTransform((ConvertUnits.ToSimUnits(targetPosition) - body.Position) * 0.01f, 0.0f);
Vector2 moveAmount = Vector2.Normalize(targetSimPos - body.Position);
moveAmount *= Math.Min(dist, 100.0f);
body.SetTransform(body.Position + moveAmount * deltaTime, 0.0f);
}
else
{
targetPosition = null;
}
}
else
{
targetPosition = Vector2.Zero;
targetPosition = null;
}
//-------------------------
Vector2 totalForce = CalculateBuoyancy();