diff options
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs b/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs index 1d9d0e5..bb2fad9 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs | |||
| @@ -44,47 +44,47 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
| 44 | /// <summary> | 44 | /// <summary> |
| 45 | /// ODE plugin | 45 | /// ODE plugin |
| 46 | /// </summary> | 46 | /// </summary> |
| 47 | public class OdePlugin : IPhysicsPlugin | 47 | // public class OdePlugin : IPhysicsPlugin |
| 48 | { | 48 | // { |
| 49 | // private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 49 | //// private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
| 50 | 50 | ||
| 51 | private OdeScene m_scene; | 51 | // private OdeScene m_scene; |
| 52 | 52 | ||
| 53 | public bool Init() | 53 | // public bool Init() |
| 54 | { | 54 | // { |
| 55 | return true; | 55 | // return true; |
| 56 | } | 56 | // } |
| 57 | 57 | ||
| 58 | public PhysicsScene GetScene(String sceneIdentifier) | 58 | // public PhysicsScene GetScene(String sceneIdentifier) |
| 59 | { | 59 | // { |
| 60 | if (m_scene == null) | 60 | // if (m_scene == null) |
| 61 | { | 61 | // { |
| 62 | // We do this so that OpenSimulator on Windows loads the correct native ODE library depending on whether | 62 | // // We do this so that OpenSimulator on Windows loads the correct native ODE library depending on whether |
| 63 | // it's running as a 32-bit process or a 64-bit one. By invoking LoadLibary here, later DLLImports | 63 | // // it's running as a 32-bit process or a 64-bit one. By invoking LoadLibary here, later DLLImports |
| 64 | // will find it already loaded later on. | 64 | // // will find it already loaded later on. |
| 65 | // | 65 | // // |
| 66 | // This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be | 66 | // // This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be |
| 67 | // controlled in Ode.NET.dll.config | 67 | // // controlled in Ode.NET.dll.config |
| 68 | if (Util.IsWindows()) | 68 | // if (Util.IsWindows()) |
| 69 | Util.LoadArchSpecificWindowsDll("ode.dll"); | 69 | // Util.LoadArchSpecificWindowsDll("ode.dll"); |
| 70 | 70 | ||
| 71 | // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to | 71 | // // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to |
| 72 | // http://opensimulator.org/mantis/view.php?id=2750). | 72 | // // http://opensimulator.org/mantis/view.php?id=2750). |
| 73 | d.InitODE(); | 73 | // d.InitODE(); |
| 74 | 74 | ||
| 75 | m_scene = new OdeScene(GetName(), sceneIdentifier); | 75 | // m_scene = new OdeScene(GetName(), sceneIdentifier); |
| 76 | } | 76 | // } |
| 77 | 77 | ||
| 78 | return m_scene; | 78 | // return m_scene; |
| 79 | } | 79 | // } |
| 80 | 80 | ||
| 81 | public string GetName() | 81 | // public string GetName() |
| 82 | { | 82 | // { |
| 83 | return ("OpenDynamicsEngine"); | 83 | // return ("OpenDynamicsEngine"); |
| 84 | } | 84 | // } |
| 85 | 85 | ||
| 86 | public void Dispose() | 86 | // public void Dispose() |
| 87 | { | 87 | // { |
| 88 | } | 88 | // } |
| 89 | } | 89 | // } |
| 90 | } \ No newline at end of file | 90 | } \ No newline at end of file |