diff options
author | Justin Clark-Casey (justincc) | 2012-07-07 00:05:16 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-07 00:05:16 +0100 |
commit | b19ead5f9efacc15d88527d11ff192f88e124bc4 (patch) | |
tree | 7793dc9a7db05c51cae39345579acc041eb7a80b /OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs | |
parent | Remove redundant SetScene() function in Scene.AddSceneObject() (diff) | |
parent | Merge branch 'bulletsim2' (diff) | |
download | opensim-SC_OLD-b19ead5f9efacc15d88527d11ff192f88e124bc4.zip opensim-SC_OLD-b19ead5f9efacc15d88527d11ff192f88e124bc4.tar.gz opensim-SC_OLD-b19ead5f9efacc15d88527d11ff192f88e124bc4.tar.bz2 opensim-SC_OLD-b19ead5f9efacc15d88527d11ff192f88e124bc4.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs | 11 |
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 | ||
33 | namespace OpenSim.Region.Physics.BulletSPlugin | 33 | namespace 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> | ||
35 | public class BSPlugin : IPhysicsPlugin | 43 | public 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 | } |