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/OdePlugin/OdePlugin.cs | |
parent | * Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff) | |
download | opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2 opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz |
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 17 |
1 files changed, 9 insertions, 8 deletions
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 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using OpenSim.Physics.Manager; | 30 | using Axiom.MathLib; |
31 | using Ode.NET; | 31 | using Ode.NET; |
32 | using OpenSim.Physics.Manager; | ||
32 | 33 | ||
33 | namespace OpenSim.Region.Physics.OdePlugin | 34 | namespace 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 |