OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BulletSim: move selection of the unmanaged Bullet DLL from BSPlugin 

into the unmanaged Bullet interface class.
0.7.5-pf-bulletsim
Robert Adams 2013-01-01 17:01:17 -08:00
parent 9d840fd2ee
commit b14b65ea95
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
View File

@ -31,6 +31,8 @@ using System.Runtime.InteropServices;
using System.Security; using System.Security;
using System.Text; using System.Text;
using OpenSim.Framework;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Region.Physics.BulletSPlugin namespace OpenSim.Region.Physics.BulletSPlugin
@ -141,8 +143,14 @@ public override string BulletEngineVersion { get; protected set; }
public BSAPIUnman(string paramName, BSScene physScene) public BSAPIUnman(string paramName, BSScene physScene)
{ {
PhysicsScene = physScene; PhysicsScene = physScene;
// Do something fancy with the paramName to get the right DLL implementation // Do something fancy with the paramName to get the right DLL implementation
// like "Bullet-2.80-OpenCL-Intel" loading the version for Intel based OpenCL implementation, etc. // like "Bullet-2.80-OpenCL-Intel" loading the version for Intel based OpenCL implementation, etc.
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("BulletSim.dll");
// If not Windows, loading is performed by the
// Mono loader as specified in
// "bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config".
} }
// Initialization and simulation // Initialization and simulation

6
OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
View File

@ -59,12 +59,6 @@ public class BSPlugin : IPhysicsPlugin
{ {
if (_mScene == null) if (_mScene == null)
{ {
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("BulletSim.dll");
// If not Windows, loading is performed by the
// Mono loader as specified in
// "bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config".
_mScene = new BSScene(sceneIdentifier); _mScene = new BSScene(sceneIdentifier);
} }
return (_mScene); return (_mScene);