diff options
author | gareth | 2007-03-03 19:17:44 +0000 |
---|---|---|
committer | gareth | 2007-03-03 19:17:44 +0000 |
commit | b29618fc3c035b4accd7cd27a4980a581e653e7d (patch) | |
tree | 233468a13e64b297a355743f76fcbc0659519951 /src/world/Entity.cs | |
parent | Begun porting a (STABLE) version of MW's movement code (diff) | |
download | opensim-SC-b29618fc3c035b4accd7cd27a4980a581e653e7d.zip opensim-SC-b29618fc3c035b4accd7cd27a4980a581e653e7d.tar.gz opensim-SC-b29618fc3c035b4accd7cd27a4980a581e653e7d.tar.bz2 opensim-SC-b29618fc3c035b4accd7cd27a4980a581e653e7d.tar.xz |
Rollback to r117
Diffstat (limited to 'src/world/Entity.cs')
-rw-r--r-- | src/world/Entity.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/world/Entity.cs b/src/world/Entity.cs index 0f75c8a..92ab2da 100644 --- a/src/world/Entity.cs +++ b/src/world/Entity.cs | |||
@@ -2,7 +2,6 @@ using System; | |||
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using Axiom.MathLib; | 4 | using Axiom.MathLib; |
5 | using libsecondlife; | ||
6 | using OpenSim.types; | 5 | using OpenSim.types; |
7 | 6 | ||
8 | namespace OpenSim.world | 7 | namespace OpenSim.world |
@@ -10,8 +9,8 @@ namespace OpenSim.world | |||
10 | public class Entity | 9 | public class Entity |
11 | { | 10 | { |
12 | protected libsecondlife.LLUUID uuid; | 11 | protected libsecondlife.LLUUID uuid; |
13 | public LLVector3 position; | 12 | protected Vector3 position; |
14 | public LLVector3 velocity; | 13 | protected Vector3 velocity; |
15 | protected Quaternion rotation; | 14 | protected Quaternion rotation; |
16 | protected string name; | 15 | protected string name; |
17 | protected List<Entity> children; | 16 | protected List<Entity> children; |
@@ -20,8 +19,8 @@ namespace OpenSim.world | |||
20 | public Entity() | 19 | public Entity() |
21 | { | 20 | { |
22 | uuid = new libsecondlife.LLUUID(); | 21 | uuid = new libsecondlife.LLUUID(); |
23 | position = new LLVector3(); | 22 | position = new Vector3(); |
24 | velocity = new LLVector3(); | 23 | velocity = new Vector3(); |
25 | rotation = new Quaternion(); | 24 | rotation = new Quaternion(); |
26 | name = "(basic entity)"; | 25 | name = "(basic entity)"; |
27 | children = new List<Entity>(); | 26 | children = new List<Entity>(); |
@@ -34,7 +33,6 @@ namespace OpenSim.world | |||
34 | if(child.needupdate) | 33 | if(child.needupdate) |
35 | child.update(); | 34 | child.update(); |
36 | } | 35 | } |
37 | this.needupdate=false; | ||
38 | } | 36 | } |
39 | 37 | ||
40 | public virtual string getName() | 38 | public virtual string getName() |