aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorRobert Adams2013-01-01 17:01:17 -0800
committerRobert Adams2013-01-01 17:27:33 -0800
commitb14b65ea9518e02e518f2a75795385a3c0306495 (patch)
tree3bbc93075e561557482302a446e86544c0d9192c /OpenSim/Region
parentBulletSim: move over and port the interface for BulletXNA. (diff)
downloadopensim-SC_OLD-b14b65ea9518e02e518f2a75795385a3c0306495.zip
opensim-SC_OLD-b14b65ea9518e02e518f2a75795385a3c0306495.tar.gz
opensim-SC_OLD-b14b65ea9518e02e518f2a75795385a3c0306495.tar.bz2
opensim-SC_OLD-b14b65ea9518e02e518f2a75795385a3c0306495.tar.xz
BulletSim: move selection of the unmanaged Bullet DLL from BSPlugin
into the unmanaged Bullet interface class.
Diffstat (limited to 'OpenSim/Region')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs8
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs6
2 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index 83e12ba..8c6e7d6 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -31,6 +31,8 @@ using System.Runtime.InteropServices;
31using System.Security; 31using System.Security;
32using System.Text; 32using System.Text;
33 33
34using OpenSim.Framework;
35
34using OpenMetaverse; 36using OpenMetaverse;
35 37
36namespace OpenSim.Region.Physics.BulletSPlugin 38namespace OpenSim.Region.Physics.BulletSPlugin
@@ -141,8 +143,14 @@ public override string BulletEngineVersion { get; protected set; }
141public BSAPIUnman(string paramName, BSScene physScene) 143public BSAPIUnman(string paramName, BSScene physScene)
142{ 144{
143 PhysicsScene = physScene; 145 PhysicsScene = physScene;
146
144 // Do something fancy with the paramName to get the right DLL implementation 147 // Do something fancy with the paramName to get the right DLL implementation
145 // like "Bullet-2.80-OpenCL-Intel" loading the version for Intel based OpenCL implementation, etc. 148 // like "Bullet-2.80-OpenCL-Intel" loading the version for Intel based OpenCL implementation, etc.
149 if (Util.IsWindows())
150 Util.LoadArchSpecificWindowsDll("BulletSim.dll");
151 // If not Windows, loading is performed by the
152 // Mono loader as specified in
153 // "bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config".
146} 154}
147 155
148// Initialization and simulation 156// Initialization and simulation
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
index 20f5180..65be52a 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
@@ -59,12 +59,6 @@ public class BSPlugin : IPhysicsPlugin
59 { 59 {
60 if (_mScene == null) 60 if (_mScene == null)
61 { 61 {
62 if (Util.IsWindows())
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".
67
68 _mScene = new BSScene(sceneIdentifier); 62 _mScene = new BSScene(sceneIdentifier);
69 } 63 }
70 return (_mScene); 64 return (_mScene);