aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
diff options
context:
space:
mode:
authorRobert Adams2012-07-06 15:59:09 -0700
committerRobert Adams2012-07-06 15:59:09 -0700
commit7aff238eee26733a86502f31716c1bfff4fc9c3a (patch)
tree877b67b8d8fed408060de62a2b76beb24df10dd0 /OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
parentRemove now duplicate interregion object check that should have been removed a... (diff)
parentBulletSim: update the binaries to the current sources (diff)
downloadopensim-SC_OLD-7aff238eee26733a86502f31716c1bfff4fc9c3a.zip
opensim-SC_OLD-7aff238eee26733a86502f31716c1bfff4fc9c3a.tar.gz
opensim-SC_OLD-7aff238eee26733a86502f31716c1bfff4fc9c3a.tar.bz2
opensim-SC_OLD-7aff238eee26733a86502f31716c1bfff4fc9c3a.tar.xz
Merge branch 'bulletsim2'
Cleanup preceeding major work. No major functional changes. Collisions reported to simulator more efficiently. BulletSim binaries updated using a more recent version of Bullet (v2.80-r2527).
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
index 0730824..0f027b8 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
@@ -32,6 +32,14 @@ using OpenMetaverse;
32 32
33namespace OpenSim.Region.Physics.BulletSPlugin 33namespace OpenSim.Region.Physics.BulletSPlugin
34{ 34{
35 /// <summary>
36 /// Entry for a port of Bullet (http://bulletphysics.org/) to OpenSim.
37 /// This module interfaces to an unmanaged C++ library which makes the
38 /// actual calls into the Bullet physics engine.
39 /// The unmanaged library is found in opensim-libs::trunk/unmanaged/BulletSim/.
40 /// The unmanaged library is compiled and linked statically with Bullet
41 /// to create BulletSim.dll and libBulletSim.so (for both 32 and 64 bit).
42 /// </summary>
35public class BSPlugin : IPhysicsPlugin 43public class BSPlugin : IPhysicsPlugin
36{ 44{
37 //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -53,6 +61,9 @@ public class BSPlugin : IPhysicsPlugin
53 { 61 {
54 if (Util.IsWindows()) 62 if (Util.IsWindows())
55 Util.LoadArchSpecificWindowsDll("BulletSim.dll"); 63 Util.LoadArchSpecificWindowsDll("BulletSim.dll");
64 // If not Windows, loading is performed by the
65 // Mono loader as specified in
66 // "bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config".
56 67
57 _mScene = new BSScene(sceneIdentifier); 68 _mScene = new BSScene(sceneIdentifier);
58 } 69 }