From 9800c05c1b3c7804466d6f3a9c38a739156625fd Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 1 Jul 2007 17:26:33 +0000
Subject: Started change to having SceneObject and then that having child
 Primitives which in turn have a Shape object (currently PrimitiveBaseShape).
 The plan is only for the SceneObject to interface with the physics engines.
 As a physics Entity should be able to have mulitple shapes connected to it.

---
 OpenSim/Region/Environment/Scenes/Entity.cs | 85 ++---------------------------
 1 file changed, 5 insertions(+), 80 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Entity.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
index db5070d..9603f7f 100644
--- a/OpenSim/Region/Environment/Scenes/Entity.cs
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -34,29 +34,14 @@ using libsecondlife;
 
 namespace OpenSim.Region.Environment.Scenes
 {
-    public abstract class Entity
-    {
-        public libsecondlife.LLUUID uuid;
-        public Quaternion rotation;
-        protected List<Entity> children;
-        
+    public abstract class Entity :EntityBase //will be phased out 
+    {     
         protected PhysicsActor _physActor;
-        protected Scene m_world;
-        protected string m_name;
 
         /// <summary>
         /// 
         /// </summary>
-        public virtual string Name
-        {
-            get { return m_name; }
-        }
-
-        protected LLVector3 m_pos;
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual LLVector3 Pos
+        public override LLVector3 Pos
         {
             get
             {
@@ -91,12 +76,11 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-        public LLVector3 velocity;
-
+       
         /// <summary>
         /// 
         /// </summary>
-        public virtual LLVector3 Velocity
+        public override LLVector3 Velocity
         {
             get
             {
@@ -130,64 +114,5 @@ namespace OpenSim.Region.Environment.Scenes
                 velocity = value;
             }
         }
-
-        protected uint m_localId;
-
-        public uint LocalId
-        {
-            get { return m_localId; }
-        }
-
-        /// <summary>
-        /// Creates a new Entity (should not occur on it's own)
-        /// </summary>
-        public Entity()
-        {
-            uuid = new libsecondlife.LLUUID();
-
-            m_pos = new LLVector3();
-            velocity = new LLVector3();
-            rotation = new Quaternion();
-            m_name = "(basic entity)";
-            children = new List<Entity>();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual void updateMovement()
-        {
-        	foreach (Entity child in children)
-            {
-                child.updateMovement();
-            }
-        }
-
-        /// <summary>
-        /// Performs any updates that need to be done at each frame. This function is overridable from it's children.
-        /// </summary>
-        public virtual void update() {
-            // Do any per-frame updates needed that are applicable to every type of entity
-            foreach (Entity child in children)
-            {
-                child.update();
-            }
-        }
-
-        /// <summary>
-        /// Called at a set interval to inform entities that they should back themsleves up to the DB 
-        /// </summary>
-        public virtual void BackUp()
-        {
-        	
-        }
-
-        /// <summary>
-        /// Infoms the entity that the land (heightmap) has changed
-        /// </summary>
-        public virtual void LandRenegerated()
-        {
-
-        }
     }
 }
-- 
cgit v1.1