Merged makomk's patch as per bug #61

Rescued my brain ready to implement animations and proper velocity encoding

1 files changed, 14 insertions, 4 deletions

diff --git a/src/world/Entity.cs b/src/world/Entity.cs
index 92ab2da..7880a46 100644
--- a/src/world/Entity.cs
+++ b/src/world/Entity.cs
@@ -2,15 +2,18 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using Axiom.MathLib;

+using libsecondlife;

 using OpenSim.types;

+using libsecondlife.Packets;

 

 namespace OpenSim.world

 {

     public class Entity

     {

         protected libsecondlife.LLUUID uuid;

-        protected Vector3 position;

-        protected Vector3 velocity;

+        protected uint localid;

+        public LLVector3 position;

+        public LLVector3 velocity;

         protected Quaternion rotation;

         protected string name;

         protected List<Entity> children;

@@ -19,8 +22,9 @@ namespace OpenSim.world
         public Entity()

         {

             uuid = new libsecondlife.LLUUID();

-            position = new Vector3();

-            velocity = new Vector3();

+            localid = 8880000 + (OpenSim_Main.local_world._localNumber++); // FIXME - race condition!

+            position = new LLVector3();

+            velocity = new LLVector3();

             rotation = new Quaternion();

             name = "(basic entity)";

             children = new List<Entity>();

@@ -33,8 +37,14 @@ namespace OpenSim.world
                 if(child.needupdate) 

                         child.update();

             }

+            this.needupdate=false;

         }

 

+        public virtual ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateTerseBlock() {

+                return null;

+        }

+

+

         public virtual string getName()

         {

             return name;