From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 07:52:41 +0000
Subject: * This is the fabled LibOMV update with all of the libOMV types from
 JHurliman * This is a HUGE OMG update and will definitely have unknown side
 effects.. so this is really only for the strong hearted at this point. 
 Regular people should let the dust settle. * This has been tested to work
 with most basic functions. However..   make sure you back up 'everything'
 before using this.  It's that big! * Essentially we're back at square 1 in
 the testing phase..  so lets identify things that broke.

---
 OpenSim/Region/Physics/POSPlugin/POSCharacter.cs |  2 +-
 OpenSim/Region/Physics/POSPlugin/POSPlugin.cs    |  1 -
 OpenSim/Region/Physics/POSPlugin/POSPrim.cs      |  2 +-
 OpenSim/Region/Physics/POSPlugin/POSScene.cs     | 17 ++++++++---------
 4 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/Physics/POSPlugin')

diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
index c674d15..400280f 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
@@ -27,8 +27,8 @@
 
 using System;
 using System.Collections.Generic;
-using Axiom.Math;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
 
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
index 65f10f9..c8cbcf5 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
@@ -27,7 +27,6 @@
 
 using System;
 using System.Collections.Generic;
-using Axiom.Math;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index fed67dd..69cd19c 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
@@ -27,8 +27,8 @@
 
 using System;
 using System.Collections.Generic;
-using Axiom.Math;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
 
diff --git a/OpenSim/Region/Physics/POSPlugin/POSScene.cs b/OpenSim/Region/Physics/POSPlugin/POSScene.cs
index a32021d..9771a62 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSScene.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSScene.cs
@@ -27,8 +27,8 @@
 
 using System;
 using System.Collections.Generic;
-using Axiom.Math;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
 
@@ -109,14 +109,13 @@ namespace OpenSim.Region.Physics.POSPlugin
 
         private bool isColliding(POSCharacter c, POSPrim p)
         {
-            Vector3 rotatedPos = p.Orientation.Inverse() *
-                                 new Vector3(c.Position.X - p.Position.X, c.Position.Y - p.Position.Y,
-                                             c.Position.Z - p.Position.Z);
-            Vector3 avatarSize = p.Orientation.Inverse()*new Vector3(c.Size.X, c.Size.Y, c.Size.Z);
-
-            if (Math.Abs(rotatedPos.x) >= (p.Size.X*0.5 + Math.Abs(avatarSize.x)) ||
-                Math.Abs(rotatedPos.y) >= (p.Size.Y*0.5 + Math.Abs(avatarSize.y)) ||
-                Math.Abs(rotatedPos.z) >= (p.Size.Z*0.5 + Math.Abs(avatarSize.z)))
+            Vector3 rotatedPos = new Vector3(c.Position.X - p.Position.X, c.Position.Y - p.Position.Y,
+                                             c.Position.Z - p.Position.Z) * Quaternion.Inverse(p.Orientation);
+            Vector3 avatarSize = new Vector3(c.Size.X, c.Size.Y, c.Size.Z) * Quaternion.Inverse(p.Orientation);
+
+            if (Math.Abs(rotatedPos.X) >= (p.Size.X*0.5 + Math.Abs(avatarSize.X)) ||
+                Math.Abs(rotatedPos.Y) >= (p.Size.Y*0.5 + Math.Abs(avatarSize.Y)) ||
+                Math.Abs(rotatedPos.Z) >= (p.Size.Z*0.5 + Math.Abs(avatarSize.Z)))
             {
                 return false;
             }
-- 
cgit v1.1