ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

change terrain internal representation to float. ushort work with legal

Browse Source 
sl terrain, but may break existent terrain and that may cost a lot more
 than the cost of memory
This commit is contained in:
UbitUmarov
2015-08-25 16:51:48 +01:00
parent 64d05bab0f
commit 244f0c6352
3 changed files with 166 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@@ -1349,13 +1349,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
double desiredMin = (double)args[0];
double desiredMax = (double)args[1];
if (desiredMin < 0 || desiredMin > 655.35
|| desiredMax < 0 || desiredMax > 655.35)
{
m_log.Error("desired Min and Max must be in range 0.0 to 655.0m");
return;
}
// determine desired scaling factor
double desiredRange = desiredMax - desiredMin;
//m_log.InfoFormat("Desired {0}, {1} = {2}", new Object[] { desiredMin, desiredMax, desiredRange });
@@ -1413,11 +1406,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
private void InterfaceElevateTerrain(Object[] args)
{
double val = (double)args[0];
if (val < 0 || val > 655.35)
{
m_log.Error("elevation must be in range 0.0 to 655.0m");
return;
}
int x, y;
for (x = 0; x < m_channel.Width; x++)
@@ -1439,7 +1427,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{
int x, y;
double val = (double)args[0];
if (val < 0 || val > 655.35)
for (x = 0; x < m_channel.Width; x++)
for (y = 0; y < m_channel.Height; y++)
@@ -1450,11 +1437,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{
int x, y;
double val = (double)args[0];
if (val < 0 || val > 655.35)
{
m_log.Error("height must be in range 0.0 to 655.0m");
return;
}
for (x = 0; x < m_channel.Width; x++)
for (y = 0; y < m_channel.Height; y++)
@@ -1465,11 +1447,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{
int x, y;
double val = (double)args[0];
if (val < 0 || val > 655.35)
{
m_log.Error("minimum must be in range 0.0 to 655.0m");
return;
}
for (x = 0; x < m_channel.Width; x++)
{
for (y = 0; y < m_channel.Height; y++)
@@ -1483,11 +1460,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{
int x, y;
double val = (double)args[0];
if (val < 0 || val > 655.35)
{
m_log.Error("maximum must be in range 0.0 to 655.0m");
return;
}
for (x = 0; x < m_channel.Width; x++)
{
for (y = 0; y < m_channel.Height; y++)