Some refactoring.

1 files changed, 251 insertions, 62 deletions

diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
index e22528a..1255606 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Region.Scenes
         public IClientAPI ControllingClient;

         public LLUUID current_anim;

         public int anim_seq;

-        private static libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate;

         private bool updateflag = false;

         private byte movementflag = 0;

         private List<NewForce> forcesList = new List<NewForce>();

@@ -59,11 +58,31 @@ namespace OpenSim.Region.Scenes
         private AvatarWearable[] Wearables;

         private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);

         private ulong m_regionHandle;

-        private bool childAvatar = false;

+        private bool childAgent = false;

         private bool newForce = false;

         private bool newAvatar = false;

+        private IScenePresenceBody m_body;

 

         protected RegionInfo m_regionInfo;

+

+        #region Properties

+        /// <summary>

+        /// 

+        /// </summary>

+        public PhysicsActor PhysActor

+        {

+            set

+            {

+                this._physActor = value;

+            }

+            get

+            {

+                return _physActor;

+            }

+        }

+        #endregion

+

+        #region Constructor(s)

         /// <summary>

         /// 

         /// </summary>

@@ -99,38 +118,25 @@ namespace OpenSim.Region.Scenes
             ControllingClient.OnRequestWearables += this.SendOurAppearance;

             //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);

             ControllingClient.OnCompleteMovementToRegion += this.CompleteMovement;

-            ControllingClient.OnCompleteMovementToRegion += this.SendInitialPosition;

+            ControllingClient.OnCompleteMovementToRegion += this.SendInitialData;

             ControllingClient.OnAgentUpdate += this.HandleAgentUpdate;

             // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);

             // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);

             //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);

-            

-        }

 

-        /// <summary>

-        /// 

-        /// </summary>

-        public PhysicsActor PhysActor

-        {

-            set

-            {

-                this._physActor = value;

-            }

-            get

-            {

-                return _physActor;

-            }

         }

+        #endregion

 

+        #region Status Methods

         /// <summary>

-        /// 

+        /// Not Used, most likely can be deleted

         /// </summary>

         /// <param name="status"></param>

         public void ChildStatusChange(bool status)

         {

-            this.childAvatar = status;

+            this.childAgent = status;

 

-            if (this.childAvatar == true)

+            if (this.childAgent == true)

             {

                 this.Velocity = new LLVector3(0, 0, 0);

                 this.Pos = new LLVector3(128, 128, 70);

@@ -142,18 +148,19 @@ namespace OpenSim.Region.Scenes
         /// 

         /// </summary>

         /// <param name="pos"></param>

-        public void UpGradeAvatar(LLVector3 pos)

+        public void MakeAvatar(LLVector3 pos)

         {

             //this.childAvatar = false;

             this.Pos = pos;

             this.newAvatar = true;

+            this.childAgent = false;

         }

 

-        protected void DownGradeAvatar()

+        protected void MakeChildAgent()

         {

             this.Velocity = new LLVector3(0, 0, 0);

             this.Pos = new LLVector3(128, 128, 70);

-            this.childAvatar = true;

+            this.childAgent = true;

         }

 

         /// <summary>

@@ -169,46 +176,21 @@ namespace OpenSim.Region.Scenes
         /// <summary>

         /// 

         /// </summary>

-        public override void addForces()

+        public void StopMovement()

         {

-            newForce = false;

-            lock (this.forcesList)

-            {   

-                if (this.forcesList.Count > 0)

-                {

-                    for (int i = 0; i < this.forcesList.Count; i++)

-                    {

-                        NewForce force = this.forcesList[i];

-                        

-                        this.updateflag = true;

-                        this.Velocity = new LLVector3(force.X, force.Y, force.Z); 

-                        this.newForce = true;

-                    }

-                    for (int i = 0; i < this.forcesList.Count; i++)

-                    {

-                        this.forcesList.RemoveAt(0);

-                    }

-                }

-            }

-        }

 

-        public void SendTerseUpdateToClient(IClientAPI RemoteClient)

-        {

-            LLVector3 pos = this.Pos;

-            LLVector3 vel = this.Velocity;

-            RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle,  64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z)); 

         }

+        #endregion

 

+        #region Event Handlers

         /// <summary>

         /// 

         /// </summary>

-        public void SendTerseUpdateToALLClients()

+        /// <param name="texture"></param>

+        /// <param name="visualParam"></param>

+        public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)

         {

-            List<ScenePresence> avatars = this.m_world.RequestAvatarList();

-            for (int i = 0; i < avatars.Count; i++)

-            {

-                this.SendTerseUpdateToClient(avatars[i].ControllingClient);

-            }

+

         }

 

         /// <summary>

@@ -222,9 +204,9 @@ namespace OpenSim.Region.Scenes
                 look = new LLVector3(0.99f, 0.042f, 0);

             }

             this.ControllingClient.MoveAgentIntoRegion(m_regionInfo, Pos, look);

-            if (this.childAvatar)

+            if (this.childAgent)

             {

-                this.childAvatar = false;

+                this.childAgent = false;

             }

         }

 

