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

(8f9250974) Fix spritesheet orientation offestting the joint widgets in the wrong direction, which made it a bit difficult to use.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-27 20:54:00 +02:00
parent ad1a726e91
commit 4cb3469c4f
40 changed files with 634 additions and 960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
+31 -78
View File
@@ -1035,78 +1035,6 @@ namespace Barotrauma
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
CheckValidity();
UpdateNetPlayerPosition(deltaTime);
CheckDistFromCollider();
UpdateCollisionCategories();
@@ -1367,17 +1295,42 @@ namespace Barotrauma
UpdateProjSpecific(deltaTime);
}
private void CheckValidity()
public bool Invalid { get; private set; }
private int validityResets;
private bool CheckValidity()
{
CheckValidity(Collider);
bool isColliderValid = CheckValidity(Collider);
bool limbsValid = true;
foreach (Limb limb in limbs)
{
if (limb.body == null || !limb.body.Enabled) { continue; }
CheckValidity(limb.body);
if (!CheckValidity(limb.body))
{
limbsValid = false;
break;
}
}
bool isValid = isColliderValid && limbsValid;
if (!isValid)
{
validityResets++;
if (validityResets > 1)
{
Invalid = true;
DebugConsole.ThrowError("Invalid ragdoll physics. Ragdoll freezed to prevent crashes.");
Collider.SetTransform(Vector2.Zero, 0.0f);
foreach (Limb limb in Limbs)
{
limb.body.SetTransform(Collider.SimPosition, 0.0f);
limb.body.ResetDynamics();
}
Frozen = true;
}
}
return isValid;
}
private void CheckValidity(PhysicsBody body)
private bool CheckValidity(PhysicsBody body)
{
string errorMsg = null;
string bodyName = body.UserData is Limb ? "Limb" : "Collider";
@@ -1429,9 +1382,9 @@ namespace Barotrauma
limb.body.ResetDynamics();
}
SetInitialLimbPositions();
return;
return false;
}
UpdateProjSpecific(deltaTime);
return true;
}
partial void UpdateProjSpecific(float deltaTime);