aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index b94f374..0a6faa8 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -482,6 +482,12 @@ namespace OpenSim.Region.Physics.OdePlugin
482 d.WorldSetGravity(world, gravityx, gravityy, gravityz); 482 d.WorldSetGravity(world, gravityx, gravityy, gravityz);
483 d.WorldSetContactSurfaceLayer(world, contactsurfacelayer); 483 d.WorldSetContactSurfaceLayer(world, contactsurfacelayer);
484 484
485 d.WorldSetLinearDamping(world, 256f);
486 d.WorldSetAngularDamping(world, 256f);
487 d.WorldSetAngularDampingThreshold(world, 256f);
488 d.WorldSetLinearDampingThreshold(world, 256f);
489 d.WorldSetMaxAngularSpeed(world, 256f);
490
485 // Set how many steps we go without running collision testing 491 // Set how many steps we go without running collision testing
486 // This is in addition to the step size. 492 // This is in addition to the step size.
487 // Essentially Steps * m_physicsiterations 493 // Essentially Steps * m_physicsiterations
@@ -2296,9 +2302,11 @@ namespace OpenSim.Region.Physics.OdePlugin
2296 2302
2297 // Figure out the Frames Per Second we're going at. 2303 // Figure out the Frames Per Second we're going at.
2298 //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size 2304 //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size
2299 step_time = 0.09375f; 2305
2300 fps = (step_time/ODE_STEPSIZE) * 1000; 2306 fps = (step_time/ODE_STEPSIZE) * 1000;
2301 2307
2308 step_time = 0.09375f;
2309
2302 while (step_time > 0.0f) 2310 while (step_time > 0.0f)
2303 { 2311 {
2304 //lock (ode) 2312 //lock (ode)