Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LIBOMV-686 Cleanup of ObjectManager to make event classes less confusing, removes ObjectUpdated event as it duplicates the TerseObjectUpdate event.

Browse Source 
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3176 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
Jim Radford
2009-10-27 07:01:48 +00:00
parent 17468b5f76
commit f8f36cb5b1
10 changed files with 246 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Programs/examples/TestClient/Commands/Agent/BotsCommand.cs
View File

@@ -14,14 +14,13 @@ namespace OpenMetaverse.TestClient
{
Name = "bots";
Description = "detects avatars that appear to be bots.";
Category = CommandCategory.Other;
Category = CommandCategory.Other;
testClient.Avatars.ViewerEffect += new EventHandler<ViewerEffectEventArgs>(Avatars_ViewerEffect);
testClient.Avatars.ViewerEffectLookAt += new EventHandler<ViewerEffectLookAtEventArgs>(Avatars_ViewerEffectLookAt);
testClient.Avatars.ViewerEffectPointAt += new EventHandler<ViewerEffectPointAtEventArgs>(Avatars_ViewerEffectPointAt);
}
void Avatars_ViewerEffectPointAt(object sender, ViewerEffectPointAtEventArgs e)
private void Avatars_ViewerEffectPointAt(object sender, ViewerEffectPointAtEventArgs e)
{
lock (m_AgentList)
{
@@ -32,7 +31,7 @@ namespace OpenMetaverse.TestClient
}
}
void Avatars_ViewerEffectLookAt(object sender, ViewerEffectLookAtEventArgs e)
private void Avatars_ViewerEffectLookAt(object sender, ViewerEffectLookAtEventArgs e)
{
lock (m_AgentList)
{
@@ -43,7 +42,7 @@ namespace OpenMetaverse.TestClient
}
}
void Avatars_ViewerEffect(object sender, ViewerEffectEventArgs e)
private void Avatars_ViewerEffect(object sender, ViewerEffectEventArgs e)
{
lock (m_AgentList)
{

21
Programs/examples/TestClient/Commands/Movement/FlyToCommand.cs
View File

@@ -13,13 +13,12 @@ namespace OpenMetaverse.TestClient.Commands.Movement
int startTime = 0;
int duration = 10000;
public FlyToCommand(TestClient client)
public FlyToCommand(TestClient Client)
{
Name = "FlyTo";
Description = "Fly the avatar toward the specified position for a maximum of seconds. Usage: FlyTo x y z [seconds]";
Category = CommandCategory.Movement;
client.Objects.ObjectUpdated += Objects_OnObjectUpdated;
Client.Objects.TerseObjectUpdate += Objects_OnObjectUpdated;
}
public override string Execute(string[] args, UUID fromAgentID)
@@ -45,16 +44,11 @@ namespace OpenMetaverse.TestClient.Commands.Movement
Client.Self.Movement.AtNeg = false;
ZMovement();
Client.Self.Movement.TurnToward(target);
//System.Threading.Thread.Sleep(100);
//XYMovement();
//ZMovement();
//Client.Self.Movement.SendUpdate(false);
return string.Format("flying to {0} in {1} seconds", target.ToString(), duration / 1000);
}
private void Objects_OnObjectUpdated(object sender, ObjectUpdatedEventArgs e)
private void Objects_OnObjectUpdated(object sender, TerseObjectUpdateEventArgs e)
{
if (startTime == 0) return;
if (e.Update.LocalID == Client.Self.LocalID)
@@ -98,14 +92,7 @@ namespace OpenMetaverse.TestClient.Commands.Movement
if (diff >= 10.0)
{
Client.Self.Movement.AtPos = true;
// Client.Self.Movement.AtNeg = false;
//if (Math.Abs(diff - olddiff) > 1.5) {
// Client.Self.Movement.AtPos = diff < olddiff;
// Client.Self.Movement.AtNeg = diff > olddiff;
//} else if (!Client.Self.Movement.AtPos && !Client.Self.Movement.AtNeg) {
// Client.Self.Movement.AtPos = true;
// Client.Self.Movement.AtNeg = false;
//}
res = true;
}
else if (diff >= 2 && vel < 5)

2
Programs/examples/TestClient/Commands/Prims/ImportCommand.cs
View File

@@ -47,7 +47,7 @@ namespace OpenMetaverse.TestClient
Description = "Import prims from an exported xml file. Usage: import inputfile.xml [usegroup]";
Category = CommandCategory.Objects;
testClient.Objects.NewPrim += Objects_OnNewPrim;
testClient.Objects.ObjectUpdate += Objects_OnNewPrim;
}
public override string Execute(string[] args, UUID fromAgentID)

4
Programs/examples/TestClient/Commands/Prims/PrimInfoCommand.cs
View File

@@ -28,6 +28,10 @@ namespace OpenMetaverse.TestClient
if (target != null)
{
if (target.Text != String.Empty)
{
Logger.Log("Text: " + target.Text, Helpers.LogLevel.Info, Client);
}
if(target.Light != null)
Logger.Log("Light: " + target.Light.ToString(), Helpers.LogLevel.Info, Client);

6
Programs/examples/TestClient/Commands/Prims/TexturesCommand.cs
View File

@@ -18,8 +18,8 @@ namespace OpenMetaverse.TestClient
Description = "Turns automatic texture downloading on or off. Usage: textures [on/off]";
Category = CommandCategory.Objects;
testClient.Objects.NewPrim += new EventHandler<PrimEventArgs>(Objects_OnNewPrim);
testClient.Objects.NewAvatar += Objects_OnNewAvatar;
testClient.Objects.ObjectUpdate += new EventHandler<PrimEventArgs>(Objects_OnNewPrim);
testClient.Objects.AvatarUpdate += Objects_OnNewAvatar;
}
public override string Execute(string[] args, UUID fromAgentID)
@@ -43,7 +43,7 @@ namespace OpenMetaverse.TestClient
}
}
void Objects_OnNewAvatar(object sender, NewAvatarEventArgs e)
void Objects_OnNewAvatar(object sender, AvatarUpdateEventArgs e)
{
Avatar avatar = e.Avatar;
if (enabled)