aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/Ode
diff options
context:
space:
mode:
authorDiva Canto2015-08-31 16:23:43 -0700
committerDiva Canto2015-08-31 16:23:43 -0700
commit9435405ca1c173963dd6e97116a27b798a211801 (patch)
treee48898721c32cc0ff43e17a4ba660b8bcb55534d /OpenSim/Region/PhysicsModules/Ode
parentPhysics refactoring: all unit tests pass. (diff)
downloadopensim-SC_OLD-9435405ca1c173963dd6e97116a27b798a211801.zip
opensim-SC_OLD-9435405ca1c173963dd6e97116a27b798a211801.tar.gz
opensim-SC_OLD-9435405ca1c173963dd6e97116a27b798a211801.tar.bz2
opensim-SC_OLD-9435405ca1c173963dd6e97116a27b798a211801.tar.xz
Deleted physics plugin classes.
More unit tests fixed.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/Ode')
-rw-r--r--OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs90
-rw-r--r--OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs1
2 files changed, 0 insertions, 91 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs b/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs
deleted file mode 100644
index bb2fad9..0000000
--- a/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs
+++ /dev/null
@@ -1,90 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using System.Runtime.InteropServices;
32using System.Threading;
33using System.IO;
34using System.Diagnostics;
35using log4net;
36using Nini.Config;
37using Ode.NET;
38using OpenSim.Framework;
39using OpenSim.Region.PhysicsModules.SharedBase;
40using OpenMetaverse;
41
42namespace OpenSim.Region.PhysicsModule.ODE
43{
44 /// <summary>
45 /// ODE plugin
46 /// </summary>
47// public class OdePlugin : IPhysicsPlugin
48// {
49//// private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
50
51// private OdeScene m_scene;
52
53// public bool Init()
54// {
55// return true;
56// }
57
58// public PhysicsScene GetScene(String sceneIdentifier)
59// {
60// if (m_scene == null)
61// {
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
64// // will find it already loaded later on.
65// //
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
68// if (Util.IsWindows())
69// Util.LoadArchSpecificWindowsDll("ode.dll");
70
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).
73// d.InitODE();
74
75// m_scene = new OdeScene(GetName(), sceneIdentifier);
76// }
77
78// return m_scene;
79// }
80
81// public string GetName()
82// {
83// return ("OpenDynamicsEngine");
84// }
85
86// public void Dispose()
87// {
88// }
89// }
90} \ No newline at end of file
diff --git a/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs
index 36b65cf..6dc22bd 100644
--- a/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs
@@ -47,7 +47,6 @@ namespace OpenSim.Region.PhysicsModule.ODE.Tests
47 47
48 //private OpenSim.Region.PhysicsModule.ODE.OdePlugin cbt; 48 //private OpenSim.Region.PhysicsModule.ODE.OdePlugin cbt;
49 private PhysicsScene pScene; 49 private PhysicsScene pScene;
50 private IMeshingPlugin imp;
51 50
52 [SetUp] 51 [SetUp]
53 public void Initialize() 52 public void Initialize()