ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Bigisn ODE Stability update 2

Browse Source
This commit is contained in:
Teravus Ovares
2008-02-14 00:39:08 +00:00
parent 3588d89b2c
commit 0d14c47c28
4 changed files with 75 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -736,6 +736,7 @@ namespace OpenSim.Region.Physics.OdePlugin
/// <param name="prim"></param>
public void RemovePrimThreadLocked(OdePrim prim)
{
prim.ResetTaints();
lock (OdeLock)
{
System.Threading.Thread.Sleep(20);
@@ -1237,31 +1238,39 @@ namespace OpenSim.Region.Physics.OdePlugin
actor.Move(timeStep);
actor.collidelock = true;
}
ode.dlock(world);
collision_optimized(timeStep);
ode.dunlock(world);
try
if (!ode.lockquery())
{
d.WorldQuickStep(world, ODE_STEPSIZE);
ode.dlock(world);
collision_optimized(timeStep);
try
{
d.WorldQuickStep(world, ODE_STEPSIZE);
}
catch (StackOverflowException)
{
d.WorldQuickStep(world, 0.001f);
}
d.JointGroupEmpty(contactgroup);
ode.dunlock(world);
step_time -= ODE_STEPSIZE;
i++;
}
catch (StackOverflowException)
else
{
d.WorldQuickStep(world, 0.001f);
fps = 0;
}
d.JointGroupEmpty(contactgroup);
foreach (OdeCharacter actor in _characters)
{
actor.collidelock = false;
}
step_time -= ODE_STEPSIZE;
i++;
}
foreach (OdeCharacter actor in _characters)
@@ -1273,12 +1282,14 @@ namespace OpenSim.Region.Physics.OdePlugin
{
bool processedtaints = false;
foreach (OdePrim prim in _taintedPrim)
{
prim.ProcessTaints(timeStep);
{
if (prim.m_taintremove)
{
RemovePrimThreadLocked(prim);
}
prim.ProcessTaints(timeStep);
processedtaints = true;
prim.m_collisionscore = 0;
}