ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

some cosmetics, like npcs down eat terrain

Browse Source
This commit is contained in:
UbitUmarov
2022-03-30 01:15:31 +01:00
parent 3f30f17187
commit 667a18161b
5 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
OpenSim/Framework/TerrainData.cs
View File

@@ -595,15 +595,26 @@ namespace OpenSim.Framework
CompressionFactor = hmCompressionFactor;
// In case database info doesn't match real terrain size, initialize the whole terrain.
ClearLand();
bool needClear = false;
if (hmSizeX > SizeX)
hmSizeX = SizeX;
else if (hmSizeX < SizeX)
needClear = true;
if (hmSizeY > SizeY)
hmSizeY = SizeY;
else if (hmSizeY < SizeY)
needClear = true;
if (needClear)
ClearLand();
for (int yy = 0; yy < hmSizeY; yy++)
{
for (int xx = 0; xx < hmSizeX; xx++)
{
float val = FromCompressedHeight(br.ReadInt16());
if (xx < SizeX && yy < SizeY)
m_heightmap[xx, yy] = val;
m_heightmap[xx, yy] = val;
}
}
}
@@ -631,16 +642,26 @@ namespace OpenSim.Framework
hmSizeX = br.ReadInt32();
hmSizeY = br.ReadInt32();
// In case database info doesn't match real terrain size, initialize the whole terrain.
ClearLand();
bool needClear = false;
if (hmSizeX > SizeX)
hmSizeX = SizeX;
else if (hmSizeX < SizeX)
needClear = true;
if (hmSizeY > SizeY)
hmSizeY = SizeY;
else if (hmSizeY < SizeY)
needClear = true;
if (needClear)
ClearLand();
for (int yy = 0; yy < hmSizeY; yy++)
{
for (int xx = 0; xx < hmSizeX; xx++)
{
float val = br.ReadSingle();
if (xx < SizeX && yy < SizeY)
m_heightmap[xx, yy] = val;
m_heightmap[xx, yy] = val;
}
}
}
@@ -665,8 +686,7 @@ namespace OpenSim.Framework
{
m_log.InfoFormat("{0} VD2Gzip {1} bytes input",
LogHeader, pBlob.Length);
Int32 hmSizeX, hmSizeY;
int hmSizeX, hmSizeY;
try
{
@@ -688,16 +708,26 @@ namespace OpenSim.Framework
hmSizeX = br.ReadInt32();
hmSizeY = br.ReadInt32();
// In case database info doesn't match real terrain size, initialize the whole terrain.
ClearLand();
bool needClear = false;
if(hmSizeX > SizeX)
hmSizeX = SizeX;
else if (hmSizeX < SizeX)
needClear = true;
if (hmSizeY > SizeY)
hmSizeY = SizeY;
else if (hmSizeY < SizeY)
needClear = true;
if (needClear)
ClearLand();
for (int yy = 0; yy < hmSizeY; yy++)
{
for (int xx = 0; xx < hmSizeX; xx++)
{
float val = br.ReadSingle();
if (xx < SizeX && yy < SizeY)
m_heightmap[xx, yy] = val;
m_heightmap[xx, yy] = val;
}
}
}