Very Preliminary border crossing added to sugilite. (Note: Sugilite doesn't have any backend ogs communication support yet so everything is Sandbox mode only )

1 files changed, 61 insertions, 1 deletions

diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs b/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs
index 3f87e10..d46bf0f 100644
--- a/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs
@@ -32,6 +32,7 @@ using libsecondlife;
 using libsecondlife.Packets;

 using OpenSim.Physics.Manager;

 using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Region.Scenes

 {

@@ -55,7 +56,24 @@ namespace OpenSim.Region.Scenes
                     this.SendTerseUpdateToALLClients();

                     _updateCount = 0;

                 }

-            }     

+            }

+

+            LLVector3 pos2 = this.Pos;

+            LLVector3 vel = this.Velocity;

+

+            float timeStep = 0.3f;

+            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>

@@ -147,5 +165,47 @@ namespace OpenSim.Region.Scenes
            

         }

 

+        private void CrossToNewRegion()

+        {

+            

+           // Console.WriteLine("crossing to new region from region " + this.m_regionInfo.RegionLocX + " , "+ this.m_regionInfo.RegionLocY);

+            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;

+           // Console.WriteLine("new region should be " + neighbourx + " , " + neighboury);

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

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

+            if (neighbourRegion != null)

+            {

+              //  Console.WriteLine("current region port is "+ this.m_regionInfo.IPListenPort + " now crossing to new region with port " + neighbourRegion.IPListenPort);

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

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

+            }

+        }

+

     }

 }