1 files changed, 0 insertions, 124 deletions
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs b/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
deleted file mode 100644
index 96e039a..0000000
--- a/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Axiom.MathLib;
-using OpenSim.Physics.Manager;
-using OpenSim.types;
-using libsecondlife;
-using OpenSim.RegionServer.world.scripting;
-namespace OpenSim.world
-{
-    public abstract class Entity : IScriptReadonlyEntity
-    {
-        public libsecondlife.LLUUID uuid;
-        public uint localid;
-        public LLVector3 velocity;
-        public Quaternion rotation;
-        protected List<Entity> children;
-        protected string m_name;
-        public virtual string Name
-        {
-            get { return m_name; }
-        }
-        protected LLVector3 m_pos;
-        protected PhysicsActor _physActor;
-        protected World m_world;
-        public virtual LLVector3 Pos
-        {
-            get
-            {
-                if (this._physActor != null)
-                {
-                    m_pos.X = _physActor.Position.X;
-                    m_pos.Y = _physActor.Position.Y;
-                    m_pos.Z = _physActor.Position.Z;
-                }
-                return m_pos;
-            }
-            set
-            {
-                if (this._physActor != null)
-                {
-                    try
-                    {
-                        lock (this.m_world.LockPhysicsEngine)
-                        {
-                            this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine(e.Message);
-                    }
-                }
-                m_pos = value;
-            }
-        }
-        /// <summary>
-        /// Creates a new Entity (should not occur on it's own)
-        /// </summary>
-        public Entity()
-        {
-            uuid = new libsecondlife.LLUUID();
-            localid = 0;
-            m_pos = new LLVector3();
-            velocity = new LLVector3();
-            rotation = new Quaternion();
-            m_name = "(basic entity)";
-            children = new List<Entity>();
-        }
-        public virtual void addForces()
-        {
-                foreach (Entity child in children)
-            {
-                child.addForces();
-            }
-        }
-        /// <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>
-        /// Returns a mesh for this object and any dependents
-        /// </summary>
-        /// <returns>The mesh of this entity tree</returns>
-        public virtual Mesh getMesh()
-        {
-            Mesh mesh = new Mesh();
-            foreach (Entity child in children)
-            {
-                mesh += child.getMesh();
-            }
-            return mesh;
-        }
-        
-        public virtual void BackUp()
-        {
-                
-        }
-        public virtual void LandRenegerated()
-        {
-        }
-    }
-}

diff --git a/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs b/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs deleted file mode 100644 index 96e039a..0000000 --- a/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs +++ /dev/null
@@ -1,124 +0,0 @@
1	using System;
2	using System.Collections.Generic;
3	using System.Text;
4	using Axiom.MathLib;
5	using OpenSim.Physics.Manager;
6	using OpenSim.types;
7	using libsecondlife;
8	using OpenSim.RegionServer.world.scripting;
9
10	namespace OpenSim.world
11	{
12	public abstract class Entity : IScriptReadonlyEntity
13	{
14	public libsecondlife.LLUUID uuid;
15	public uint localid;
16	public LLVector3 velocity;
17	public Quaternion rotation;
18	protected List<Entity> children;
19
20	protected string m_name;
21	public virtual string Name
22	{
23	get { return m_name; }
24	}
25
26	protected LLVector3 m_pos;
27	protected PhysicsActor _physActor;
28	protected World m_world;
29
30	public virtual LLVector3 Pos
31	{
32	get
33	{
34	if (this._physActor != null)
35	{
36	m_pos.X = _physActor.Position.X;
37	m_pos.Y = _physActor.Position.Y;
38	m_pos.Z = _physActor.Position.Z;
39	}
40
41	return m_pos;
42	}
43	set
44	{
45	if (this._physActor != null)
46	{
47	try
48	{
49	lock (this.m_world.LockPhysicsEngine)
50	{
51
52	this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
53	}
54	}
55	catch (Exception e)
56	{
57	Console.WriteLine(e.Message);
58	}
59	}
60
61	m_pos = value;
62	}
63	}
64
65	/// <summary>
66	/// Creates a new Entity (should not occur on it's own)
67	/// </summary>
68	public Entity()
69	{
70	uuid = new libsecondlife.LLUUID();
71	localid = 0;
72	m_pos = new LLVector3();
73	velocity = new LLVector3();
74	rotation = new Quaternion();
75	m_name = "(basic entity)";
76	children = new List<Entity>();
77	}
78
79	public virtual void addForces()
80	{
81	foreach (Entity child in children)
82	{
83	child.addForces();
84	}
85	}
86
87	/// <summary>
88	/// Performs any updates that need to be done at each frame. This function is overridable from it's children.
89	/// </summary>
90	public virtual void update() {
91	// Do any per-frame updates needed that are applicable to every type of entity
92	foreach (Entity child in children)
93	{
94	child.update();
95	}
96	}
97
98	/// <summary>
99	/// Returns a mesh for this object and any dependents
100	/// </summary>
101	/// <returns>The mesh of this entity tree</returns>
102	public virtual Mesh getMesh()
103	{
104	Mesh mesh = new Mesh();
105
106	foreach (Entity child in children)
107	{
108	mesh += child.getMesh();
109	}
110
111	return mesh;
112	}
113
114	public virtual void BackUp()
115	{
116
117	}
118
119	public virtual void LandRenegerated()
120	{
121
122	}
123	}
124	}