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

(7e32870a0) Check that item has a non-zero mass before applying water forces (couldn't reproduce it, but had a debug assertion fail due to the mass of an alien artifact being 0), validate clamped force before attempting to apply it

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-03 16:23:37 +03:00
parent 98cf26178f
commit abad70f0c1
4 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs
-4
View File
@@ -26,10 +26,6 @@ namespace Barotrauma.Items.Components
private float blinkTimer;
private bool itemLoaded;
private float blinkTimer;
public PhysicsBody ParentBody;
[Editable(MinValueFloat = 0.0f, MaxValueFloat = 2048.0f), Serialize(100.0f, true)]
Barotrauma/BarotraumaShared/Source/Items/Item.cs
+6 -1
View File
@@ -1077,7 +1077,7 @@ namespace Barotrauma
}
ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
if (body == null || !body.Enabled || !inWater || ParentInventory != null) return;
if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }
ApplyWaterForces();
CurrentHull?.ApplyFlowForces(deltaTime, this);
@@ -1116,6 +1116,11 @@ namespace Barotrauma
/// </summary>
private void ApplyWaterForces()
{
if (body.Mass <= 0.0f)
{
return;
}
float forceFactor = 1.0f;
if (CurrentHull != null)
{
Barotrauma/BarotraumaShared/Source/Physics/PhysicsBody.cs
+4 -2
View File
@@ -646,7 +646,6 @@ namespace Barotrauma
/// </summary>
public void ApplyForce(Vector2 force, float maxVelocity)
{
if (!IsValidValue(force, "force", -1e10f, 1e10f)) return;
if (!IsValidValue(maxVelocity, "max velocity")) return;
Vector2 velocityAddition = force / Mass * (float)Timing.Step;
@@ -657,7 +656,10 @@ namespace Barotrauma
{
newVelocity = newVelocity.ClampLength(maxVelocity);
}
body.ApplyForce((newVelocity - body.LinearVelocity) * Mass / (float)Timing.Step);
Vector2 clampedForce = (newVelocity - body.LinearVelocity) * Mass / (float)Timing.Step;
if (!IsValidValue(force, "clamped force", -1e10f, 1e10f)) return;
body.ApplyForce(force);
}
public void ApplyForce(Vector2 force, Vector2 point)