diff options
author | Robert Adams | 2012-12-24 20:18:06 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-24 20:18:06 -0800 |
commit | bbc5a5089f79a4c5543f4a3f1cd4ffaf1de8c07e (patch) | |
tree | 508491dfb64055fde104f5f4459feeaee7a8526c /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
parent | BulletSim: Default avatar density changed to 3.5 which is WAY closer (diff) | |
download | opensim-SC_OLD-bbc5a5089f79a4c5543f4a3f1cd4ffaf1de8c07e.zip opensim-SC_OLD-bbc5a5089f79a4c5543f4a3f1cd4ffaf1de8c07e.tar.gz opensim-SC_OLD-bbc5a5089f79a4c5543f4a3f1cd4ffaf1de8c07e.tar.bz2 opensim-SC_OLD-bbc5a5089f79a4c5543f4a3f1cd4ffaf1de8c07e.tar.xz |
BulletSim: Rename some of the interface structures (BulletWorld, ...)
to get ready for...
Start creation of BulletAPITemplate. This defines the abstract interface
functions. Following commits will move over to the new interface.
This will enable switching between the managed and unmanaged version of
Bullet.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
-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 e8e0d50..0022e45 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/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; } |
@@ -242,7 +242,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
242 | Vector3 worldExtent = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight); | 242 | Vector3 worldExtent = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight); |
243 | 243 | ||
244 | // m_log.DebugFormat("{0}: Initialize: Calling BulletSimAPI.Initialize.", LogHeader); | 244 | // m_log.DebugFormat("{0}: Initialize: Calling BulletSimAPI.Initialize.", LogHeader); |
245 | World = new BulletSim(0, this, BulletSimAPI.Initialize2(worldExtent, m_paramsHandle.AddrOfPinnedObject(), | 245 | World = new BulletWorld(0, this, BulletSimAPI.Initialize2(worldExtent, m_paramsHandle.AddrOfPinnedObject(), |
246 | m_maxCollisionsPerFrame, m_collisionArrayPinnedHandle.AddrOfPinnedObject(), | 246 | m_maxCollisionsPerFrame, m_collisionArrayPinnedHandle.AddrOfPinnedObject(), |
247 | m_maxUpdatesPerFrame, m_updateArrayPinnedHandle.AddrOfPinnedObject(), | 247 | m_maxUpdatesPerFrame, m_updateArrayPinnedHandle.AddrOfPinnedObject(), |
248 | m_DebugLogCallbackHandle)); | 248 | m_DebugLogCallbackHandle)); |