RIP OpenSimRoot. (removed)

Merged most of the bug fixes etc in from LLdemo branch.
Added the textures from that branch.

4 files changed, 155 insertions, 49 deletions

diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
index 2ae9992..7b79378 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim.RegionServer/world/Avatar.cs
@@ -41,10 +41,10 @@ namespace OpenSim.world
             m_clientThreads = clientThreads;

             m_regionName = regionName;

             m_regionHandle = regionHandle;

-            

+

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs - Loading details from grid (DUMMY)");

             ControllingClient = TheClient;

-            localid = 8880000 + (m_world._localNumber++);

+            localid = 8880000 + (this.m_world._localNumber++);

             position = new LLVector3(100.0f, 100.0f, 30.0f);

             position.Z = m_world.LandMap[(int)position.Y * 256 + (int)position.X] + 1;

             visualParams = new byte[218];

@@ -61,7 +61,7 @@ namespace OpenSim.world
             this.Wearables[0].ItemID = LLUUID.Random();

 

             this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));

-

+           

         }

 

         public PhysicsActor PhysActor

@@ -82,7 +82,10 @@ namespace OpenSim.world
                     {

                         NewForce force = this.forcesList[i];

                         PhysicsVector phyVector = new PhysicsVector(force.X, force.Y, force.Z);

-                        this._physActor.Velocity = phyVector;

+                        lock (m_world.LockPhysicsEngine)

+                        {

+                            this._physActor.Velocity = phyVector;

+                        }

                         this.updateflag = true;

                         this.velocity = new LLVector3(force.X, force.Y, force.Z); //shouldn't really be doing this

                         // but as we are setting the velocity (rather than using real forces) at the moment it is okay.

@@ -181,7 +184,7 @@ namespace OpenSim.world
             AgentMovementCompletePacket mov = new AgentMovementCompletePacket();

             mov.AgentData.SessionID = this.ControllingClient.SessionID;

             mov.AgentData.AgentID = this.ControllingClient.AgentID;

-            mov.Data.RegionHandle = m_regionHandle;

+            mov.Data.RegionHandle = this.m_regionHandle;

             // TODO - dynamicalise this stuff

             mov.Data.Timestamp = 1172750370;

             mov.Data.Position = new LLVector3(100f, 100f, 23f);

@@ -475,7 +478,12 @@ namespace OpenSim.world
             ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();

             ani.AnimationList[0].AnimID = this.current_anim;

             ani.AnimationList[0].AnimSequenceID = this.anim_seq;

-            ControllingClient.OutPacket(ani);

+           

+            //ControllingClient.OutPacket(ani);

+            foreach (SimClient client in m_clientThreads.Values)

+            {

+                client.OutPacket(ani);

+            }

         }

 

         //should be moved somewhere else

@@ -522,7 +530,11 @@ namespace OpenSim.world
             ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();

 

             dat.TextureEntry = new byte[0];// AvatarTemplate.TextureEntry;

-            libsecondlife.LLVector3 pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);

+            libsecondlife.LLVector3 pos2 = new LLVector3(0, 0, 0);

+            lock (m_world.LockPhysicsEngine)

+            {

+                pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);

+            }

 

             uint ID = this.localid;

 

@@ -542,8 +554,11 @@ namespace OpenSim.world
             ushort InternVelocityX;

             ushort InternVelocityY;

             ushort InternVelocityZ;

-

-            Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(this._physActor.Velocity.X, this._physActor.Velocity.Y, this._physActor.Velocity.Z);

+            Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(0, 0, 0);

+            lock (m_world.LockPhysicsEngine)

+            {

+                internDirec = new Axiom.MathLib.Vector3(this._physActor.Velocity.X, this._physActor.Velocity.Y, this._physActor.Velocity.Z);

+            }

             internDirec = internDirec / 128.0f;

             internDirec.x += 1;

             internDirec.y += 1;

@@ -596,6 +611,27 @@ namespace OpenSim.world
             Avatar.Animations = new AvatarAnimations();

             Avatar.Animations.LoadAnims();

         }

+

+        public override void LandRenegerated()

+        {

+            position = new LLVector3(100.0f, 100.0f, 30.0f);

+            position.Z = this.m_world.LandMap[(int)position.Y * 256 + (int)position.X] + 50;

+            if (this._physActor != null)

+            {

+                try

+                {

+                    lock (this.m_world.LockPhysicsEngine)

+                    {

+

+                        this._physActor.Position = new PhysicsVector(position.X, position.Y, position.Z);

+                    }

+                }

+                catch (Exception e)

+                {

+                    Console.WriteLine(e.Message);

+                }       

+            }

+        }

     }

 

     public class NewForce

