aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorlbsa712007-07-03 14:37:29 +0000
committerlbsa712007-07-03 14:37:29 +0000
commit9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch)
tree8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Region/Physics
parent* Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff)
downloadopensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs6
-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
-rw-r--r--OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs17
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs9
11 files changed, 29 insertions, 46 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index 177c49d..ce567a9 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/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/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index e3f34da..393796f 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -25,8 +25,8 @@
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; 28using System.Collections.Generic;
29using Axiom.MathLib;
30using OpenSim.Physics.Manager; 30using OpenSim.Physics.Manager;
31 31
32namespace OpenSim.Region.Physics.BasicPhysicsPlugin 32namespace OpenSim.Region.Physics.BasicPhysicsPlugin
@@ -250,11 +250,11 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
250 } 250 }
251 } 251 }
252 252
253 public override Axiom.MathLib.Quaternion Orientation 253 public override Quaternion Orientation
254 { 254 {
255 get 255 get
256 { 256 {
257 return Axiom.MathLib.Quaternion.Identity; 257 return Quaternion.Identity;
258 } 258 }
259 set 259 set
260 { 260 {
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
diff --git a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
index b49c8da..ee10430 100644
--- a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/OdePlugin/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/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 8aca851..b85c052 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -27,8 +27,9 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Physics.Manager; 30using Axiom.MathLib;
31using Ode.NET; 31using Ode.NET;
32using OpenSim.Physics.Manager;
32 33
33namespace OpenSim.Region.Physics.OdePlugin 34namespace OpenSim.Region.Physics.OdePlugin
34{ 35{
@@ -194,13 +195,13 @@ namespace OpenSim.Region.Physics.OdePlugin
194 LandGeom = d.CreateHeightfield(space, HeightmapData, 1); 195 LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
195 d.Matrix3 R = new d.Matrix3(); 196 d.Matrix3 R = new d.Matrix3();
196 197
197 Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0)); 198 Quaternion q1 =Quaternion.FromAngleAxis(1.5707f, new Vector3(1,0,0));
198 Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0)); 199 Quaternion q2 =Quaternion.FromAngleAxis(1.5707f, new Vector3(0,1,0));
199 //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1)); 200 //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1));
200 201
201 q1 = q1 * q2; 202 q1 = q1 * q2;
202 //q1 = q1 * q3; 203 //q1 = q1 * q3;
203 Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(); 204 Vector3 v3 = new Vector3();
204 float angle = 0; 205 float angle = 0;
205 q1.ToAngleAxis(ref angle, ref v3); 206 q1.ToAngleAxis(ref angle, ref v3);
206 207
@@ -287,11 +288,11 @@ namespace OpenSim.Region.Physics.OdePlugin
287 } 288 }
288 } 289 }
289 290
290 public override Axiom.MathLib.Quaternion Orientation 291 public override Quaternion Orientation
291 { 292 {
292 get 293 get
293 { 294 {
294 return Axiom.MathLib.Quaternion.Identity; 295 return Quaternion.Identity;
295 } 296 }
296 set 297 set
297 { 298 {
@@ -414,11 +415,11 @@ namespace OpenSim.Region.Physics.OdePlugin
414 } 415 }
415 } 416 }
416 417
417 public override Axiom.MathLib.Quaternion Orientation 418 public override Quaternion Orientation
418 { 419 {
419 get 420 get
420 { 421 {
421 Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion(); 422 Quaternion res = new Quaternion();
422 return res; 423 return res;
423 } 424 }
424 set 425 set
diff --git a/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
index b49c8da..ee10430 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/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/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 8bf794b..a75e5c7 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Physics.Manager; 30using OpenSim.Physics.Manager;
31using PhysXWrapper; 31using PhysXWrapper;
32using Quaternion=Axiom.MathLib.Quaternion;
32 33
33namespace OpenSim.Region.Physics.PhysXPlugin 34namespace OpenSim.Region.Physics.PhysXPlugin
34{ 35{
@@ -240,11 +241,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin
240 } 241 }
241 } 242 }
242 243
243 public override Axiom.MathLib.Quaternion Orientation 244 public override Quaternion Orientation
244 { 245 {
245 get 246 get
246 { 247 {
247 return Axiom.MathLib.Quaternion.Identity; 248 return Quaternion.Identity;
248 } 249 }
249 set 250 set
250 { 251 {
@@ -377,11 +378,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin
377 } 378 }
378 } 379 }
379 380
380 public override Axiom.MathLib.Quaternion Orientation 381 public override Quaternion Orientation
381 { 382 {
382 get 383 get
383 { 384 {
384 Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion(); 385 Quaternion res = new Quaternion();
385 PhysXWrapper.Quaternion quat = this._prim.GetOrientation(); 386 PhysXWrapper.Quaternion quat = this._prim.GetOrientation();
386 res.w = quat.W; 387 res.w = quat.W;
387 res.x = quat.X; 388 res.x = quat.X;