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

lludp: direct encode terrain patchs packets

0.9.1.0-post-fixes
UbitUmarov 2019-03-10 15:56:14 +00:00
parent 7b55d42b11
commit 32a03a49fc
2 changed files with 83 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1257,6 +1257,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
SendLayerTopRight(x1 + 1, y1, x2, y2 - 1); SendLayerTopRight(x1 + 1, y1, x2, y2 - 1);
} }
static private readonly byte[] TerrainPacketHeader = new byte[] {
Helpers.MSG_RELIABLE, // zero code is not as spec
0, 0, 0, 0, // sequence number
0, // extra
11, // ID (high frequency)
};
private const int END_OF_PATCHES = 97;
private const int STRIDE = 264;
public void SendLayerData(int[] map) public void SendLayerData(int[] map)
{ {
if(map == null) if(map == null)
@ -1264,9 +1274,75 @@ namespace OpenSim.Region.ClientStack.LindenUDP
try try
{ {
List<LayerDataPacket> packets = OpenSimTerrainCompressor.CreateLayerDataPackets(m_scene.Heightmap.GetTerrainData(), map); TerrainData terrData = m_scene.Heightmap.GetTerrainData();
foreach (LayerDataPacket pkt in packets) byte landPacketType = (terrData.SizeX > Constants.RegionSize || terrData.SizeY > Constants.RegionSize) ?
OutPacket(pkt, ThrottleOutPacketType.Land); (byte)TerrainPatch.LayerType.LandExtended : (byte)TerrainPatch.LayerType.Land;
int numberPatchs = map.Length / 2;
UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint);
byte[] data = buf.Data;
Buffer.BlockCopy(TerrainPacketHeader, 0, data, 0, 7);
data[7] = landPacketType;
//data[8] and data[9] == datablock size to fill later
data[10] = 0; // BitPack needs this on reused packets
// start data
BitPack bitpack = new BitPack(data, 10);
bitpack.PackBits(STRIDE, 16);
bitpack.PackBitsFromByte(16);
bitpack.PackBitsFromByte(landPacketType);
int s;
int datasize = 0;
for (int i = 0; i < numberPatchs; i++)
{
s = 2 * i;
OpenSimTerrainCompressor.CreatePatchFromTerrainData(bitpack, terrData, map[s], map[s + 1]);
if (bitpack.BytePos > 950 && i != numberPatchs - 1)
{
//finish this packet
bitpack.PackBitsFromByte(END_OF_PATCHES);
// fix the datablock lenght
datasize = bitpack.BytePos - 9;
data[8] = (byte)datasize;
data[9] = (byte)(datasize >> 8);
buf.DataLength = bitpack.BytePos + 1;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Land, null, false, false);
// start another
buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint);
data = buf.Data;
Buffer.BlockCopy(TerrainPacketHeader, 0, data, 0, 7);
data[7] = landPacketType;
//data[8] and data[9] == datablock size to fill later
data[10] = 0; // BitPack needs this
// start data
bitpack = new BitPack(data, 10);
bitpack.PackBits(STRIDE, 16);
bitpack.PackBitsFromByte(16);
bitpack.PackBitsFromByte(landPacketType);
}
}
bitpack.PackBitsFromByte(END_OF_PATCHES);
datasize = bitpack.BytePos - 9;
data[8] = (byte)datasize;
data[9] = (byte)(datasize >> 8);
buf.DataLength = bitpack.BytePos + 1;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Land, null, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@ -4512,7 +4588,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
CreateAvatarUpdateBlock((ScenePresence)eu.Entity, zc); CreateAvatarUpdateBlock((ScenePresence)eu.Entity, zc);
else else
CreatePrimUpdateBlock((SceneObjectPart)eu.Entity, mysp, zc); CreatePrimUpdateBlock((SceneObjectPart)eu.Entity, mysp, zc);
if (zc.Position < LLUDPServer.MTU - 5) if (zc.Position < LLUDPServer.MAXPAYLOAD)
{ {
tau.Add(eu); tau.Add(eu);
++count; ++count;
@ -4593,7 +4669,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
lastpos = pos; lastpos = pos;
CreateImprovedTerseBlock(eu.Entity, buf.Data, ref pos, (eu.Flags & PrimUpdateFlags.Textures) != 0); CreateImprovedTerseBlock(eu.Entity, buf.Data, ref pos, (eu.Flags & PrimUpdateFlags.Textures) != 0);
if (pos < LLUDPServer.MTU) if (pos < LLUDPServer.MAXPAYLOAD)
{ {
tau.Add(eu); tau.Add(eu);
++count; ++count;

2
OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
View File

@ -155,6 +155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return iout; return iout;
} }
/*
// new using terrain data and patchs indexes // new using terrain data and patchs indexes
public static List<LayerDataPacket> CreateLayerDataPackets(TerrainData terrData, int[] map) public static List<LayerDataPacket> CreateLayerDataPackets(TerrainData terrData, int[] map)
{ {
@ -213,6 +214,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return ret; return ret;
} }
*/
public static void CreatePatchFromTerrainData(BitPack output, TerrainData terrData, int patchX, int patchY) public static void CreatePatchFromTerrainData(BitPack output, TerrainData terrData, int patchX, int patchY)
{ {