ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

a few changes on udp zero encoder and part text color

Browse Source
This commit is contained in:
UbitUmarov
2025-06-06 23:27:51 +01:00
parent 1dd9393fff
commit f20e3818af
7 changed files with 98 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,6 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
using PermissionMask = OpenSim.Framework.PermissionMask;
using RegionFlags = OpenMetaverse.RegionFlags;
using System.Linq;
using System.Drawing;
namespace OpenSim.Region.ClientStack.LindenUDP
{
@@ -7545,11 +7544,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
zc.AddShortLimitedUTF8(osUTF8PartText);
//textcolor
Color c = part.Color;
zc.AddByte(c.R);
zc.AddByte(c.G);
zc.AddByte(c.B);
zc.AddByte((byte)(0xff - c.A));
zc.AddColorArgb(part.TextColorArgb());
}
//media url
@@ -8105,11 +8100,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (osUTF8PartText[^1] != 0)
zc.AddZeros(1);
Color c = part.Color;
zc.AddByte(c.R);
zc.AddByte(c.G);
zc.AddByte(c.B);
zc.AddByte((byte)(0xff - c.A));
zc.AddColorArgb(part.TextColorArgb());
}
if (hasmediaurl)
{

23
OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
View File

@@ -144,30 +144,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
UpdateImageInQueue(imgrequest);
imgrequest.RunUpdate();
// J2KImage imgrequest2 = new J2KImage(this);
// imgrequest2.J2KDecoder = m_j2kDecodeModule;
// imgrequest2.AssetService = m_assetCache;
// imgrequest2.AgentID = m_client.AgentId;
// imgrequest2.InventoryAccessModule = m_client.Scene.RequestModuleInterface<IInventoryAccessModule>();
// imgrequest2.DiscardLevel = newRequest.DiscardLevel;
// imgrequest2.StartPacket = Math.Max(1, newRequest.PacketNumber);
// imgrequest2.Priority = newRequest.Priority;
// imgrequest2.TextureID = newRequest.RequestedAssetID;
// imgrequest2.Priority = newRequest.Priority;
//
// //Add this download to the priority queue
// AddImageToQueue(imgrequest2);
//
// imgrequest2.RunUpdate();
}
// else
// {
// m_log.DebugFormat(
// "[LL IMAGE MANAGER]: Ignoring duplicate of existing request for {0} (sequence {1}) from {2} as its request sequence {3} is not greater",
// newRequest.RequestedAssetID, imgrequest.LastSequence, m_client.Name, newRequest.requestSequence);
// }
}
}
else

89
OpenSim/Region/ClientStack/Linden/UDP/LLUDPZeroEncoder.cs
View File

@@ -29,6 +29,7 @@ using System;
using System.Runtime.CompilerServices;
using OpenSim.Framework;
using OpenMetaverse;
using System.Runtime.InteropServices;
namespace OpenSim.Region.ClientStack.LindenUDP
{
@@ -88,10 +89,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public unsafe void AddZeros(int len)
{
zerocount += len;
ref byte dst = ref MemoryMarshal.GetArrayDataReference(m_dest);
while (zerocount > 0xff)
{
m_dest[pos++] = 0x00;
m_dest[pos++] = 0xff;
Unsafe.Add(ref dst, pos) = 0x00;
pos++;
Unsafe.Add(ref dst, pos) = 0xff;
pos++;
zerocount -= 256;
}
}
@@ -101,24 +105,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
if (zerocount > 0)
{
m_dest[pos++] = 0x00;
m_dest[pos++] = (byte)zerocount;
ref byte dst = ref MemoryMarshal.GetArrayDataReference(m_dest);
Unsafe.Add(ref dst, pos) = 0x00;
pos++;
Unsafe.Add(ref dst, pos) = (byte)zerocount;
pos++;
}
return pos;
}
public unsafe void AddBytes(byte[] src, int srclen)
{
ref byte dst = ref MemoryMarshal.GetArrayDataReference(m_dest);
for (int i = 0; i < srclen; ++i)
{
if (src[i] == 0x00)
byte b = src[i];
if (b == 0x00)
{
if (zerocount != 0xff)
zerocount++;
else
{
m_dest[pos++] = 0x00;
m_dest[pos++] = 0xff;
Unsafe.Add(ref dst, pos) = 0x00;
pos++;
Unsafe.Add(ref dst, pos) = 0xff;
pos++;
zerocount = 1;
}
}
@@ -126,18 +137,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
if (zerocount != 0)
{
m_dest[pos++] = 0x00;
m_dest[pos++] = (byte)zerocount;
Unsafe.Add(ref dst, pos) = 0x00;
pos++;
Unsafe.Add(ref dst, pos) = (byte)zerocount;
pos++;
zerocount = 0;
}
m_dest[pos++] = src[i];
Unsafe.Add(ref dst, pos) = b;
pos++;
}
}
}
public unsafe void AddBytes(byte* src, int srclen)
{
ref byte dst = ref MemoryMarshal.GetArrayDataReference(m_dest);
for (int i = 0; i < srclen; ++i)
{
if (src[i] == 0x00)
@@ -146,8 +160,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
zerocount++;
else
{
m_dest[pos++] = 0x00;
m_dest[pos++] = 0xff;
Unsafe.Add(ref dst, pos) = 0x00;
pos++;
Unsafe.Add(ref dst, pos) = 0xff;
pos++;
zerocount = 1;
}
}
@@ -155,17 +171,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
if (zerocount != 0)
{
m_dest[pos++] = 0x00;
m_dest[pos++] = (byte)zerocount;
Unsafe.Add(ref dst, pos) = 0x00;
pos++;
Unsafe.Add(ref dst, pos) = (byte)zerocount;
pos++;
zerocount = 0;
}
m_dest[pos++] = src[i];
Unsafe.Add(ref dst, pos) = src[i];
pos++;
}
}
}
public unsafe void AddByte(byte v)
public void AddByte(byte v)
{
if (v == 0x00)
{
@@ -173,21 +191,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
zerocount++;
else
{
m_dest[pos++] = 0x00;
m_dest[pos++] = 0xff;
ref byte dst = ref MemoryMarshal.GetArrayDataReference(m_dest);
Unsafe.Add(ref dst, pos) = 0x00;
pos++;
Unsafe.Add(ref dst, pos) = 0xff;
pos++;
zerocount = 1;
}
}
else
{
ref byte dst = ref MemoryMarshal.GetArrayDataReference(m_dest);
if (zerocount != 0)
{
m_dest[pos++] = 0x00;
m_dest[pos++] = (byte)zerocount;
Unsafe.Add(ref dst, pos) = 0x00;
pos++;
Unsafe.Add(ref dst, pos) = (byte)zerocount;
pos++;
zerocount = 0;
}
m_dest[pos++] = v;
Unsafe.Add(ref dst, pos) = v;
pos++;
}
}
@@ -332,6 +356,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
AddBytes(b, 16);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void AddColorArgb(int argb)
{
uint ua = (uint)argb ^ 0xff000000;
if(ua == 0)
{
AddZeros(4);
}
else
{
AddByte((byte)(ua >> 16));
AddByte((byte)(ua >> 8));
AddByte((byte)ua);
AddByte((byte)(ua >> 24));
}
}
// maxlen <= 255 and includes null termination byte
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public unsafe void AddShortString(string str, int maxlen)