aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSNPlugin/BSScene.cs
diff options
context:
space:
mode:
authorMelanie2012-12-28 08:32:34 +0000
committerMelanie2012-12-28 08:32:34 +0000
commit3ab1bd04031ca0bc1039e4e1d267ea19d0017430 (patch)
tree3f2417f3b96e151642158d29d1982dee2bd850a8 /OpenSim/Region/Physics/BulletSNPlugin/BSScene.cs
parentMerge branch 'master' into careminster (diff)
parentBulletSim: correct collision mask definition for linkset children. (diff)
downloadopensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.zip
opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.gz
opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.bz2
opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BulletSNPlugin/BSScene.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSNPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSNPlugin/BSScene.cs
index 6bcea3f..1a7c34b 100644
--- a/OpenSim/Region/Physics/BulletSNPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSNPlugin/BSScene.cs
@@ -74,7 +74,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
74 74
75 public IMesher mesher; 75 public IMesher mesher;
76 public uint WorldID { get; private set; } 76 public uint WorldID { get; private set; }
77 public BulletSim World { get; private set; } 77 public BulletWorld World { get; private set; }
78 78
79 // All the constraints that have been allocated in this instance. 79 // All the constraints that have been allocated in this instance.
80 public BSConstraintCollection Constraints { get; private set; } 80 public BSConstraintCollection Constraints { get; private set; }
@@ -244,7 +244,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
244 244
245 // m_log.DebugFormat("{0}: Initialize: Calling BulletSimAPI.Initialize.", LogHeader); 245 // m_log.DebugFormat("{0}: Initialize: Calling BulletSimAPI.Initialize.", LogHeader);
246 246
247 World = new BulletSim(0, this, BulletSimAPI.Initialize2(worldExtent, UnmanagedParams, 247 World = new BulletWorld(0, this, BulletSimAPI.Initialize2(worldExtent, UnmanagedParams,
248 m_maxCollisionsPerFrame, ref m_collisionArray, 248 m_maxCollisionsPerFrame, ref m_collisionArray,
249 m_maxUpdatesPerFrame,ref m_updateArray, 249 m_maxUpdatesPerFrame,ref m_updateArray,
250 m_DebugLogCallbackHandle)); 250 m_DebugLogCallbackHandle));
@@ -497,13 +497,16 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
497 497
498 InTaintTime = false; // Only used for debugging so locking is not necessary. 498 InTaintTime = false; // Only used for debugging so locking is not necessary.
499 499
500 // The following causes the unmanaged code to output ALL the values found in ALL the objects in the world.
501 // Only enable this in a limited test world with few objects.
502 // BulletSimAPI.DumpAllInfo2(World.ptr); // DEBUG DEBUG DEBUG
503
500 // step the physical world one interval 504 // step the physical world one interval
501 m_simulationStep++; 505 m_simulationStep++;
502 int numSubSteps = 0; 506 int numSubSteps = 0;
503 507
504 try 508 try
505 { 509 {
506 //if (VehicleLoggingEnabled) DumpVehicles(); // DEBUG
507 if (PhysicsLogging.Enabled) beforeTime = Util.EnvironmentTickCount(); 510 if (PhysicsLogging.Enabled) beforeTime = Util.EnvironmentTickCount();
508 511
509 numSubSteps = BulletSimAPI.PhysicsStep2(World.ptr, timeStep, m_maxSubSteps, m_fixedTimeStep, 512 numSubSteps = BulletSimAPI.PhysicsStep2(World.ptr, timeStep, m_maxSubSteps, m_fixedTimeStep,
@@ -833,7 +836,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
833 { 836 {
834 DetailLog("{0},BSScene.AssertInTaintTime,NOT IN TAINT TIME,Region={1},Where={2}", DetailLogZero, RegionName, whereFrom); 837 DetailLog("{0},BSScene.AssertInTaintTime,NOT IN TAINT TIME,Region={1},Where={2}", DetailLogZero, RegionName, whereFrom);
835 m_log.ErrorFormat("{0} NOT IN TAINT TIME!! Region={1}, Where={2}", LogHeader, RegionName, whereFrom); 838 m_log.ErrorFormat("{0} NOT IN TAINT TIME!! Region={1}, Where={2}", LogHeader, RegionName, whereFrom);
836 Util.PrintCallStack(); // Prints the stack into the DEBUG log file. 839 Util.PrintCallStack(DetailLog);
837 } 840 }
838 return InTaintTime; 841 return InTaintTime;
839 } 842 }