aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs12
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsManager.cs8
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs11
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsVector.cs4
5 files changed, 12 insertions, 25 deletions
diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
index 132f64a..9415db9 100644
--- a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
@@ -26,9 +26,7 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 502d8e6..8c286e0 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -25,15 +25,13 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System; 28using Axiom.MathLib;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Physics.Manager 30namespace OpenSim.Physics.Manager
33{ 31{
34 public delegate void PositionUpdate(PhysicsVector position); 32 public delegate void PositionUpdate(PhysicsVector position);
35 public delegate void VelocityUpdate(PhysicsVector velocity); 33 public delegate void VelocityUpdate(PhysicsVector velocity);
36 public delegate void OrientationUpdate(Axiom.MathLib.Quaternion orientation); 34 public delegate void OrientationUpdate(Quaternion orientation);
37 35
38 public abstract class PhysicsActor 36 public abstract class PhysicsActor
39 { 37 {
@@ -66,7 +64,7 @@ namespace OpenSim.Physics.Manager
66 get; 64 get;
67 } 65 }
68 66
69 public abstract Axiom.MathLib.Quaternion Orientation 67 public abstract Quaternion Orientation
70 { 68 {
71 get; 69 get;
72 set; 70 set;
@@ -115,11 +113,11 @@ namespace OpenSim.Physics.Manager
115 } 113 }
116 } 114 }
117 115
118 public override Axiom.MathLib.Quaternion Orientation 116 public override Quaternion Orientation
119 { 117 {
120 get 118 get
121 { 119 {
122 return Axiom.MathLib.Quaternion.Identity; 120 return Quaternion.Identity;
123 } 121 }
124 set 122 set
125 { 123 {
diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
index 0e28522..265bce6 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
@@ -27,10 +27,8 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Collections;
31using System.IO; 30using System.IO;
32using System.Reflection; 31using System.Reflection;
33using Axiom.MathLib;
34using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
35 33
36namespace OpenSim.Physics.Manager 34namespace OpenSim.Physics.Manager
@@ -56,19 +54,19 @@ namespace OpenSim.Physics.Manager
56 54
57 if(_plugins.ContainsKey(engineName)) 55 if(_plugins.ContainsKey(engineName))
58 { 56 {
59 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName); 57 MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
60 return _plugins[engineName].GetScene(); 58 return _plugins[engineName].GetScene();
61 } 59 }
62 else 60 else
63 { 61 {
64 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName); 62 MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
65 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName)); 63 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
66 } 64 }
67 } 65 }
68 66
69 public void LoadPlugins() 67 public void LoadPlugins()
70 { 68 {
71 string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory ,"Physics"); 69 string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics");
72 string[] pluginFiles = Directory.GetFiles(path, "*.dll"); 70 string[] pluginFiles = Directory.GetFiles(path, "*.dll");
73 71
74 72
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 3f22585..d44da00 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -25,9 +25,6 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Console; 28using OpenSim.Framework.Console;
32 29
33namespace OpenSim.Physics.Manager 30namespace OpenSim.Physics.Manager
@@ -67,7 +64,7 @@ namespace OpenSim.Physics.Manager
67 64
68 public override PhysicsActor AddAvatar(PhysicsVector position) 65 public override PhysicsActor AddAvatar(PhysicsVector position)
69 { 66 {
70 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); 67 MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
71 return PhysicsActor.Null; 68 return PhysicsActor.Null;
72 } 69 }
73 70
@@ -78,7 +75,7 @@ namespace OpenSim.Physics.Manager
78 75
79 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) 76 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
80 { 77 {
81 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); 78 MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
82 return PhysicsActor.Null; 79 return PhysicsActor.Null;
83 } 80 }
84 81
@@ -91,12 +88,12 @@ namespace OpenSim.Physics.Manager
91 88
92 public override void GetResults() 89 public override void GetResults()
93 { 90 {
94 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : GetResults()"); 91 MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");
95 } 92 }
96 93
97 public override void SetTerrain(float[] heightMap) 94 public override void SetTerrain(float[] heightMap)
98 { 95 {
99 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); 96 MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
100 } 97 }
101 98
102 public override void DeleteTerrain() 99 public override void DeleteTerrain()
diff --git a/OpenSim/Region/Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
index c60da9d..e75f29b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsVector.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
@@ -25,10 +25,6 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Physics.Manager 28namespace OpenSim.Physics.Manager
33{ 29{
34 public class PhysicsVector 30 public class PhysicsVector