diff options
| author | Robert Adams | 2012-10-10 16:53:58 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-10-11 14:01:25 -0700 |
| commit | 5b82f18d6422d89da53d382eb1ae89e47b4465b7 (patch) | |
| tree | f798dde521f8aa01d4ac1e86dff63aa7148a732f /OpenSim/Region/Physics | |
| parent | BulletSim: normalize physics FPS to 45. (diff) | |
| download | opensim-SC_OLD-5b82f18d6422d89da53d382eb1ae89e47b4465b7.zip opensim-SC_OLD-5b82f18d6422d89da53d382eb1ae89e47b4465b7.tar.gz opensim-SC_OLD-5b82f18d6422d89da53d382eb1ae89e47b4465b7.tar.bz2 opensim-SC_OLD-5b82f18d6422d89da53d382eb1ae89e47b4465b7.tar.xz | |
BulletSim: normalize physics FPS to 45 (for real this time).
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 25f8f5f..2c3c481 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -582,8 +582,8 @@ public class BSScene : PhysicsScene, IPhysicsParameters | |||
| 582 | // The physics engine returns the number of milliseconds it simulated this call. | 582 | // The physics engine returns the number of milliseconds it simulated this call. |
| 583 | // These are summed and normalized to one second and divided by 1000 to give the reported physics FPS. | 583 | // These are summed and normalized to one second and divided by 1000 to give the reported physics FPS. |
| 584 | // We multiply by 45 to give a recognizable running rate (45 or less). | 584 | // We multiply by 45 to give a recognizable running rate (45 or less). |
| 585 | return numSubSteps * m_fixedTimeStep * 1000 * 45; | 585 | return numSubSteps * m_fixedTimeStep * 1000 * 45; |
| 586 | // return timeStep * 1000 * 45; | 586 | // return timeStep * 1000 * 45; |
| 587 | } | 587 | } |
| 588 | 588 | ||
| 589 | // Something has collided | 589 | // Something has collided |