aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorgareth2007-03-03 19:17:44 +0000
committergareth2007-03-03 19:17:44 +0000
commitb29618fc3c035b4accd7cd27a4980a581e653e7d (patch)
tree233468a13e64b297a355743f76fcbc0659519951
parentBegun porting a (STABLE) version of MW's movement code (diff)
downloadopensim-SC_OLD-b29618fc3c035b4accd7cd27a4980a581e653e7d.zip
opensim-SC_OLD-b29618fc3c035b4accd7cd27a4980a581e653e7d.tar.gz
opensim-SC_OLD-b29618fc3c035b4accd7cd27a4980a581e653e7d.tar.bz2
opensim-SC_OLD-b29618fc3c035b4accd7cd27a4980a581e653e7d.tar.xz
Rollback to r117
-rw-r--r--src/world/Avatar.cs18
-rw-r--r--src/world/Entity.cs10
-rw-r--r--src/world/PhysicsEngine.cs7
3 files changed, 5 insertions, 30 deletions
diff --git a/src/world/Avatar.cs b/src/world/Avatar.cs
index fc1b4a2..f3905cd 100644
--- a/src/world/Avatar.cs
+++ b/src/world/Avatar.cs
@@ -12,8 +12,6 @@ namespace OpenSim.world
12 public string firstname; 12 public string firstname;
13 public string lastname; 13 public string lastname;
14 public OpenSimClient ControllingClient; 14 public OpenSimClient ControllingClient;
15 public uint CurrentKeyMask;
16
17 private libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate; 15 private libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate;
18 16
19 public Avatar(OpenSimClient TheClient) { 17 public Avatar(OpenSimClient TheClient) {
@@ -23,21 +21,7 @@ namespace OpenSim.world
23 } 21 }
24 22
25 public void update() { 23 public void update() {
26 lock(this) { 24 base.update();
27 base.update();
28
29 if((this.CurrentKeyMask & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_AT_POS) != 0) {
30 if((this.velocity.X>230) & (this.velocity.Y>230)) {
31 this.velocity.X=230;
32 this.velocity.Y=230;
33 this.velocity.Z=0;
34 }
35 } else {
36 this.velocity.X=0;
37 this.velocity.Y=0;
38 this.velocity.Z=0;
39 }
40 }
41 } 25 }
42 26
43 private void SetupTemplate(string name) 27 private void SetupTemplate(string name)
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;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using Axiom.MathLib; 4using Axiom.MathLib;
5using libsecondlife;
6using OpenSim.types; 5using OpenSim.types;
7 6
8namespace OpenSim.world 7namespace 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()
diff --git a/src/world/PhysicsEngine.cs b/src/world/PhysicsEngine.cs
index 4379aa0..7585135 100644
--- a/src/world/PhysicsEngine.cs
+++ b/src/world/PhysicsEngine.cs
@@ -18,13 +18,6 @@ namespace OpenSim.world
18 } 18 }
19 19
20 public void DoStuff(World simworld) { 20 public void DoStuff(World simworld) {
21 foreach (libsecondlife.LLUUID UUID in simworld.Entities.Keys)
22 {
23 if(simworld.Entities[UUID].needupdate) {
24 simworld.Entities[UUID].position += simworld.Entities[UUID].velocity;
25 }
26
27 }
28 } 21 }
29 } 22 }
30} 23}