brought zircon branch into trunk

1 files changed, 38 insertions, 14 deletions

diff --git a/src/physics/plugins/PhysXplugin.cs b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index 8c09dc8..deff803 100644
--- a/src/physics/plugins/PhysXplugin.cs
+++ b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -26,18 +26,18 @@
 */

 using System;

 using System.Collections.Generic;

-using PhysicsSystem;

+using OpenSim.Physics.Manager;

 

-namespace PhysXplugin

+namespace OpenSim.Physics.BasicPhysicsPlugin

 {

         /// <summary>

         /// Will be the PhysX plugin but for now will be a very basic physics engine

         /// </summary>

-        public class PhysXPlugin : IPhysicsPlugin

+        public class BasicPhysicsPlugin : IPhysicsPlugin

         {

-                private PhysXScene _mScene;

+                private BasicScene _mScene;

                 

-                public PhysXPlugin()

+                public BasicPhysicsPlugin()

                 {

                         

                 }

@@ -51,14 +51,14 @@ namespace PhysXplugin
                 {

                         if(_mScene == null)

                         {

-                                _mScene = new PhysXScene();

+                                _mScene = new BasicScene();

                         }

                         return(_mScene);

                 }

                 

                 public string GetName()

                 {

-                        return("PhysX");

+                        return("basicphysics");

                 }

                 

                 public void Dispose()

@@ -67,19 +67,19 @@ namespace PhysXplugin
                 }

         }

         

-        public class PhysXScene :PhysicsScene

+        public class BasicScene :PhysicsScene

         {

-                private List<PhysXActor> _actors = new List<PhysXActor>();

+                private List<BasicActor> _actors = new List<BasicActor>();

                 private float[] _heightMap;

                 

-                public PhysXScene()

+                public BasicScene()

                 {

                         

                 }

                 

                 public override PhysicsActor AddAvatar(PhysicsVector position)

                 {

-                        PhysXActor act = new PhysXActor();

+                        BasicActor act = new BasicActor();

                         act.Position = position;

                         _actors.Add(act);

                         return act;

@@ -92,7 +92,7 @@ namespace PhysXplugin
                 

                 public override void Simulate(float timeStep)

                 {

-                        foreach (PhysXActor actor in _actors)

+                        foreach (BasicActor actor in _actors)

                         {

                                 actor.Position.X = actor.Position.X + (actor.Velocity.X * timeStep);

                                 actor.Position.Y = actor.Position.Y + (actor.Velocity.Y * timeStep);

@@ -151,13 +151,13 @@ namespace PhysXplugin
                 }

         }

         

-        public  class PhysXActor : PhysicsActor

+        public  class BasicActor : PhysicsActor

         {

                 private PhysicsVector _position;

                 private PhysicsVector _velocity;

                 private PhysicsVector _acceleration;

                 private bool flying;

-                public PhysXActor()

+                public BasicActor()

                 {

                         _velocity = new PhysicsVector();

                         _position = new PhysicsVector();

@@ -200,6 +200,18 @@ namespace PhysXplugin
                         }

                 }

                 

+                public override Axiom.MathLib.Quaternion Orientation

+                {

+                        get

+                        {

+                                return Axiom.MathLib.Quaternion.Identity;

+                        }

+                        set

+                        {

+                                

+                        }

+                }

+                

                 public override PhysicsVector Acceleration

                 {

                         get

@@ -208,6 +220,18 @@ namespace PhysXplugin
                         }

                         

                 }

+                

+                public override bool Kinematic

+                {

+                        get

+                        {

+                                return true;

+                        }

+                        set

+                        {

+                                

+                        }

+                }

                 public void SetAcceleration (PhysicsVector accel)

                 {

                         this._acceleration = accel;