2 files changed, 64 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index bfe1d0b..b151e16 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -26,6 +26,7 @@
 * 
 */
 using Axiom.Math;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Physics.Manager
 {
@@ -50,6 +51,11 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract PhysicsVector Size { get; set; }
 
+        public abstract PrimitiveBaseShape Shape
+        {
+            set;
+        }
+
         public abstract PhysicsVector Position { get; set; }
 
         public abstract PhysicsVector Velocity { get; set; }
@@ -85,6 +91,14 @@ namespace OpenSim.Region.Physics.Manager
             set { return; }
         }
 
+        public override PrimitiveBaseShape Shape
+        {
+            set
+            {
+                return;
+            }
+        }
+
         public override PhysicsVector Velocity
         {
             get { return PhysicsVector.Zero; }
diff --git a/OpenSim/Region/Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
index 7de37e4..ada2297 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsVector.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
@@ -25,6 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
+
+using System;
+
+
 namespace OpenSim.Region.Physics.Manager
 {
     public class PhysicsVector
@@ -50,5 +54,51 @@ namespace OpenSim.Region.Physics.Manager
         {
             return "<" + X + "," + Y + "," + Z + ">";
         }
+
+        // Operations
+        public static PhysicsVector operator +(PhysicsVector a, PhysicsVector b)
+        {
+            return new PhysicsVector(a.X + b.X, a.Y + b.Y, a.Z + b.Z);
+        }
+
+        public static PhysicsVector operator -(PhysicsVector a, PhysicsVector b)
+        {
+            return new PhysicsVector(a.X - b.X, a.Y - b.Y, a.Z - b.Z);
+        }
+
+        public static PhysicsVector cross(PhysicsVector a, PhysicsVector b)
+        {
+            return new PhysicsVector(a.Y * b.Z - a.Z * b.Y, a.Z * b.X - a.X * b.Z, a.X * b.Y - a.Y * b.X);
+        }
+
+        public float length()
+        {
+            return (float)Math.Sqrt(X*X + Y*Y + Z*Z);
+        }
+
+        public static PhysicsVector operator / (PhysicsVector v, float f)
+        {
+            return new PhysicsVector(v.X / f, v.Y / f, v.Z / f);
+        }
+
+        public static PhysicsVector operator *(PhysicsVector v, float f)
+        {
+            return new PhysicsVector(v.X * f, v.Y * f, v.Z * f);
+        }
+
+        public static PhysicsVector operator *(float f, PhysicsVector v)
+        {
+            return v * f;
+        }
+
+        public virtual bool IsIdentical(PhysicsVector v, float tolerance)
+        {
+            PhysicsVector diff = this - v;
+            float d = diff.length();
+            if (d < tolerance)
+                return true;
+
+            return false;
+        }
     }
 }
\ No newline at end of file