diff --git a/OpenSim/Region/Framework/Scenes/Animation.cs b/OpenSim/Framework/Animation.cs
similarity index 96%
rename from OpenSim/Region/Framework/Scenes/Animation.cs
rename to OpenSim/Framework/Animation.cs
index 1e697bde09..cda83871a5 100644
--- a/OpenSim/Region/Framework/Scenes/Animation.cs
+++ b/OpenSim/Framework/Animation.cs
@@ -1,94 +1,94 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-
-namespace OpenSim.Region.Framework.Scenes
-{
- [Serializable]
- public class Animation
- {
- private UUID animID;
- public UUID AnimID
- {
- get { return animID; }
- set { animID = value; }
- }
-
- private int sequenceNum;
- public int SequenceNum
- {
- get { return sequenceNum; }
- set { sequenceNum = value; }
- }
-
- private UUID objectID;
- public UUID ObjectID
- {
- get { return objectID; }
- set { objectID = value; }
- }
-
- public Animation()
- {
- }
-
- public Animation(UUID animID, int sequenceNum, UUID objectID)
- {
- this.animID = animID;
- this.sequenceNum = sequenceNum;
- this.objectID = objectID;
- }
-
- public Animation(OSDMap args)
- {
- UnpackUpdateMessage(args);
- }
-
- public OSDMap PackUpdateMessage()
- {
- OSDMap anim = new OSDMap();
- anim["animation"] = OSD.FromUUID(animID);
- anim["object_id"] = OSD.FromUUID(objectID);
- anim["seq_num"] = OSD.FromInteger(sequenceNum);
- return anim;
- }
-
- public void UnpackUpdateMessage(OSDMap args)
- {
- if (args["animation"] != null)
- animID = args["animation"].AsUUID();
- if (args["object_id"] != null)
- objectID = args["object_id"].AsUUID();
- if (args["seq_num"] != null)
- sequenceNum = args["seq_num"].AsInteger();
- }
-
- }
-}
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Framework
+{
+ [Serializable]
+ public class Animation
+ {
+ private UUID animID;
+ public UUID AnimID
+ {
+ get { return animID; }
+ set { animID = value; }
+ }
+
+ private int sequenceNum;
+ public int SequenceNum
+ {
+ get { return sequenceNum; }
+ set { sequenceNum = value; }
+ }
+
+ private UUID objectID;
+ public UUID ObjectID
+ {
+ get { return objectID; }
+ set { objectID = value; }
+ }
+
+ public Animation()
+ {
+ }
+
+ public Animation(UUID animID, int sequenceNum, UUID objectID)
+ {
+ this.animID = animID;
+ this.sequenceNum = sequenceNum;
+ this.objectID = objectID;
+ }
+
+ public Animation(OSDMap args)
+ {
+ UnpackUpdateMessage(args);
+ }
+
+ public OSDMap PackUpdateMessage()
+ {
+ OSDMap anim = new OSDMap();
+ anim["animation"] = OSD.FromUUID(animID);
+ anim["object_id"] = OSD.FromUUID(objectID);
+ anim["seq_num"] = OSD.FromInteger(sequenceNum);
+ return anim;
+ }
+
+ public void UnpackUpdateMessage(OSDMap args)
+ {
+ if (args["animation"] != null)
+ animID = args["animation"].AsUUID();
+ if (args["object_id"] != null)
+ objectID = args["object_id"].AsUUID();
+ if (args["seq_num"] != null)
+ sequenceNum = args["seq_num"].AsInteger();
+ }
+
+ }
+}
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 0060fefef8..6730b9502e 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -53,44 +53,14 @@ namespace OpenSim.Framework
public ChildAgentDataUpdate()
{
}
-
- //public ChildAgentDataUpdate(AgentData agent)
- //{
- // ActiveGroupID = agent.ActiveGroupID.Guid;
- // AgentID = agent.AgentID.Guid;
- // alwaysrun = agent.AlwaysRun;
- // AVHeight = agent.Size.Z;
- // cameraPosition = new sLLVector3(agent.Center);
- // drawdistance = agent.Far;
- // godlevel = (float)agent.GodLevel;
- // if (agent.Groups.Length > 0)
- // GroupAccess = (uint)agent.Groups[0].GroupPowers;
- // Position = new sLLVector3(agent.Position);
- // regionHandle = agent.RegionHandle;
- // throttles = agent.Throttles;
- // Velocity = new sLLVector3(agent.Velocity);
- //}
-
- //public ChildAgentDataUpdate(AgentPosition agent)
- //{
- // AgentID = agent.AgentID.Guid;
- // AVHeight = agent.Size.Z;
- // cameraPosition = new sLLVector3(agent.Center);
- // drawdistance = agent.Far;
- // Position = new sLLVector3(agent.Position);
- // regionHandle = agent.RegionHandle;
- // throttles = agent.Throttles;
- // Velocity = new sLLVector3(agent.Velocity);
- //}
}
- /*
public interface IAgentData
{
UUID AgentID { get; set; }
- OSDMap PackUpdateMessage();
- void UnpackUpdateMessage(OSDMap map);
+ OSDMap Pack();
+ void Unpack(OSDMap map);
}
///
@@ -123,7 +93,7 @@ namespace OpenSim.Framework
public byte[] Throttles;
- public OSDMap PackUpdateMessage()
+ public OSDMap Pack()
{
OSDMap args = new OSDMap();
args["message_type"] = OSD.FromString("AgentPosition");
@@ -150,7 +120,7 @@ namespace OpenSim.Framework
return args;
}
- public void UnpackUpdateMessage(OSDMap args)
+ public void Unpack(OSDMap args)
{
if (args.ContainsKey("region_handle"))
UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle);
@@ -256,33 +226,6 @@ namespace OpenSim.Framework
}
}
- public class AgentAnimationData
- {
- public UUID Animation;
- public UUID ObjectID;
-
- public AgentAnimationData(OSDMap args)
- {
- UnpackUpdateMessage(args);
- }
-
- public OSDMap PackUpdateMessage()
- {
- OSDMap anim = new OSDMap();
- anim["animation"] = OSD.FromUUID(Animation);
- anim["object_id"] = OSD.FromUUID(ObjectID);
- return anim;
- }
-
- public void UnpackUpdateMessage(OSDMap args)
- {
- if (args["animation"] != null)
- Animation = args["animation"].AsUUID();
- if (args["object_id"] != null)
- ObjectID = args["object_id"].AsUUID();
- }
- }
-
public class AgentData : IAgentData
{
private UUID m_id;
@@ -318,20 +261,21 @@ namespace OpenSim.Framework
public bool AlwaysRun;
public UUID PreyAgent;
public Byte AgentAccess;
- public UUID[] AgentTextures;
public UUID ActiveGroupID;
public AgentGroupData[] Groups;
- public AgentAnimationData[] Anims;
+ public Animation[] Anims;
public UUID GranterID;
- public Dictionary NVPairs;
+ // Appearance
+ public byte[] AgentTextures;
public byte[] VisualParams;
+ public UUID[] Wearables;
public string CallbackURI;
- public OSDMap PackUpdateMessage()
+ public virtual OSDMap Pack()
{
OSDMap args = new OSDMap();
args["message_type"] = OSD.FromString("AgentData");
@@ -367,14 +311,6 @@ namespace OpenSim.Framework
args["prey_agent"] = OSD.FromUUID(PreyAgent);
args["agent_access"] = OSD.FromString(AgentAccess.ToString());
- if ((AgentTextures != null) && (AgentTextures.Length > 0))
- {
- OSDArray textures = new OSDArray(AgentTextures.Length);
- foreach (UUID uuid in AgentTextures)
- textures.Add(OSD.FromUUID(uuid));
- args["agent_textures"] = textures;
- }
-
args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
if ((Groups != null) && (Groups.Length > 0))
@@ -388,15 +324,34 @@ namespace OpenSim.Framework
if ((Anims != null) && (Anims.Length > 0))
{
OSDArray anims = new OSDArray(Anims.Length);
- foreach (AgentAnimationData aanim in Anims)
+ foreach (Animation aanim in Anims)
anims.Add(aanim.PackUpdateMessage());
args["animations"] = anims;
}
+ //if ((AgentTextures != null) && (AgentTextures.Length > 0))
+ //{
+ // OSDArray textures = new OSDArray(AgentTextures.Length);
+ // foreach (UUID uuid in AgentTextures)
+ // textures.Add(OSD.FromUUID(uuid));
+ // args["agent_textures"] = textures;
+ //}
+
+ if ((AgentTextures != null) && (AgentTextures.Length > 0))
+ args["texture_entry"] = OSD.FromBinary(AgentTextures);
+
if ((VisualParams != null) && (VisualParams.Length > 0))
args["visual_params"] = OSD.FromBinary(VisualParams);
- // Last few fields are still missing: granter and NVPais
+ // We might not pass this in all cases...
+ if ((Wearables != null) && (Wearables.Length > 0))
+ {
+ OSDArray wears = new OSDArray(Wearables.Length);
+ foreach (UUID uuid in Wearables)
+ wears.Add(OSD.FromUUID(uuid));
+ args["wearables"] = wears;
+ }
+
if ((CallbackURI != null) && (!CallbackURI.Equals("")))
args["callback_uri"] = OSD.FromString(CallbackURI);
@@ -409,7 +364,7 @@ namespace OpenSim.Framework
/// Avoiding reflection makes it painful to write, but that's the price!
///
///
- public void UnpackUpdateMessage(OSDMap args)
+ public virtual void Unpack(OSDMap args)
{
if (args.ContainsKey("region_handle"))
UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle);
@@ -483,15 +438,6 @@ namespace OpenSim.Framework
if (args["agent_access"] != null)
Byte.TryParse(args["agent_access"].AsString(), out AgentAccess);
- if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
- {
- OSDArray textures = (OSDArray)(args["agent_textures"]);
- AgentTextures = new UUID[textures.Count];
- int i = 0;
- foreach (OSD o in textures)
- AgentTextures[i++] = o.AsUUID();
- }
-
if (args["active_group_id"] != null)
ActiveGroupID = args["active_group_id"].AsUUID();
@@ -512,20 +458,41 @@ namespace OpenSim.Framework
if ((args["animations"] != null) && (args["animations"]).Type == OSDType.Array)
{
OSDArray anims = (OSDArray)(args["animations"]);
- Anims = new AgentAnimationData[anims.Count];
+ Anims = new Animation[anims.Count];
int i = 0;
foreach (OSD o in anims)
{
if (o.Type == OSDType.Map)
{
- Anims[i++] = new AgentAnimationData((OSDMap)o);
+ Anims[i++] = new Animation((OSDMap)o);
}
}
}
+ //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
+ //{
+ // OSDArray textures = (OSDArray)(args["agent_textures"]);
+ // AgentTextures = new UUID[textures.Count];
+ // int i = 0;
+ // foreach (OSD o in textures)
+ // AgentTextures[i++] = o.AsUUID();
+ //}
+
+ if (args["texture_entry"] != null)
+ AgentTextures = args["texture_entry"].AsBinary();
+
if (args["visual_params"] != null)
VisualParams = args["visual_params"].AsBinary();
+ if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array)
+ {
+ OSDArray wears = (OSDArray)(args["wearables"]);
+ Wearables = new UUID[wears.Count];
+ int i = 0;
+ foreach (OSD o in wears)
+ Wearables[i++] = o.AsUUID();
+ }
+
if (args["callback_uri"] != null)
CallbackURI = args["callback_uri"].AsString();
}
@@ -539,49 +506,25 @@ namespace OpenSim.Framework
//UnpackUpdateMessage(hash);
}
- ///
- /// Soon to be decommissioned
- ///
- ///
- public void CopyFrom(ChildAgentDataUpdate cAgent)
- {
- ActiveGroupID = new UUID(cAgent.ActiveGroupID);
-
- AgentID = new UUID(cAgent.AgentID);
-
- AlwaysRun = cAgent.alwaysrun;
-
- // next: ???
- Size = new Vector3();
- Size.Z = cAgent.AVHeight;
-
- Center = new Vector3(cAgent.cameraPosition.x, cAgent.cameraPosition.y, cAgent.cameraPosition.z);
-
- Far = cAgent.drawdistance;
-
- // downcasting ???
- GodLevel = (byte)(cAgent.godlevel);
-
- Groups = new AgentGroupData[1];
- Groups[0] = new AgentGroupData(new UUID(cAgent.ActiveGroupID), cAgent.GroupAccess, true);
-
- Position = new Vector3(cAgent.Position.x, cAgent.Position.y, cAgent.Position.z);
-
- RegionHandle = cAgent.regionHandle;
-
- Throttles = cAgent.throttles;
-
- Velocity = new Vector3(cAgent.Velocity.x, cAgent.Velocity.y, cAgent.Velocity.z);
- }
-
public void Dump()
{
- m_log.Info("------------ AgentData ------------");
- m_log.Info("UUID: " + AgentID);
- m_log.Info("Region: " + RegionHandle);
- m_log.Info("Position: " + Position);
+ System.Console.WriteLine("------------ AgentData ------------");
+ System.Console.WriteLine("UUID: " + AgentID);
+ System.Console.WriteLine("Region: " + RegionHandle);
+ System.Console.WriteLine("Position: " + Position);
}
}
- */
+ public class CompleteAgentData : AgentData
+ {
+ public override OSDMap Pack()
+ {
+ return base.Pack();
+ }
+
+ public override void Unpack(OSDMap map)
+ {
+ base.Unpack(map);
+ }
+ }
}
diff --git a/OpenSim/Region/Framework/Scenes/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
index 8e259544ff..b9521d6057 100644
--- a/OpenSim/Region/Framework/Scenes/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
@@ -27,6 +27,7 @@
using System;
using System.Collections.Generic;
+using OpenSim.Framework;
using OpenMetaverse;
namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs b/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
deleted file mode 100644
index 7e6e52a442..0000000000
--- a/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using OpenSim.Framework;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using log4net;
-using System.Reflection;
-
-namespace OpenSim.Region.Framework.Scenes
-{
- public interface IAgentData
- {
- UUID AgentID { get; set; }
-
- OSDMap Pack();
- void Unpack(OSDMap map);
- }
-
- ///
- /// Replacement for ChildAgentDataUpdate. Used over RESTComms and LocalComms.
- ///
- public class AgentPosition : IAgentData
- {
- private UUID m_id;
- public UUID AgentID
- {
- get { return m_id; }
- set { m_id = value; }
- }
-
- public ulong RegionHandle;
- public uint CircuitCode;
- public UUID SessionID;
-
- public float Far;
- public Vector3 Position;
- public Vector3 Velocity;
- public Vector3 Center;
- public Vector3 Size;
- public Vector3 AtAxis;
- public Vector3 LeftAxis;
- public Vector3 UpAxis;
- public bool ChangedGrid;
-
- // This probably shouldn't be here
- public byte[] Throttles;
-
-
- public OSDMap Pack()
- {
- OSDMap args = new OSDMap();
- args["message_type"] = OSD.FromString("AgentPosition");
-
- args["region_handle"] = OSD.FromString(RegionHandle.ToString());
- args["circuit_code"] = OSD.FromString(CircuitCode.ToString());
- args["agent_uuid"] = OSD.FromUUID(AgentID);
- args["session_uuid"] = OSD.FromUUID(SessionID);
-
- args["position"] = OSD.FromString(Position.ToString());
- args["velocity"] = OSD.FromString(Velocity.ToString());
- args["center"] = OSD.FromString(Center.ToString());
- args["size"] = OSD.FromString(Size.ToString());
- args["at_axis"] = OSD.FromString(AtAxis.ToString());
- args["left_axis"] = OSD.FromString(LeftAxis.ToString());
- args["up_axis"] = OSD.FromString(UpAxis.ToString());
-
- args["far"] = OSD.FromReal(Far);
- args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
-
- if ((Throttles != null) && (Throttles.Length > 0))
- args["throttles"] = OSD.FromBinary(Throttles);
-
- return args;
- }
-
- public void Unpack(OSDMap args)
- {
- if (args.ContainsKey("region_handle"))
- UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle);
-
- if (args["circuit_code"] != null)
- UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode);
-
- if (args["agent_uuid"] != null)
- AgentID = args["agent_uuid"].AsUUID();
-
- if (args["session_uuid"] != null)
- SessionID = args["session_uuid"].AsUUID();
-
- if (args["position"] != null)
- Vector3.TryParse(args["position"].AsString(), out Position);
-
- if (args["velocity"] != null)
- Vector3.TryParse(args["velocity"].AsString(), out Velocity);
-
- if (args["center"] != null)
- Vector3.TryParse(args["center"].AsString(), out Center);
-
- if (args["size"] != null)
- Vector3.TryParse(args["size"].AsString(), out Size);
-
- if (args["at_axis"] != null)
- Vector3.TryParse(args["at_axis"].AsString(), out AtAxis);
-
- if (args["left_axis"] != null)
- Vector3.TryParse(args["left_axis"].AsString(), out AtAxis);
-
- if (args["up_axis"] != null)
- Vector3.TryParse(args["up_axis"].AsString(), out AtAxis);
-
- if (args["changed_grid"] != null)
- ChangedGrid = args["changed_grid"].AsBoolean();
-
- if (args["far"] != null)
- Far = (float)(args["far"].AsReal());
-
- if (args["throttles"] != null)
- Throttles = args["throttles"].AsBinary();
- }
-
- ///
- /// Soon to be decommissioned
- ///
- ///
- public void CopyFrom(ChildAgentDataUpdate cAgent)
- {
- AgentID = new UUID(cAgent.AgentID);
-
- // next: ???
- Size = new Vector3();
- Size.Z = cAgent.AVHeight;
-
- Center = new Vector3(cAgent.cameraPosition.x, cAgent.cameraPosition.y, cAgent.cameraPosition.z);
- Far = cAgent.drawdistance;
- Position = new Vector3(cAgent.Position.x, cAgent.Position.y, cAgent.Position.z);
- RegionHandle = cAgent.regionHandle;
- Throttles = cAgent.throttles;
- Velocity = new Vector3(cAgent.Velocity.x, cAgent.Velocity.y, cAgent.Velocity.z);
- }
-
- }
-
- public class AgentGroupData
- {
- public UUID GroupID;
- public ulong GroupPowers;
- public bool AcceptNotices;
-
- public AgentGroupData(UUID id, ulong powers, bool notices)
- {
- GroupID = id;
- GroupPowers = powers;
- AcceptNotices = notices;
- }
-
- public AgentGroupData(OSDMap args)
- {
- UnpackUpdateMessage(args);
- }
-
- public OSDMap PackUpdateMessage()
- {
- OSDMap groupdata = new OSDMap();
- groupdata["group_id"] = OSD.FromUUID(GroupID);
- groupdata["group_powers"] = OSD.FromString(GroupPowers.ToString());
- groupdata["accept_notices"] = OSD.FromBoolean(AcceptNotices);
-
- return groupdata;
- }
-
- public void UnpackUpdateMessage(OSDMap args)
- {
- if (args["group_id"] != null)
- GroupID = args["group_id"].AsUUID();
- if (args["group_powers"] != null)
- UInt64.TryParse((string)args["group_powers"].AsString(), out GroupPowers);
- if (args["accept_notices"] != null)
- AcceptNotices = args["accept_notices"].AsBoolean();
- }
- }
-
- public class AgentData : IAgentData
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private UUID m_id;
- public UUID AgentID
- {
- get { return m_id; }
- set { m_id = value; }
- }
- public ulong RegionHandle;
- public uint CircuitCode;
- public UUID SessionID;
-
- public Vector3 Position;
- public Vector3 Velocity;
- public Vector3 Center;
- public Vector3 Size;
- public Vector3 AtAxis;
- public Vector3 LeftAxis;
- public Vector3 UpAxis;
- public bool ChangedGrid;
-
- public float Far;
- public float Aspect;
- //public int[] Throttles;
- public byte[] Throttles;
-
- public uint LocomotionState;
- public Quaternion HeadRotation;
- public Quaternion BodyRotation;
- public uint ControlFlags;
- public float EnergyLevel;
- public Byte GodLevel;
- public bool AlwaysRun;
- public UUID PreyAgent;
- public Byte AgentAccess;
- public UUID ActiveGroupID;
-
- public AgentGroupData[] Groups;
- public Animation[] Anims;
-
- public UUID GranterID;
-
- // Appearance
- public byte[] AgentTextures;
- public byte[] VisualParams;
- public UUID[] Wearables;
-
- public string CallbackURI;
-
- public virtual OSDMap Pack()
- {
- OSDMap args = new OSDMap();
- args["message_type"] = OSD.FromString("AgentData");
-
- args["region_handle"] = OSD.FromString(RegionHandle.ToString());
- args["circuit_code"] = OSD.FromString(CircuitCode.ToString());
- args["agent_uuid"] = OSD.FromUUID(AgentID);
- args["session_uuid"] = OSD.FromUUID(SessionID);
-
- args["position"] = OSD.FromString(Position.ToString());
- args["velocity"] = OSD.FromString(Velocity.ToString());
- args["center"] = OSD.FromString(Center.ToString());
- args["size"] = OSD.FromString(Size.ToString());
- args["at_axis"] = OSD.FromString(AtAxis.ToString());
- args["left_axis"] = OSD.FromString(LeftAxis.ToString());
- args["up_axis"] = OSD.FromString(UpAxis.ToString());
-
- args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
- args["far"] = OSD.FromReal(Far);
- args["aspect"] = OSD.FromReal(Aspect);
-
- if ((Throttles != null) && (Throttles.Length > 0))
- args["throttles"] = OSD.FromBinary(Throttles);
-
- args["locomotion_state"] = OSD.FromString(LocomotionState.ToString());
- args["head_rotation"] = OSD.FromString(HeadRotation.ToString());
- args["body_rotation"] = OSD.FromString(BodyRotation.ToString());
- args["control_flags"] = OSD.FromString(ControlFlags.ToString());
-
- args["energy_level"] = OSD.FromReal(EnergyLevel);
- args["god_level"] = OSD.FromString(GodLevel.ToString());
- args["always_run"] = OSD.FromBoolean(AlwaysRun);
- args["prey_agent"] = OSD.FromUUID(PreyAgent);
- args["agent_access"] = OSD.FromString(AgentAccess.ToString());
-
- args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
-
- if ((Groups != null) && (Groups.Length > 0))
- {
- OSDArray groups = new OSDArray(Groups.Length);
- foreach (AgentGroupData agd in Groups)
- groups.Add(agd.PackUpdateMessage());
- args["groups"] = groups;
- }
-
- if ((Anims != null) && (Anims.Length > 0))
- {
- OSDArray anims = new OSDArray(Anims.Length);
- foreach (Animation aanim in Anims)
- anims.Add(aanim.PackUpdateMessage());
- args["animations"] = anims;
- }
-
- //if ((AgentTextures != null) && (AgentTextures.Length > 0))
- //{
- // OSDArray textures = new OSDArray(AgentTextures.Length);
- // foreach (UUID uuid in AgentTextures)
- // textures.Add(OSD.FromUUID(uuid));
- // args["agent_textures"] = textures;
- //}
-
- if ((AgentTextures != null) && (AgentTextures.Length > 0))
- args["texture_entry"] = OSD.FromBinary(AgentTextures);
-
- if ((VisualParams != null) && (VisualParams.Length > 0))
- args["visual_params"] = OSD.FromBinary(VisualParams);
-
- // We might not pass this in all cases...
- if ((Wearables != null) && (Wearables.Length > 0))
- {
- OSDArray wears = new OSDArray(Wearables.Length);
- foreach (UUID uuid in Wearables)
- wears.Add(OSD.FromUUID(uuid));
- args["wearables"] = wears;
- }
-
-
- if ((CallbackURI != null) && (!CallbackURI.Equals("")))
- args["callback_uri"] = OSD.FromString(CallbackURI);
-
- return args;
- }
-
- ///
- /// Deserialization of agent data.
- /// Avoiding reflection makes it painful to write, but that's the price!
- ///
- ///
- public virtual void Unpack(OSDMap args)
- {
- if (args.ContainsKey("region_handle"))
- UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle);
-
- if (args["circuit_code"] != null)
- UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode);
-
- if (args["agent_uuid"] != null)
- AgentID = args["agent_uuid"].AsUUID();
-
- if (args["session_uuid"] != null)
- SessionID = args["session_uuid"].AsUUID();
-
- if (args["position"] != null)
- Vector3.TryParse(args["position"].AsString(), out Position);
-
- if (args["velocity"] != null)
- Vector3.TryParse(args["velocity"].AsString(), out Velocity);
-
- if (args["center"] != null)
- Vector3.TryParse(args["center"].AsString(), out Center);
-
- if (args["size"] != null)
- Vector3.TryParse(args["size"].AsString(), out Size);
-
- if (args["at_axis"] != null)
- Vector3.TryParse(args["at_axis"].AsString(), out AtAxis);
-
- if (args["left_axis"] != null)
- Vector3.TryParse(args["left_axis"].AsString(), out AtAxis);
-
- if (args["up_axis"] != null)
- Vector3.TryParse(args["up_axis"].AsString(), out AtAxis);
-
- if (args["changed_grid"] != null)
- ChangedGrid = args["changed_grid"].AsBoolean();
-
- if (args["far"] != null)
- Far = (float)(args["far"].AsReal());
-
- if (args["aspect"] != null)
- Aspect = (float)args["aspect"].AsReal();
-
- if (args["throttles"] != null)
- Throttles = args["throttles"].AsBinary();
-
- if (args["locomotion_state"] != null)
- UInt32.TryParse(args["locomotion_state"].AsString(), out LocomotionState);
-
- if (args["head_rotation"] != null)
- Quaternion.TryParse(args["head_rotation"].AsString(), out HeadRotation);
-
- if (args["body_rotation"] != null)
- Quaternion.TryParse(args["body_rotation"].AsString(), out BodyRotation);
-
- if (args["control_flags"] != null)
- UInt32.TryParse(args["control_flags"].AsString(), out ControlFlags);
-
- if (args["energy_level"] != null)
- EnergyLevel = (float)(args["energy_level"].AsReal());
-
- if (args["god_level"] != null)
- Byte.TryParse(args["god_level"].AsString(), out GodLevel);
-
- if (args["always_run"] != null)
- AlwaysRun = args["always_run"].AsBoolean();
-
- if (args["prey_agent"] != null)
- PreyAgent = args["prey_agent"].AsUUID();
-
- if (args["agent_access"] != null)
- Byte.TryParse(args["agent_access"].AsString(), out AgentAccess);
-
- if (args["active_group_id"] != null)
- ActiveGroupID = args["active_group_id"].AsUUID();
-
- if ((args["groups"] != null) && (args["groups"]).Type == OSDType.Array)
- {
- OSDArray groups = (OSDArray)(args["groups"]);
- Groups = new AgentGroupData[groups.Count];
- int i = 0;
- foreach (OSD o in groups)
- {
- if (o.Type == OSDType.Map)
- {
- Groups[i++] = new AgentGroupData((OSDMap)o);
- }
- }
- }
-
- if ((args["animations"] != null) && (args["animations"]).Type == OSDType.Array)
- {
- OSDArray anims = (OSDArray)(args["animations"]);
- Anims = new Animation[anims.Count];
- int i = 0;
- foreach (OSD o in anims)
- {
- if (o.Type == OSDType.Map)
- {
- Anims[i++] = new Animation((OSDMap)o);
- }
- }
- }
-
- //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
- //{
- // OSDArray textures = (OSDArray)(args["agent_textures"]);
- // AgentTextures = new UUID[textures.Count];
- // int i = 0;
- // foreach (OSD o in textures)
- // AgentTextures[i++] = o.AsUUID();
- //}
-
- if (args["texture_entry"] != null)
- AgentTextures = args["texture_entry"].AsBinary();
-
- if (args["visual_params"] != null)
- VisualParams = args["visual_params"].AsBinary();
-
- if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array)
- {
- OSDArray wears = (OSDArray)(args["wearables"]);
- Wearables = new UUID[wears.Count];
- int i = 0;
- foreach (OSD o in wears)
- Wearables[i++] = o.AsUUID();
- }
-
- if (args["callback_uri"] != null)
- CallbackURI = args["callback_uri"].AsString();
- }
-
- public AgentData()
- {
- }
-
- public AgentData(Hashtable hash)
- {
- //UnpackUpdateMessage(hash);
- }
-
- public void Dump()
- {
- m_log.Info("------------ AgentData ------------");
- m_log.Info("UUID: " + AgentID);
- m_log.Info("Region: " + RegionHandle);
- m_log.Info("Position: " + Position);
- }
- }
-
- public class CompleteAgentData : AgentData
- {
- public override OSDMap Pack()
- {
- return base.Pack();
- }
-
- public override void Unpack(OSDMap map)
- {
- base.Unpack(map);
- }
- }
-
-}