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

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)