diff options
author | Justin Clark-Casey (justincc) | 2011-11-03 22:39:06 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-03 22:39:06 +0000 |
commit | f26fdbd8da89ee35a23886defc13b44bc63b1349 (patch) | |
tree | b788fcc4948ab1fc4d3c20d309b5361d3b2c809b /OpenSim/Tools | |
parent | Move one of the old physics sleeps out into the main bot loop, so leaving out... (diff) | |
download | opensim-SC-f26fdbd8da89ee35a23886defc13b44bc63b1349.zip opensim-SC-f26fdbd8da89ee35a23886defc13b44bc63b1349.tar.gz opensim-SC-f26fdbd8da89ee35a23886defc13b44bc63b1349.tar.bz2 opensim-SC-f26fdbd8da89ee35a23886defc13b44bc63b1349.tar.xz |
Rename PhysicsBot => Bot since it doesn't just exercise physics anymore
Diffstat (limited to 'OpenSim/Tools')
-rw-r--r-- | OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/Bot.cs (renamed from OpenSim/Tools/pCampBot/PhysicsBot.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 12 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs index 00313b8..7084ab4 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | |||
@@ -41,7 +41,7 @@ namespace pCampBot | |||
41 | /// </remarks> | 41 | /// </remarks> |
42 | public class GrabbingBehaviour : IBehaviour | 42 | public class GrabbingBehaviour : IBehaviour |
43 | { | 43 | { |
44 | public void Action(PhysicsBot bot) | 44 | public void Action(Bot bot) |
45 | { | 45 | { |
46 | Dictionary<UUID, Primitive> objects = bot.Objects; | 46 | Dictionary<UUID, Primitive> objects = bot.Objects; |
47 | 47 | ||
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs index bd4a7a2..8d1d1ce 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs | |||
@@ -49,7 +49,7 @@ namespace pCampBot | |||
49 | talkarray = readexcuses(); | 49 | talkarray = readexcuses(); |
50 | } | 50 | } |
51 | 51 | ||
52 | public void Action(PhysicsBot bot) | 52 | public void Action(Bot bot) |
53 | { | 53 | { |
54 | int walkorrun = bot.Random.Next(4); // Randomize between walking and running. The greater this number, | 54 | int walkorrun = bot.Random.Next(4); // Randomize between walking and running. The greater this number, |
55 | // the greater the bot's chances to walk instead of run. | 55 | // the greater the bot's chances to walk instead of run. |
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/Bot.cs index 1b7c9a7..bf01065 100644 --- a/OpenSim/Tools/pCampBot/PhysicsBot.cs +++ b/OpenSim/Tools/pCampBot/Bot.cs | |||
@@ -43,11 +43,11 @@ using Timer = System.Timers.Timer; | |||
43 | 43 | ||
44 | namespace pCampBot | 44 | namespace pCampBot |
45 | { | 45 | { |
46 | public class PhysicsBot | 46 | public class Bot |
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | public delegate void AnEvent(PhysicsBot callbot, EventType someevent); // event delegate for bot events | 50 | public delegate void AnEvent(Bot callbot, EventType someevent); // event delegate for bot events |
51 | 51 | ||
52 | public BotManager BotManager { get; private set; } | 52 | public BotManager BotManager { get; private set; } |
53 | private IConfig startupConfig; // bot config, passed from BotManager | 53 | private IConfig startupConfig; // bot config, passed from BotManager |
@@ -119,7 +119,7 @@ namespace pCampBot | |||
119 | /// <param name="password"></param> | 119 | /// <param name="password"></param> |
120 | /// <param name="loginUri"></param> | 120 | /// <param name="loginUri"></param> |
121 | /// <param name="behaviours"></param> | 121 | /// <param name="behaviours"></param> |
122 | public PhysicsBot( | 122 | public Bot( |
123 | BotManager bm, List<IBehaviour> behaviours, | 123 | BotManager bm, List<IBehaviour> behaviours, |
124 | string firstName, string lastName, string password, string loginUri) | 124 | string firstName, string lastName, string password, string loginUri) |
125 | { | 125 | { |
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index dac6e0e..704770a 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
@@ -49,7 +49,7 @@ namespace pCampBot | |||
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | 50 | ||
51 | protected CommandConsole m_console; | 51 | protected CommandConsole m_console; |
52 | protected List<PhysicsBot> m_lBot; | 52 | protected List<Bot> m_lBot; |
53 | protected Random somthing = new Random(Environment.TickCount); | 53 | protected Random somthing = new Random(Environment.TickCount); |
54 | protected int numbots = 0; | 54 | protected int numbots = 0; |
55 | public IConfig Config { get; private set; } | 55 | public IConfig Config { get; private set; } |
@@ -103,7 +103,7 @@ namespace pCampBot | |||
103 | // "add bots <number>", | 103 | // "add bots <number>", |
104 | // "Add more bots", HandleAddBots); | 104 | // "Add more bots", HandleAddBots); |
105 | 105 | ||
106 | m_lBot = new List<PhysicsBot>(); | 106 | m_lBot = new List<Bot>(); |
107 | } | 107 | } |
108 | 108 | ||
109 | /// <summary> | 109 | /// <summary> |
@@ -175,7 +175,7 @@ namespace pCampBot | |||
175 | int pos, BotManager bm, List<IBehaviour> behaviours, | 175 | int pos, BotManager bm, List<IBehaviour> behaviours, |
176 | string firstName, string lastName, string password, string loginUri) | 176 | string firstName, string lastName, string password, string loginUri) |
177 | { | 177 | { |
178 | PhysicsBot pb = new PhysicsBot(bm, behaviours, firstName, lastName, password, loginUri); | 178 | Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri); |
179 | 179 | ||
180 | pb.OnConnected += handlebotEvent; | 180 | pb.OnConnected += handlebotEvent; |
181 | pb.OnDisconnected += handlebotEvent; | 181 | pb.OnDisconnected += handlebotEvent; |
@@ -194,7 +194,7 @@ namespace pCampBot | |||
194 | /// </summary> | 194 | /// </summary> |
195 | /// <param name="callbot"></param> | 195 | /// <param name="callbot"></param> |
196 | /// <param name="eventt"></param> | 196 | /// <param name="eventt"></param> |
197 | private void handlebotEvent(PhysicsBot callbot, EventType eventt) | 197 | private void handlebotEvent(Bot callbot, EventType eventt) |
198 | { | 198 | { |
199 | switch (eventt) | 199 | switch (eventt) |
200 | { | 200 | { |
@@ -219,7 +219,7 @@ namespace pCampBot | |||
219 | public void doBotShutdown() | 219 | public void doBotShutdown() |
220 | { | 220 | { |
221 | lock (m_lBot) | 221 | lock (m_lBot) |
222 | foreach (PhysicsBot pb in m_lBot) | 222 | foreach (Bot pb in m_lBot) |
223 | pb.shutdown(); | 223 | pb.shutdown(); |
224 | } | 224 | } |
225 | 225 | ||
@@ -245,7 +245,7 @@ namespace pCampBot | |||
245 | 245 | ||
246 | lock (m_lBot) | 246 | lock (m_lBot) |
247 | { | 247 | { |
248 | foreach (PhysicsBot pb in m_lBot) | 248 | foreach (Bot pb in m_lBot) |
249 | { | 249 | { |
250 | MainConsole.Instance.OutputFormat( | 250 | MainConsole.Instance.OutputFormat( |
251 | outputFormat, pb.Name, (pb.IsConnected ? "Connected" : "Disconnected")); | 251 | outputFormat, pb.Name, (pb.IsConnected ? "Connected" : "Disconnected")); |
diff --git a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs index 8a1015d..d4ae0f0 100644 --- a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs | |||
@@ -31,6 +31,6 @@ namespace pCampBot.Interfaces | |||
31 | { | 31 | { |
32 | public interface IBehaviour | 32 | public interface IBehaviour |
33 | { | 33 | { |
34 | void Action(PhysicsBot bot); | 34 | void Action(Bot bot); |
35 | } | 35 | } |
36 | } \ No newline at end of file | 36 | } \ No newline at end of file |