OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into ubitworkmaster

avinationmerge
UbitUmarov 2014-10-09 00:26:08 +01:00
parent c0a75fcc03 8918c42540
commit fe495874f2
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
OpenSim/Framework/AnimationSet.cs
View File

@ -86,13 +86,43 @@ namespace OpenSim.Framework
}
public int AnimationCount { get; private set; }
private Dictionary<string, UUID> m_animations = new Dictionary<string, UUID>();
private Dictionary<string, KeyValuePair<string, UUID>> m_animations = new Dictionary<string, KeyValuePair<string, UUID>>();
public UUID GetAnimation(string index)
{
KeyValuePair<string, UUID> val;
if (m_animations.TryGetValue(index, out val))
return val.Value;
return UUID.Zero;
}
public string GetAnimationName(string index)
{
KeyValuePair<string, UUID> val;
if (m_animations.TryGetValue(index, out val))
return val.Key;
return String.Empty;
}
public void SetAnimation(string index, string name, UUID anim)
{
if (anim == UUID.Zero)
{
m_animations.Remove(index);
return;
}
m_animations[index] = new KeyValuePair<string, UUID>(name, anim);
}
public AnimationSet(Byte[] data)
{
string assetData = System.Text.Encoding.ASCII.GetString(data);
Console.WriteLine("--------------------");
Console.WriteLine("AnimationSet length {0} bytes", assetData.Length);
Console.WriteLine("Data: {0}", assetData);
Console.WriteLine(assetData);
Console.WriteLine("--------------------");
}
@ -107,8 +137,8 @@ namespace OpenSim.Framework
}
string assetData = String.Format("version 1\ncount {0}\n", m_animations.Count);
foreach (KeyValuePair<string, UUID> kvp in m_animations)
assetData += String.Format("{0} {1}\n", kvp.Key, kvp.Value.ToString());
foreach (KeyValuePair<string, KeyValuePair<string, UUID>> kvp in m_animations)
assetData += String.Format("{0} {1} {2}\n", kvp.Key, kvp.Value.Value.ToString(), kvp.Value.Key);
return System.Text.Encoding.ASCII.GetBytes(assetData);
}
@ -120,9 +150,9 @@ namespace OpenSim.Framework
List<string> badAnims = new List<string>();
bool allOk = true;
foreach (KeyValuePair<string, UUID> kvp in m_animations)
foreach (KeyValuePair<string, KeyValuePair<string, UUID>> kvp in m_animations)
{
if (!val(kvp.Value))
if (!val(kvp.Value.Value))
{
allOk = false;
badAnims.Add(kvp.Key);