ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

c# things on physics; remove unused file (runprebuild)

Browse Source
This commit is contained in:
UbitUmarov
2022-10-16 22:36:09 +01:00
parent bce31bda7d
commit 65925027f1
9 changed files with 283 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
View File

@@ -137,23 +137,22 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
public void AddCollider(uint localID, ContactPoint contact)
{
if (m_objCollisionList.TryGetValue(localID, out ContactPoint oldcp))
ref ContactPoint curcp = ref CollectionsMarshal.GetValueRefOrAddDefault(m_objCollisionList, localID, out bool ex);
if (ex)
{
float lastVel = oldcp.RelativeSpeed;
if (oldcp.PenetrationDepth < contact.PenetrationDepth)
if (curcp.PenetrationDepth < contact.PenetrationDepth)
{
if (Math.Abs(lastVel) > Math.Abs(contact.RelativeSpeed))
contact.RelativeSpeed = lastVel;
m_objCollisionList[localID] = contact;
if (Math.Abs(curcp.PenetrationDepth) > Math.Abs(contact.RelativeSpeed))
contact.RelativeSpeed = curcp.PenetrationDepth;
curcp = contact;
}
else if (Math.Abs(lastVel) < Math.Abs(contact.RelativeSpeed))
else if (MathF.Abs(curcp.RelativeSpeed) < MathF.Abs(contact.RelativeSpeed))
{
oldcp.RelativeSpeed = contact.RelativeSpeed;
m_objCollisionList[localID] = oldcp;
curcp.RelativeSpeed = contact.RelativeSpeed;
}
}
else
m_objCollisionList.Add(localID, contact);
curcp = contact;
}
/// <summary>