From 9949ac2f9f448faaa873b98451c6025d687358a2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Mar 2012 00:10:41 +0000
Subject: refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code
clarity since non-default animations are handled completely separately from
this class
---
.../Framework/Scenes/Animation/AnimationSet.cs | 4 +-
.../Framework/Scenes/Animation/AvatarAnimations.cs | 108 ---------------------
.../Scenes/Animation/DefaultAvatarAnimations.cs | 108 +++++++++++++++++++++
.../Scenes/Animation/ScenePresenceAnimator.cs | 4 +-
.../Shared/Api/Implementation/LSL_Api.cs | 6 +-
5 files changed, 115 insertions(+), 115 deletions(-)
delete mode 100644 OpenSim/Region/Framework/Scenes/Animation/AvatarAnimations.cs
create mode 100644 OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index 240a424..33041e9 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -138,9 +138,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
// "[ANIMATION SET]: Setting default animation {0}, sequence number {1}, object id {2}",
// anim, sequenceNum, objectID);
- if (AvatarAnimations.AnimsUUID.ContainsKey(anim))
+ if (DefaultAvatarAnimations.AnimsUUID.ContainsKey(anim))
{
- return SetDefaultAnimation(AvatarAnimations.AnimsUUID[anim], sequenceNum, objectID);
+ return SetDefaultAnimation(DefaultAvatarAnimations.AnimsUUID[anim], sequenceNum, objectID);
}
return false;
}
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/AvatarAnimations.cs
deleted file mode 100644
index ec928f4..0000000
--- a/OpenSim/Region/Framework/Scenes/Animation/AvatarAnimations.cs
+++ /dev/null
@@ -1,108 +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 OpenSimulator 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.Collections.Generic;
-using System.Reflection;
-using System.Xml;
-using log4net;
-using OpenMetaverse;
-
-namespace OpenSim.Region.Framework.Scenes.Animation
-{
- public class AvatarAnimations
- {
-// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- public static readonly string DefaultAnimationsPath = "data/avataranimations.xml";
-
- public static Dictionary<string, UUID> AnimsUUID = new Dictionary<string, UUID>();
- public static Dictionary<UUID, string> AnimsNames = new Dictionary<UUID, string>();
- public static Dictionary<UUID, string> AnimStateNames = new Dictionary<UUID, string>();
-
- static AvatarAnimations()
- {
- LoadAnimations(DefaultAnimationsPath);
- }
-
- /// <summary>
- /// Load the default SL avatar animations.
- /// </summary>
- /// <returns></returns>
- private static void LoadAnimations(string path)
- {
-// Dictionary<string, UUID> animations = new Dictionary<string, UUID>();
-
- using (XmlTextReader reader = new XmlTextReader(path))
- {
- XmlDocument doc = new XmlDocument();
- doc.Load(reader);
-// if (doc.DocumentElement != null)
-// {
- foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
- {
- if (nod.Attributes["name"] != null)
- {
- string name = nod.Attributes["name"].Value;
- UUID id = (UUID)nod.InnerText;
- string animState = (string)nod.Attributes["state"].Value;
-
- AnimsUUID.Add(name, id);
- AnimsNames.Add(id, name);
- if (animState != "")
- AnimStateNames.Add(id, animState);
-
-// m_log.DebugFormat("[AVATAR ANIMATIONS]: Loaded {0} {1} {2}", id, name, animState);
- }
- }
-// }
- }
-
-// return animations;
- }
-
- /// <summary>
- /// Get the default avatar animation with the given name.
- /// </summary>
- /// <param name="name"></param>
- /// <returns></returns>
- public static UUID GetDefaultAnimation(string name)
- {
-// m_log.DebugFormat(
-// "[AVATAR ANIMATIONS]: Looking for default avatar animation with name {0}", name);
-
- if (AnimsUUID.ContainsKey(name))
- {
-// m_log.DebugFormat(
-// "[AVATAR ANIMATIONS]: Found {0} {1} in GetDefaultAvatarAnimation()", AnimsUUID[name], name);
-
- return AnimsUUID[name];
- }
-
- return UUID.Zero;
- }
- }
-}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
new file mode 100644
index 0000000..c2b0468
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
@@ -0,0 +1,108 @@
+/*
+ * 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 OpenSimulator 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.Collections.Generic;
+using System.Reflection;
+using System.Xml;
+using log4net;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Framework.Scenes.Animation
+{
+ public class DefaultAvatarAnimations
+ {
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ public static readonly string DefaultAnimationsPath = "data/avataranimations.xml";
+
+ public static Dictionary<string, UUID> AnimsUUID = new Dictionary<string, UUID>();
+ public static Dictionary<UUID, string> AnimsNames = new Dictionary<UUID, string>();
+ public static Dictionary<UUID, string> AnimStateNames = new Dictionary<UUID, string>();
+
+ static DefaultAvatarAnimations()
+ {
+ LoadAnimations(DefaultAnimationsPath);
+ }
+
+ /// <summary>
+ /// Load the default SL avatar animations.
+ /// </summary>
+ /// <returns></returns>
+ private static void LoadAnimations(string path)
+ {
+// Dictionary<string, UUID> animations = new Dictionary<string, UUID>();
+
+ using (XmlTextReader reader = new XmlTextReader(path))
+ {
+ XmlDocument doc = new XmlDocument();
+ doc.Load(reader);
+// if (doc.DocumentElement != null)
+// {
+ foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
+ {
+ if (nod.Attributes["name"] != null)
+ {
+ string name = nod.Attributes["name"].Value;
+ UUID id = (UUID)nod.InnerText;
+ string animState = (string)nod.Attributes["state"].Value;
+
+ AnimsUUID.Add(name, id);
+ AnimsNames.Add(id, name);
+ if (animState != "")
+ AnimStateNames.Add(id, animState);
+
+// m_log.DebugFormat("[AVATAR ANIMATIONS]: Loaded {0} {1} {2}", id, name, animState);
+ }
+ }
+// }
+ }
+
+// return animations;
+ }
+
+ /// <summary>
+ /// Get the default avatar animation with the given name.
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
+ public static UUID GetDefaultAnimation(string name)
+ {
+// m_log.DebugFormat(
+// "[AVATAR ANIMATIONS]: Looking for default avatar animation with name {0}", name);
+
+ if (AnimsUUID.ContainsKey(name))
+ {
+// m_log.DebugFormat(
+// "[AVATAR ANIMATIONS]: Found {0} {1} in GetDefaultAvatarAnimation()", AnimsUUID[name], name);
+
+ return AnimsUUID[name];
+ }
+
+ return UUID.Zero;
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 9038ebc..cded9be 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
// XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations
// are referenced with lower case names!
- UUID animID = AvatarAnimations.GetDefaultAnimation(name.ToUpper());
+ UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name.ToUpper());
if (animID == UUID.Zero)
return;
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
// XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations
// are referenced with lower case names!
- UUID animID = AvatarAnimations.GetDefaultAnimation(name);
+ UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name);
if (animID == UUID.Zero)
return;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 27f7c03..d7a629b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4314,7 +4314,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m_host.RegionHandle == presence.RegionHandle)
{
- Dictionary<UUID, string> animationstateNames = AvatarAnimations.AnimStateNames;
+ Dictionary<UUID, string> animationstateNames = DefaultAvatarAnimations.AnimStateNames;
if (presence != null)
{
@@ -5600,7 +5600,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
if (agent.Animator.Animations.DefaultAnimation.AnimID
- == AvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
+ == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
{
flags |= ScriptBaseClass.AGENT_SITTING;
}
@@ -7714,7 +7714,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LSL_Vector lower;
LSL_Vector upper;
if (presence.Animator.Animations.DefaultAnimation.AnimID
- == AvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
+ == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
{
// This is for ground sitting avatars
float height = presence.Appearance.AvatarHeight / 2.66666667f;
--
cgit v1.1