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

change the encapsulation of compressed land patchs in llUDP packets

avinationmerge
UbitUmarov 2015-09-23 00:01:32 +01:00
parent 778793d77f
commit ccfb561e8d
2 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1355,22 +1355,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
try try
{ {
int PatchesAssumedToFit = 3; List<LayerDataPacket> packets = OpenSimTerrainCompressor.CreateTerrainPatchsPacket(terrData, px, py);
for (int pcnt = 0; pcnt < px.Length; pcnt += PatchesAssumedToFit) foreach(LayerDataPacket pkt in packets)
{ OutPacket(pkt, ThrottleOutPacketType.Land);
int remaining = Math.Min(px.Length - pcnt, PatchesAssumedToFit);
int[] xPatches = new int[remaining];
int[] yPatches = new int[remaining];
for (int ii = 0; ii < remaining; ii++)
{
xPatches[ii] = px[pcnt + ii];
yPatches[ii] = py[pcnt + ii];
}
LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLandPacket(terrData, xPatches, yPatches);
// DebugSendingPatches("SendLayerDataInternal", xPatches, yPatches);
OutPacket(layerpack, ThrottleOutPacketType.Land);
}
} }
catch (Exception e) catch (Exception e)
{ {

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

@ -27,9 +27,11 @@
/* Freely adapted from the Aurora version of the terrain compressor. /* Freely adapted from the Aurora version of the terrain compressor.
* Copyright (c) Contributors, http://aurora-sim.org/, http://opensimulator.org/ * Copyright (c) Contributors, http://aurora-sim.org/, http://opensimulator.org/
* Aurora version created from libOpenMetaverse Library terrain compressor
*/ */
using System; using System;
using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
@ -156,15 +158,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <returns></returns> /// <returns></returns>
public static LayerDataPacket CreateLandPacket(TerrainData terrData, int[] x, int[] y, byte type) public static LayerDataPacket CreateLandPacket(TerrainData terrData, int[] x, int[] y, byte type)
{ {
LayerDataPacket layer = new LayerDataPacket {LayerID = {Type = type}}; LayerDataPacket layer = new LayerDataPacket();
layer.LayerID.Type = type;
TerrainPatch.GroupHeader header = new TerrainPatch.GroupHeader
{Stride = STRIDE, PatchSize = Constants.TerrainPatchSize};
byte[] data = new byte[x.Length * Constants.TerrainPatchSize * Constants.TerrainPatchSize * 2]; byte[] data = new byte[x.Length * Constants.TerrainPatchSize * Constants.TerrainPatchSize * 2];
BitPack bitpack = new BitPack(data, 0); BitPack bitpack = new BitPack(data, 0);
bitpack.PackBits(header.Stride, 16); bitpack.PackBits(STRIDE, 16);
bitpack.PackBits(header.PatchSize, 8); bitpack.PackBits(Constants.TerrainPatchSize, 8);
bitpack.PackBits(type, 8); bitpack.PackBits(type, 8);
for (int i = 0; i < x.Length; i++) for (int i = 0; i < x.Length; i++)
@ -178,7 +178,62 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return layer; return layer;
} }
public static List<LayerDataPacket> CreateTerrainPatchsPacket(TerrainData terrData, int[] x, int[] y)
{
List<LayerDataPacket> ret = new List<LayerDataPacket>();
// normal or large region
byte landPacketType;
if (terrData.SizeX > Constants.RegionSize || terrData.SizeY > Constants.RegionSize)
landPacketType = (byte)TerrainPatch.LayerType.LandExtended;
else
landPacketType = (byte)TerrainPatch.LayerType.Land;
//create packet and global header
LayerDataPacket layer = new LayerDataPacket();
layer.LayerID.Type = landPacketType;
byte[] data = new byte[x.Length * Constants.TerrainPatchSize * Constants.TerrainPatchSize * 2];
BitPack bitpack = new BitPack(data, 0);
bitpack.PackBits(STRIDE, 16);
bitpack.PackBits(Constants.TerrainPatchSize, 8);
bitpack.PackBits(landPacketType, 8);
for (int i = 0; i < x.Length; i++)
{
CreatePatchFromHeightmap(bitpack, terrData, x[i], y[i]);
if (bitpack.BytePos > 1000 && i != x.Length - 1)
{
//finish this packet
bitpack.PackBits(END_OF_PATCHES, 8);
layer.LayerData.Data = new byte[bitpack.BytePos + 1];
Buffer.BlockCopy(bitpack.Data, 0, layer.LayerData.Data, 0, bitpack.BytePos + 1);
ret.Add(layer);
// start another
layer = new LayerDataPacket();
layer.LayerID.Type = landPacketType;
bitpack = new BitPack(data, 0);
bitpack.PackBits(STRIDE, 16);
bitpack.PackBits(Constants.TerrainPatchSize, 8);
bitpack.PackBits(landPacketType, 8);
}
}
bitpack.PackBits(END_OF_PATCHES, 8);
layer.LayerData.Data = new byte[bitpack.BytePos + 1];
Buffer.BlockCopy(bitpack.Data, 0, layer.LayerData.Data, 0, bitpack.BytePos + 1);
ret.Add(layer);
return ret;
}
// Unused: left for historical reference. // Unused: left for historical reference.
// nopes.. in use by clouds and wind
public static void CreatePatch(BitPack output, float[] patchData, int x, int y, int pRegionSizeX, int pRegionSizeY) public static void CreatePatch(BitPack output, float[] patchData, int x, int y, int pRegionSizeX, int pRegionSizeY)
{ {
TerrainPatch.Header header = PrescanPatch(patchData); TerrainPatch.Header header = PrescanPatch(patchData);