diff options
| author | Robert Adams | 2012-12-02 23:39:17 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-12-03 07:59:56 -0800 |
| commit | 41f1c5b7f712ed9c093ce421b39460c7711aece4 (patch) | |
| tree | 7972aaece55d5e174a4e6db552b54156130ab892 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | BulletSim: add stubs for generalization of preStep actions. Will eventually r... (diff) | |
| download | opensim-SC-41f1c5b7f712ed9c093ce421b39460c7711aece4.zip opensim-SC-41f1c5b7f712ed9c093ce421b39460c7711aece4.tar.gz opensim-SC-41f1c5b7f712ed9c093ce421b39460c7711aece4.tar.bz2 opensim-SC-41f1c5b7f712ed9c093ce421b39460c7711aece4.tar.xz | |
BulletSim: rework angular corrections to remove any hybrid code and compute absolute collections.
Diffstat (limited to '')
| -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 17cc7b4..f72bd74 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -501,7 +501,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
| 501 | 501 | ||
| 502 | try | 502 | try |
| 503 | { | 503 | { |
| 504 | // if (VehicleLoggingEnabled) DumpVehicles(); // DEBUG | 504 | if (VehicleLoggingEnabled) DumpVehicles(); // DEBUG |
| 505 | if (PhysicsLogging.Enabled) beforeTime = Util.EnvironmentTickCount(); | 505 | if (PhysicsLogging.Enabled) beforeTime = Util.EnvironmentTickCount(); |
| 506 | 506 | ||
| 507 | numSubSteps = BulletSimAPI.PhysicsStep2(World.ptr, timeStep, m_maxSubSteps, m_fixedTimeStep, | 507 | numSubSteps = BulletSimAPI.PhysicsStep2(World.ptr, timeStep, m_maxSubSteps, m_fixedTimeStep, |
| @@ -510,7 +510,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
| 510 | if (PhysicsLogging.Enabled) simTime = Util.EnvironmentTickCountSubtract(beforeTime); | 510 | if (PhysicsLogging.Enabled) simTime = Util.EnvironmentTickCountSubtract(beforeTime); |
| 511 | DetailLog("{0},Simulate,call, frame={1}, nTaints={2}, simTime={3}, substeps={4}, updates={5}, colliders={6}", | 511 | DetailLog("{0},Simulate,call, frame={1}, nTaints={2}, simTime={3}, substeps={4}, updates={5}, colliders={6}", |
| 512 | DetailLogZero, m_simulationStep, numTaints, simTime, numSubSteps, updatedEntityCount, collidersCount); | 512 | DetailLogZero, m_simulationStep, numTaints, simTime, numSubSteps, updatedEntityCount, collidersCount); |
| 513 | // if (VehicleLoggingEnabled) DumpVehicles(); // DEBUG | 513 | if (VehicleLoggingEnabled) DumpVehicles(); // DEBUG |
| 514 | } | 514 | } |
| 515 | catch (Exception e) | 515 | catch (Exception e) |
| 516 | { | 516 | { |