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

Make changes to AnimationSet to allow indexing by names rather than indices. Add some debugging output and prepare for parsing an ascii-based format.

avinationmerge
Melanie Thielker 2014-09-27 02:30:01 +02:00
parent 8c68772624
commit 3ea76e3131
2 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
OpenSim/Framework/AnimationSet.cs
View File

@ -35,53 +35,44 @@ namespace OpenSim.Framework
public class AnimationSet public class AnimationSet
{ {
private readonly int m_maxAnimations = 255; private bool m_parseError = false;
public int AnimationCount { get; private set; } public int AnimationCount { get; private set; }
private Dictionary<int, UUID> m_animations = new Dictionary<int, UUID>(); private Dictionary<string, UUID> m_animations = new Dictionary<string, UUID>();
public AnimationSet(Byte[] data)
public UUID AnimationAt(int index)
{ {
if (m_animations.ContainsKey(index)) string assetData = System.Text.Encoding.ASCII.GetString(data);
return m_animations[index]; Console.WriteLine("--------------------");
return UUID.Zero; Console.WriteLine("AnimationSet length {0} bytes", assetData.Length);
} Console.WriteLine("Data: {0}", assetData);
Console.WriteLine("--------------------");
public void SetAnimation(int index, UUID animation)
{
if (index < 0 || index > m_maxAnimations)
return;
m_animations[index] = animation;
}
public AnimationSet(Byte[] assetData)
{
if (assetData.Length < 2)
throw new System.ArgumentException();
if (assetData[0] != 1) // Only version 1 is supported
throw new System.ArgumentException();
AnimationCount = assetData[1];
if (assetData.Length - 2 != 16 * AnimationCount)
throw new System.ArgumentException();
// TODO: Read anims from blob
} }
public Byte[] ToBytes() public Byte[] ToBytes()
{ {
// TODO: Make blob from anims // If there was an error parsing the input, we give back an
return new Byte[0]; // empty set rather than the original data.
if (m_parseError)
{
string dummy = "version 1\ncount 0\n";
return System.Text.Encoding.ASCII.GetBytes(dummy);
}
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());
return System.Text.Encoding.ASCII.GetBytes(assetData);
} }
public bool Validate(AnimationSetValidator val) public bool Validate(AnimationSetValidator val)
{ {
List<int> badAnims = new List<int>(); if (m_parseError)
return false;
List<string> badAnims = new List<string>();
bool allOk = true; bool allOk = true;
foreach (KeyValuePair<int, UUID> kvp in m_animations) foreach (KeyValuePair<string, UUID> kvp in m_animations)
{ {
if (!val(kvp.Value)) if (!val(kvp.Value))
{ {
@ -90,7 +81,7 @@ namespace OpenSim.Framework
} }
} }
foreach (int idx in badAnims) foreach (string idx in badAnims)
m_animations.Remove(idx); m_animations.Remove(idx);
return allOk; return allOk;

14
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -277,6 +277,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
remoteClient.SendAlertMessage("Script saved"); remoteClient.SendAlertMessage("Script saved");
} }
else if ((CustomInventoryType)item.InvType == CustomInventoryType.AnimationSet)
{
AnimationSet animSet = new AnimationSet(data);
if (!animSet.Validate(x => {
int perms = m_Scene.InventoryService.GetAssetPermissions(remoteClient.AgentId, x);
int required = (int)(PermissionMask.Transfer | PermissionMask.Copy);
if ((perms & required) != required)
return false;
return true;
}))
{
data = animSet.ToBytes();
}
}
AssetBase asset = AssetBase asset =
CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString()); CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString());