aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/world/Entity.cs
diff options
context:
space:
mode:
authorgareth2007-03-03 01:49:56 +0000
committergareth2007-03-03 01:49:56 +0000
commitb968ff83a998b82d8bce9a4175178c7cd710be19 (patch)
tree4e3808e89610bede8ad63879b5fd3968f3c2800e /src/world/Entity.cs
parentLock the world so we don't cause nastiness and crashes (diff)
downloadopensim-SC_OLD-b968ff83a998b82d8bce9a4175178c7cd710be19.zip
opensim-SC_OLD-b968ff83a998b82d8bce9a4175178c7cd710be19.tar.gz
opensim-SC_OLD-b968ff83a998b82d8bce9a4175178c7cd710be19.tar.bz2
opensim-SC_OLD-b968ff83a998b82d8bce9a4175178c7cd710be19.tar.xz
Begun porting a (STABLE) version of MW's movement code
Diffstat (limited to 'src/world/Entity.cs')
-rw-r--r--src/world/Entity.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/world/Entity.cs b/src/world/Entity.cs
index 92ab2da..0f75c8a 100644
--- a/src/world/Entity.cs
+++ b/src/world/Entity.cs
@@ -2,6 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using Axiom.MathLib; 4using Axiom.MathLib;
5using libsecondlife;
5using OpenSim.types; 6using OpenSim.types;
6 7
7namespace OpenSim.world 8namespace OpenSim.world
@@ -9,8 +10,8 @@ namespace OpenSim.world
9 public class Entity 10 public class Entity
10 { 11 {
11 protected libsecondlife.LLUUID uuid; 12 protected libsecondlife.LLUUID uuid;
12 protected Vector3 position; 13 public LLVector3 position;
13 protected Vector3 velocity; 14 public LLVector3 velocity;
14 protected Quaternion rotation; 15 protected Quaternion rotation;
15 protected string name; 16 protected string name;
16 protected List<Entity> children; 17 protected List<Entity> children;
@@ -19,8 +20,8 @@ namespace OpenSim.world
19 public Entity() 20 public Entity()
20 { 21 {
21 uuid = new libsecondlife.LLUUID(); 22 uuid = new libsecondlife.LLUUID();
22 position = new Vector3(); 23 position = new LLVector3();
23 velocity = new Vector3(); 24 velocity = new LLVector3();
24 rotation = new Quaternion(); 25 rotation = new Quaternion();
25 name = "(basic entity)"; 26 name = "(basic entity)";
26 children = new List<Entity>(); 27 children = new List<Entity>();
@@ -33,6 +34,7 @@ namespace OpenSim.world
33 if(child.needupdate) 34 if(child.needupdate)
34 child.update(); 35 child.update();
35 } 36 }
37 this.needupdate=false;
36 } 38 }
37 39
38 public virtual string getName() 40 public virtual string getName()