aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
diff options
context:
space:
mode:
authorMW2007-07-15 21:10:05 +0000
committerMW2007-07-15 21:10:05 +0000
commitbf2f3ea29ab045cf8fe1e8223adb176e11c14569 (patch)
tree5355aeb3e1dfd6d9cf2aaaf6bc58d7940004b6c8 /OpenSim/Region/Examples/SimpleApp/MyWorld.cs
parent*Added support for the "show" button that highlights objects over the selecte... (diff)
downloadopensim-SC-bf2f3ea29ab045cf8fe1e8223adb176e11c14569.zip
opensim-SC-bf2f3ea29ab045cf8fe1e8223adb176e11c14569.tar.gz
opensim-SC-bf2f3ea29ab045cf8fe1e8223adb176e11c14569.tar.bz2
opensim-SC-bf2f3ea29ab045cf8fe1e8223adb176e11c14569.tar.xz
Hijacked simpleApp again (sorry lbsa71, guess I should create my own simpleApp), to try out a basic test npc character(/class).
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp/MyWorld.cs')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs27
1 files changed, 23 insertions, 4 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 777d4ae..29b255b 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -47,14 +47,15 @@ namespace SimpleApp
47 LLVector3 pos = new LLVector3(128, 128, 128); 47 LLVector3 pos = new LLVector3(128, 128, 128);
48 48
49 client.OnRegionHandShakeReply += SendLayerData; 49 client.OnRegionHandShakeReply += SendLayerData;
50 client.OnChatFromViewer += 50 /*client.OnChatFromViewer +=
51 delegate(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) 51 delegate(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
52 { 52 {
53 // Echo it (so you know what you typed) 53 // Echo it (so you know what you typed)
54 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID); 54 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
55 client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero ); 55 client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero );
56 }; 56 };
57 57 */
58 client.OnChatFromViewer += this.SimChat;
58 client.OnAddPrim += AddNewPrim; 59 client.OnAddPrim += AddNewPrim;
59 client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition; 60 client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition;
60 client.OnRequestMapBlocks += this.RequestMapBlocks; 61 client.OnRequestMapBlocks += this.RequestMapBlocks;
@@ -70,9 +71,27 @@ namespace SimpleApp
70 client.SendRegionHandshake(m_regInfo); 71 client.SendRegionHandshake(m_regInfo);
71 72
72 ScenePresence avatar = CreateAndAddScenePresence(client); 73 ScenePresence avatar = CreateAndAddScenePresence(client);
73 avatar.Pos = new LLVector3(128, 128, 26); 74 avatar.Pos = new LLVector3(128, 128, 26);
74 } 75 }
75 76
77 public override void Update()
78 {
79 foreach (LLUUID UUID in Entities.Keys)
80 {
81 Entities[UUID].updateMovement();
82 }
83
84 lock (this.m_syncRoot)
85 {
86 this.phyScene.Simulate(timeStep);
87 }
88
89 foreach (LLUUID UUID in Entities.Keys)
90 {
91 Entities[UUID].update();
92 }
93 }
94
76 #endregion 95 #endregion
77 } 96 }
78} 97}