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

Danxors patch for >30prims with ODE

afrisby
Tedd Hansen 2007-08-26 15:56:42 +00:00
parent 83d5df3979
commit 87711c5869
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -114,13 +114,6 @@ namespace OpenSim.Region.Physics.OdePlugin
return; return;
int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf); int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf);
if (count>0)
{
if (b2 != IntPtr.Zero)
{
Console.WriteLine("+++++ collision twixt: " + b1 + " & " + b2);
}
}
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
{ {
contact.geom = contacts[i]; contact.geom = contacts[i];
@ -171,7 +164,10 @@ namespace OpenSim.Region.Physics.OdePlugin
rot.x = rotation.x; rot.x = rotation.x;
rot.y = rotation.y; rot.y = rotation.y;
rot.z = rotation.z; rot.z = rotation.z;
OdePrim newPrim = new OdePrim(this, pos, siz, rot); OdePrim newPrim;
lock(typeof(OdeScene)) {
newPrim = new OdePrim(this, pos, siz, rot);
}
this._prims.Add(newPrim); this._prims.Add(newPrim);
return newPrim; return newPrim;
} }