OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

bullet-2.82
Diva Canto 2014-05-27 10:13:43 -07:00
parent e19c830a6c fab0389cb1
commit 987c56984d
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
View File

@ -639,15 +639,18 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
{ {
if (collidersCount > 0) if (collidersCount > 0)
{ {
for (int ii = 0; ii < collidersCount; ii++) lock (PhysObjects)
{ {
uint cA = m_collisionArray[ii].aID; for (int ii = 0; ii < collidersCount; ii++)
uint cB = m_collisionArray[ii].bID; {
Vector3 point = m_collisionArray[ii].point; uint cA = m_collisionArray[ii].aID;
Vector3 normal = m_collisionArray[ii].normal; uint cB = m_collisionArray[ii].bID;
float penetration = m_collisionArray[ii].penetration; Vector3 point = m_collisionArray[ii].point;
SendCollision(cA, cB, point, normal, penetration); Vector3 normal = m_collisionArray[ii].normal;
SendCollision(cB, cA, point, -normal, penetration); float penetration = m_collisionArray[ii].penetration;
SendCollision(cA, cB, point, normal, penetration);
SendCollision(cB, cA, point, -normal, penetration);
}
} }
} }
} }
@ -658,14 +661,17 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
{ {
if (updatedEntityCount > 0) if (updatedEntityCount > 0)
{ {
for (int ii = 0; ii < updatedEntityCount; ii++) lock (PhysObjects)
{ {
EntityProperties entprop = m_updateArray[ii]; for (int ii = 0; ii < updatedEntityCount; ii++)
BSPhysObject pobj;
if (PhysObjects.TryGetValue(entprop.ID, out pobj))
{ {
if (pobj.IsInitialized) EntityProperties entprop = m_updateArray[ii];
pobj.UpdateProperties(entprop); BSPhysObject pobj;
if (PhysObjects.TryGetValue(entprop.ID, out pobj))
{
if (pobj.IsInitialized)
pobj.UpdateProperties(entprop);
}
} }
} }
} }