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

lludp ObjectAnimation encoding

0.9.1.0-post-fixes
UbitUmarov 2019-03-19 09:44:13 +00:00
parent 71361f61f4
commit a7927e9d7b
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -4641,6 +4641,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
15 // ID (high frequency) 15 // ID (high frequency)
}; };
static private readonly byte[] ObjectAnimationHeader = new byte[] {
Helpers.MSG_RELIABLE,
0, 0, 0, 0, // sequence number
0, // extra
30 // ID (high frequency)
};
private void ProcessEntityUpdates(int maxUpdatesBytes) private void ProcessEntityUpdates(int maxUpdatesBytes)
{ {
if (!IsActive) if (!IsActive)
@ -5084,6 +5091,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
if (sop.Animations == null) if (sop.Animations == null)
continue; continue;
SceneObjectGroup sog = sop.ParentGroup; SceneObjectGroup sog = sop.ParentGroup;
if (sog == null || sog.IsDeleted) if (sog == null || sog.IsDeleted)
continue; continue;
@ -5096,18 +5104,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
int[] seqs = null; int[] seqs = null;
int count = sop.GetAnimations(out ids, out seqs); int count = sop.GetAnimations(out ids, out seqs);
ObjectAnimationPacket ani = (ObjectAnimationPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAnimation); UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint);
ani.Sender = new ObjectAnimationPacket.SenderBlock(); byte[] data = buf.Data;
ani.Sender.ID = sop.UUID;
ani.AnimationList = new ObjectAnimationPacket.AnimationListBlock[count];
for(int i = 0; i< count; i++) //setup header
Buffer.BlockCopy(ObjectAnimationHeader, 0, data , 0, 7);
// sender block
sop.UUID.ToBytes(data, 7); // 23
//animations block
if (count > 255)
count = 255;
data[23] = (byte)count;
int pos = 24;
for(int i = 0; i < count; i++)
{ {
ani.AnimationList[i] = new ObjectAnimationPacket.AnimationListBlock(); ids[i].ToBytes(data, pos); pos += 16;
ani.AnimationList[i].AnimID = ids[i]; Utils.IntToBytesSafepos(seqs[i], data, pos); pos += 4;
ani.AnimationList[i].AnimSequenceID = seqs[i];
} }
OutPacket(ani, ThrottleOutPacketType.Task, true);
buf.DataLength = pos;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task);
} }
} }