From 811d2b69c9c5d07dbb196cd2ee6353916d0b51c5 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sat, 14 Jul 2007 15:33:25 +0000
Subject: * Worked some more on SimpleApp * Removed SceneObject references to
 RegionHandle, ParcelManager, EventManager as they are public on Scene * Moved
 PulseScript behaviour into MySceneObject

---
 OpenSim/Region/Examples/SimpleApp/MyWorld.cs | 61 ++++++----------------------
 1 file changed, 12 insertions(+), 49 deletions(-)

(limited to 'OpenSim/Region/Examples/SimpleApp/MyWorld.cs')

diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index d7a0ab2..d0e3fed 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -8,7 +8,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Region.Caches;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Terrain;
-using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
 
 namespace SimpleApp
 {
@@ -22,22 +22,6 @@ namespace SimpleApp
             m_avatars = new List<Avatar>();
         }
 
-        /*
-        public override void SendLayerData(IClientAPI remoteClient)
-        {
-            float[] map = new float[65536];
-
-            for (int i = 0; i < 65536; i++)
-            {
-                int x = i % 256;
-                int y = i / 256;
-
-                map[i] = 0f;
-            }
-
-            remoteClient.SendLayerData(map);
-        }*/
-
         public override void LoadWorldMap()
         {
             float[] map = new float[65536];
@@ -59,55 +43,34 @@ namespace SimpleApp
         override public void AddNewClient(IClientAPI client, bool child)
         {
             LLVector3 pos = new LLVector3(128, 128, 128);
-
+            
             client.OnRegionHandShakeReply += SendLayerData;
             client.OnChatFromViewer +=
                 delegate(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
-                {
-                    // Echo it (so you know what you typed)
-                    client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
-                    client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero);
-                };
-
+                    {
+                        // Echo it (so you know what you typed)
+                        client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero );
+                    };
+            
             client.OnAddPrim += AddNewPrim;
             client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition;
             client.OnRequestMapBlocks += this.RequestMapBlocks;
             client.OnTeleportLocationRequest += this.RequestTeleportLocation;
             client.OnGrapUpdate += this.MoveObject;
             client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
-
+            
             client.OnCompleteMovementToRegion += delegate()
                  {
-                     client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero);
+                     client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero );
                  };
 
             client.SendRegionHandshake(m_regInfo);
 
             ScenePresence avatar = CreateAndAddScenePresence(client);
-            avatar.Pos = new LLVector3(128, 128, 26);
-        }
-
-        public void CustomStartup()
-        {
-            this.StartTimer();
-
-            ScriptManager.AddPreCompiledScript(new PulseScript());
-
-            PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
-            shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
-            LLVector3 pos1 = new LLVector3(129, 129, 27);
-            AddNewPrim(LLUUID.Random(), pos1, shape);
+            avatar.Pos = new LLVector3(128, 128, 26);        
         }
-
-        public override void Update()
-        {
-            foreach (LLUUID UUID in Entities.Keys)
-            {
-                Entities[UUID].update();
-            }
-            EventManager.TriggerOnFrame();
-        }
-
+        
         #endregion
     }
 }
-- 
cgit v1.1