OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rollback to r117

adam
gareth 2007-03-03 19:17:44 +00:00
parent b968ff83a9
commit b29618fc3c
3 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/world/Avatar.cs
View File

@ -12,8 +12,6 @@ namespace OpenSim.world
public string firstname; public string firstname;
public string lastname; public string lastname;
public OpenSimClient ControllingClient; public OpenSimClient ControllingClient;
public uint CurrentKeyMask;
private libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate; private libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate;
public Avatar(OpenSimClient TheClient) { public Avatar(OpenSimClient TheClient) {
@ -23,21 +21,7 @@ namespace OpenSim.world
} }
public void update() { public void update() {
lock(this) { base.update();
base.update();
if((this.CurrentKeyMask & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_AT_POS) != 0) {
if((this.velocity.X>230) & (this.velocity.Y>230)) {
this.velocity.X=230;
this.velocity.Y=230;
this.velocity.Z=0;
}
} else {
this.velocity.X=0;
this.velocity.Y=0;
this.velocity.Z=0;
}
}
} }
private void SetupTemplate(string name) private void SetupTemplate(string name)

10
src/world/Entity.cs
View File

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using Axiom.MathLib; using Axiom.MathLib;
using libsecondlife;
using OpenSim.types; using OpenSim.types;
namespace OpenSim.world namespace OpenSim.world
@ -10,8 +9,8 @@ namespace OpenSim.world
public class Entity public class Entity
{ {
protected libsecondlife.LLUUID uuid; protected libsecondlife.LLUUID uuid;
public LLVector3 position; protected Vector3 position;
public LLVector3 velocity; protected Vector3 velocity;
protected Quaternion rotation; protected Quaternion rotation;
protected string name; protected string name;
protected List<Entity> children; protected List<Entity> children;
@ -20,8 +19,8 @@ namespace OpenSim.world
public Entity() public Entity()
{ {
uuid = new libsecondlife.LLUUID(); uuid = new libsecondlife.LLUUID();
position = new LLVector3(); position = new Vector3();
velocity = new LLVector3(); velocity = new Vector3();
rotation = new Quaternion(); rotation = new Quaternion();
name = "(basic entity)"; name = "(basic entity)";
children = new List<Entity>(); children = new List<Entity>();
@ -34,7 +33,6 @@ namespace OpenSim.world
if(child.needupdate) if(child.needupdate)
child.update(); child.update();
} }
this.needupdate=false;
} }
public virtual string getName() public virtual string getName()

7
src/world/PhysicsEngine.cs
View File

@ -18,13 +18,6 @@ namespace OpenSim.world
} }
public void DoStuff(World simworld) { public void DoStuff(World simworld) {
foreach (libsecondlife.LLUUID UUID in simworld.Entities.Keys)
{
if(simworld.Entities[UUID].needupdate) {
simworld.Entities[UUID].position += simworld.Entities[UUID].velocity;
}
}
} }
} }
} }