diff --git a/OpenSim.RegionServer/world/Entity.cs b/OpenSim.RegionServer/world/Entity.cs
index 780f3a0..567c0b7 100644
--- a/OpenSim.RegionServer/world/Entity.cs
+++ b/OpenSim.RegionServer/world/Entity.cs
@@ -63,5 +63,10 @@ namespace OpenSim.world
         {

                 

         }

+

+        public virtual void LandRenegerated()

+        {

+

+        }

     }

 }

diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs
index a185f0b..ca764a7 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim.RegionServer/world/Primitive.cs
@@ -12,6 +12,7 @@ namespace OpenSim.world
 {

     public class Primitive : Entity

     {

+        //private static object physicsLock = new object();

         protected float mesh_cutbegin;

         protected float mesh_cutend;

         protected PrimData primData;

@@ -21,7 +22,8 @@ namespace OpenSim.world
         private ObjectUpdatePacket OurPacket;

         private PhysicsActor _physActor;

         private bool physicsEnabled = false;

-        private bool physicstest = false; //just added for testing 

+        private bool physicstest = false;  

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

         private Dictionary<uint, SimClient> m_clientThreads;

         private ulong m_regionHandle;

         private World m_world;

@@ -72,7 +74,7 @@ namespace OpenSim.world
         {

             mesh_cutbegin = 0.0f;

             mesh_cutend = 1.0f;

-            

+

             m_clientThreads = clientThreads;

             m_regionHandle = regionHandle;

             m_world = world;

@@ -97,13 +99,30 @@ namespace OpenSim.world
             this.position = pos;

             if (this._physActor != null) // && this.physicsEnabled)

             {

-                this._physActor.Position = new PhysicsVector(pos.X, pos.Y, pos.Z);

+                try

+                {

+                    lock (m_world.LockPhysicsEngine)

+                    {

+                        this._physActor.Position = new PhysicsVector(pos.X, pos.Y, pos.Z);

+                    }

+                }

+                catch (Exception e)

+                {

+                    Console.WriteLine(e.Message);

+                }

             }

             this.updateFlag = true;

         }

 

         public override void update()

         {

+            LLVector3 pos2 = new LLVector3(0, 0, 0);

+            if (this._physActor != null && this.physicsEnabled)

+            {

+

+                PhysicsVector pPos = this._physActor.Position;

+                pos2 = new LLVector3(pPos.X, pPos.Y, pPos.Z);

+            }

             if (this.newPrimFlag)

             {

                 foreach (SimClient client in m_clientThreads.Values)

@@ -137,15 +156,19 @@ namespace OpenSim.world
             {

                 if (this._physActor != null && this.physicsEnabled)

                 {

-                    ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();

-                    terse.RegionData.RegionHandle = m_regionHandle; // FIXME

-                    terse.RegionData.TimeDilation = 64096;

-                    terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];

-                    terse.ObjectData[0] = this.CreateImprovedBlock();

-                    foreach (SimClient client in m_clientThreads.Values)

+                    if (pos2 != this.positionLastFrame)

                     {

-                        client.OutPacket(terse);

+                        ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();

+                        terse.RegionData.RegionHandle = m_regionHandle; // FIXME

+                        terse.RegionData.TimeDilation = 64096;

+                        terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];

+                        terse.ObjectData[0] = this.CreateImprovedBlock();

+                        foreach (SimClient client in m_clientThreads.Values)

+                        {

+                            client.OutPacket(terse);

+                        }

                     }

+                    this.positionLastFrame = pos2;

                 }

             }

 

@@ -487,7 +510,7 @@ namespace OpenSim.world
             this.primData.LocalID = this.localid;

             this.primData.Position = this.position;

             this.primData.Rotation = new LLQuaternion(this.rotation.x, this.rotation.y, this.rotation.z, this.rotation.w);

-            m_world.localStorage.StorePrim(this.primData);

+            this.m_world.localStorage.StorePrim(this.primData);

         }

     }

 

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 0d126e6..3c131b2 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -14,6 +14,7 @@ namespace OpenSim.world
 {

         public class World : ILocalStorageReceiver

     {

+        public object LockPhysicsEngine = new object();

         public Dictionary<libsecondlife.LLUUID, Entity> Entities;

         public float[] LandMap;

         public ScriptEngine Scripts;

@@ -25,19 +26,19 @@ namespace OpenSim.world
         private Random Rand = new Random();

         private uint _primCount = 702000;

         private int storageCount;

-            private Dictionary<uint, SimClient> m_clientThreads;

-            private ulong m_regionHandle;

-            private string m_regionName;

-            private SimConfig m_cfg;

+        private Dictionary<uint, SimClient> m_clientThreads;

+        private ulong m_regionHandle;

+        private string m_regionName;

+        private SimConfig m_cfg;

 

-            public World(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, string regionName, SimConfig cfg)

-        {

+        public World(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, string regionName, SimConfig cfg)

+        {

             m_clientThreads = clientThreads;

             m_regionHandle = regionHandle;

             m_regionName = regionName;

             m_cfg = cfg;

-                

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance");

+

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance");

                 Entities = new Dictionary<libsecondlife.LLUUID, Entity>();

 

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap");

@@ -73,8 +74,11 @@ namespace OpenSim.world
                 {

                         Entities[UUID].addForces();

                 }

-                

-                this.phyScene.Simulate(timeStep);

+

+            lock (this.LockPhysicsEngine)

+            {

+                this.phyScene.Simulate(timeStep);

+            }

                 

                 foreach (libsecondlife.LLUUID UUID in Entities.Keys)

                 {

@@ -118,18 +122,49 @@ namespace OpenSim.world
                         this.localStorage = store;

                         return(store == null);

         }

+

+        public void RegenerateTerrain()

+        {

+            HeightmapGenHills hills = new HeightmapGenHills();

+            this.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);

+            lock (this.LockPhysicsEngine)

+            {

+                this.phyScene.SetTerrain(this.LandMap);

+            }

+            m_cfg.SaveMap(this.LandMap);

+

+            foreach (SimClient client in m_clientThreads.Values)

+            {

+                this.SendLayerData(client);

+            }

+

+            foreach (libsecondlife.LLUUID UUID in Entities.Keys)

+            {

+                Entities[UUID].LandRenegerated();

+            }

+        }

+

+        public void RegenerateTerrain(float[] newMap)

+        {

+

+            this.LandMap = newMap;

+            lock (this.LockPhysicsEngine)

+            {

+                this.phyScene.SetTerrain(this.LandMap);

+            }

+            m_cfg.SaveMap(this.LandMap);

+

+            foreach (SimClient client in m_clientThreads.Values)

+            {

+                this.SendLayerData(client);

+            }

+

+            foreach (libsecondlife.LLUUID UUID in Entities.Keys)

+            {

+                Entities[UUID].LandRenegerated();

+            }

+        }

         

-        public void RegenerateTerrain()

-        {

-                HeightmapGenHills hills = new HeightmapGenHills();

-                this.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);

-                this.phyScene.SetTerrain(this.LandMap);

-                m_cfg.SaveMap(this.LandMap);

-                

-                foreach(SimClient client in m_clientThreads.Values) {

-                        this.SendLayerData(client);

-                }

-        }

         public void LoadPrimsFromStorage()

         {

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");

@@ -143,7 +178,7 @@ namespace OpenSim.world
                         _primCount = prim.LocalID + 1;

                 }

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId "+ prim.LocalID+ " ) from storage");

-                Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);