@@ -272,25 +254,232 @@ namespace OpenSim.Region.Scenes
                     movementflag = 0;

                 }

             }

-            

+

         }

+        #endregion

 

+        #region Overridden Methods

         /// <summary>

         /// 

         /// </summary>

-        public static void LoadAnims()

+        public override void LandRenegerated()

         {

 

         }

-        

+

         /// <summary>

         /// 

         /// </summary>

-        public override void LandRenegerated()

+        public override void update()

+        {

+            if (this.childAgent == false)

+            {

+                if (this.newForce)

+                {

+                    this.SendTerseUpdateToALLClients();

+                    _updateCount = 0;

+                }

+                else if (movementflag != 0)

+                {

+                    _updateCount++;

+                    if (_updateCount > 3)

+                    {

+                        this.SendTerseUpdateToALLClients();

+                        _updateCount = 0;

+                    }

+                }

+

+                this.CheckForBorderCrossing();

+            }

+        }

+        #endregion

+

+        #region Update Client(s)

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="RemoteClient"></param>

+        public void SendTerseUpdateToClient(IClientAPI RemoteClient)

+        {

+            LLVector3 pos = this.Pos;

+            LLVector3 vel = this.Velocity;

+            RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z));

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        public void SendTerseUpdateToALLClients()

+        {

+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();

+            for (int i = 0; i < avatars.Count; i++)

+            {

+                this.SendTerseUpdateToClient(avatars[i].ControllingClient);

+            }

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="remoteAvatar"></param>

+        public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)

+        {

+            remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos);

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        public void SendInitialData()

+        {

+            this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos);

+            if (this.newAvatar)

+            {

+                this.m_world.InformClientOfNeighbours(this.ControllingClient);

+                this.newAvatar = false;

+            }

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="OurClient"></param>

+        public void SendOurAppearance(IClientAPI OurClient)

+        {

+            this.ControllingClient.SendWearables(this.Wearables);

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="avatarInfo"></param>

+        public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)

         {

 

         }

 

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="animID"></param>

+        /// <param name="seq"></param>

+        public void SendAnimPack(LLUUID animID, int seq)

+        {

+

+

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        public void SendAnimPack()

+        {

+

+        }

+        #endregion

+

+        #region Border Crossing Methods

+        /// <summary>

+        /// 

+        /// </summary>

+        protected void CheckForBorderCrossing()

+        {

+            LLVector3 pos2 = this.Pos;

+            LLVector3 vel = this.Velocity;

+

+            float timeStep = 0.2f;

+            pos2.X = pos2.X + (vel.X * timeStep);

+            pos2.Y = pos2.Y + (vel.Y * timeStep);

+            pos2.Z = pos2.Z + (vel.Z * timeStep);

+

+            if ((pos2.X < 0) || (pos2.X > 256))

+            {

+                this.CrossToNewRegion();

+            }

+

+            if ((pos2.Y < 0) || (pos2.Y > 256))

+            {

+                this.CrossToNewRegion();

+            }

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        protected void CrossToNewRegion()

+        {

+            LLVector3 pos = this.Pos;

+            LLVector3 newpos = new LLVector3(pos.X, pos.Y, pos.Z);

+            uint neighbourx = this.m_regionInfo.RegionLocX;

+            uint neighboury = this.m_regionInfo.RegionLocY;

+

+            if (pos.X < 2)

+            {

+                neighbourx -= 1;

+                newpos.X = 254;

+            }

+            if (pos.X > 253)

+            {

+                neighbourx += 1;

+                newpos.X = 1;

+            }

+            if (pos.Y < 2)

+            {

+                neighboury -= 1;

+                newpos.Y = 254;

+            }

+            if (pos.Y > 253)

+            {

+                neighboury += 1;

+                newpos.Y = 1;

+            }

+

+            LLVector3 vel = this.velocity;

+            ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * 256), (uint)(neighboury * 256));

+            RegionInfo neighbourRegion = this.m_world.RequestNeighbouringRegionInfo(neighbourHandle);

+            if (neighbourRegion != null)

+            {

+                this.m_world.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos);

+                this.MakeChildAgent();

+                this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, System.Net.IPAddress.Parse(neighbourRegion.IPListenAddr), (ushort)neighbourRegion.IPListenPort);

+

+            }

+        }

+        #endregion

+

+        /// <summary>

+        /// 

+        /// </summary>

+        public static void LoadAnims()

+        {

+

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        public override void updateMovement()

+        {

+            newForce = false;

+            lock (this.forcesList)

+            {

+                if (this.forcesList.Count > 0)

+                {

+                    for (int i = 0; i < this.forcesList.Count; i++)

+                    {

+                        NewForce force = this.forcesList[i];

+

+                        this.updateflag = true;

+                        this.Velocity = new LLVector3(force.X, force.Y, force.Z);

+                        this.newForce = true;

+                    }

+                    for (int i = 0; i < this.forcesList.Count; i++)

+                    {

+                        this.forcesList.RemoveAt(0);

+                    }

+                }

+            }

+        }

 

         public class NewForce

         {