diff options
author | lbsa71 | 2007-07-03 14:37:29 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-03 14:37:29 +0000 |
commit | 9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch) | |
tree | 8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Region/Physics/PhysXPlugin | |
parent | * Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff) | |
download | opensim-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/PhysXPlugin')
-rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 9 |
2 files changed, 5 insertions, 6 deletions
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 | */ |
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Runtime.CompilerServices; | ||
30 | using System.Runtime.InteropServices; | 29 | using 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; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using OpenSim.Physics.Manager; | 30 | using OpenSim.Physics.Manager; |
31 | using PhysXWrapper; | 31 | using PhysXWrapper; |
32 | using Quaternion=Axiom.MathLib.Quaternion; | ||
32 | 33 | ||
33 | namespace OpenSim.Region.Physics.PhysXPlugin | 34 | namespace 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; |