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

* Slightly smoother transition between land, shallow water and deep water in map tile generation.

0.6.0-stable
Teravus Ovares 2008-04-10 15:27:02 +00:00
parent ded704ef1f
commit f2d36186f0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -996,7 +996,7 @@ namespace OpenSim.Region.Environment.Scenes
float heightvalue = 0; float heightvalue = 0;
Color water = Color.FromArgb(0, 0, 255);
Color prim = Color.FromArgb(120, 120, 120); Color prim = Color.FromArgb(120, 120, 120);
LLVector3 RayEnd = new LLVector3(0, 0, 0); LLVector3 RayEnd = new LLVector3(0, 0, 0);
LLVector3 RayStart = new LLVector3(0, 0, 0); LLVector3 RayStart = new LLVector3(0, 0, 0);
@ -1042,7 +1042,7 @@ namespace OpenSim.Region.Environment.Scenes
//} //}
//else //else
//{ //{
//float tmpval = (float)hm[x, y]; float tmpval = (float)hm[x, y];
heightvalue = (float)hm[x, y]; heightvalue = (float)hm[x, y];
if ((float)heightvalue > m_regInfo.EstateSettings.waterHeight) if ((float)heightvalue > m_regInfo.EstateSettings.waterHeight)
@ -1065,6 +1065,15 @@ namespace OpenSim.Region.Environment.Scenes
else else
{ {
// Y flip the cordinates // Y flip the cordinates
heightvalue = m_regInfo.EstateSettings.waterHeight - heightvalue;
if (heightvalue > 19)
heightvalue = 19;
if (heightvalue < 0)
heightvalue = 0;
heightvalue = 100 - (heightvalue * 100) / 19;
Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255);
mapbmp.SetPixel(x, (256 - y) - 1, water); mapbmp.SetPixel(x, (256 - y) - 1, water);
} }
//} //}