+            Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);

                 nPrim.CreateFromStorage(prim);

                 this.Entities.Add(nPrim.uuid, nPrim);

         }

@@ -182,27 +217,34 @@ namespace OpenSim.world
                 }

         }

 

-        public void AddViewerAgent(SimClient AgentClient) {

+        public void AddViewerAgent(SimClient AgentClient) 

+        {

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");

-                Avatar NewAvatar = new Avatar(AgentClient, this, m_regionName, m_clientThreads, m_regionHandle );

+            Avatar NewAvatar = new Avatar(AgentClient, this, m_regionName, m_clientThreads, m_regionHandle);

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");

                 NewAvatar.SendRegionHandshake(this);

                 PhysicsVector pVec = new PhysicsVector(NewAvatar.position.X, NewAvatar.position.Y, NewAvatar.position.Z);

-                NewAvatar.PhysActor = this.phyScene.AddAvatar(pVec);

+            lock (this.LockPhysicsEngine)

+            {

+                NewAvatar.PhysActor = this.phyScene.AddAvatar(pVec);

+            }

                 this.Entities.Add(AgentClient.AgentID, NewAvatar);

         }

         

         public void AddNewPrim(ObjectAddPacket addPacket, SimClient AgentClient)

         {

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim");

-            Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this );

+            Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);

                 prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount);

                 PhysicsVector pVec = new PhysicsVector(prim.position.X, prim.position.Y, prim.position.Z);

                 PhysicsVector pSize = new PhysicsVector( 0.255f, 0.255f, 0.255f);

                 if(OpenSim.world.Avatar.PhysicsEngineFlying)

                 {

-                        prim.PhysActor = this.phyScene.AddPrim(pVec, pSize );

+                lock (this.LockPhysicsEngine)

+                {

+                    prim.PhysActor = this.phyScene.AddPrim(pVec, pSize);

+                }

                 }

                 //prim.PhysicsEnabled = true;

                 this.Entities.Add(prim.uuid, prim);

@@ -243,9 +285,9 @@ namespace OpenSim.world
                 }

                 foreach( libsecondlife.LLUUID uuid in DeRezEnts )

                 {

-                        lock (this.Entities)

+                        lock (Entities)

                         {

-                                this.Entities.Remove(uuid);

+                                Entities.Remove(uuid);

                         }

                 }