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

Some cleanup with foreach

Browse Source
This commit is contained in:
Cinder
2021-07-25 11:10:52 -05:00
parent 8fefc903b3
commit d19333058d
42 changed files with 186 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Programs/examples/TestClient/Commands/Movement/FollowCommand.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenMetaverse;
using OpenMetaverse.Packets;
@@ -23,10 +24,8 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
// Construct the target name from the passed arguments
string target = String.Empty;
for (int ct = 0; ct < args.Length; ct++)
target = target + args[ct] + " ";
target = target.TrimEnd();
string target = args.Aggregate(String.Empty, (current, t) => current + t + " ");
target = target.TrimEnd();
if (target.Length == 0 || target == "off")
{
@@ -48,9 +47,9 @@ namespace OpenMetaverse.TestClient
{
lock (Client.Network.Simulators)
{
for (int i = 0; i < Client.Network.Simulators.Count; i++)
foreach (var sim in Client.Network.Simulators)
{
Avatar target = Client.Network.Simulators[i].ObjectsAvatars.Find(
Avatar target = sim.ObjectsAvatars.Find(
avatar => avatar.Name == name
);
@@ -79,15 +78,15 @@ namespace OpenMetaverse.TestClient
// Find the target position
lock (Client.Network.Simulators)
{
for (int i = 0; i < Client.Network.Simulators.Count; i++)
foreach (var t in Client.Network.Simulators)
{
Avatar targetAv;
if (Client.Network.Simulators[i].ObjectsAvatars.TryGetValue(targetLocalID, out targetAv))
if (t.ObjectsAvatars.TryGetValue(targetLocalID, out targetAv))
{
float distance = 0.0f;
if (Client.Network.Simulators[i] == Client.Network.CurrentSim)
if (t == Client.Network.CurrentSim)
{
distance = Vector3.Distance(targetAv.Position, Client.Self.SimPosition);
}
@@ -99,7 +98,7 @@ namespace OpenMetaverse.TestClient
if (distance > DISTANCE_BUFFER)
{
uint regionX, regionY;
Utils.LongToUInts(Client.Network.Simulators[i].Handle, out regionX, out regionY);
Utils.LongToUInts(t.Handle, out regionX, out regionY);
double xTarget = (double)targetAv.Position.X + (double)regionX;
double yTarget = (double)targetAv.Position.Y + (double)regionY;