diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/TerrainChannel.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/TerrainChannel.cs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs index 96d2dc4..28bbdda 100644 --- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs | |||
@@ -538,19 +538,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
538 | { | 538 | { |
539 | float cx = m_terrainData.SizeX * 0.5f; | 539 | float cx = m_terrainData.SizeX * 0.5f; |
540 | float cy = m_terrainData.SizeY * 0.5f; | 540 | float cy = m_terrainData.SizeY * 0.5f; |
541 | float h; | 541 | float h, b; |
542 | for (int x = 0; x < Width; x++) | 542 | for (int x = 0; x < Width; x++) |
543 | { | 543 | { |
544 | for (int y = 0; y < Height; y++) | 544 | for (int y = 0; y < Height; y++) |
545 | { | 545 | { |
546 | // h = (float)TerrainUtil.PerlinNoise2D(x, y, 2, 0.125) * 10; | 546 | h = 25 * TerrainUtil.SphericalFactor(x - cx, y - cy, 50); |
547 | h = 1.0f; | 547 | b = 10 * TerrainUtil.SphericalFactor(x - cx, y - cy, 100); |
548 | float spherFacA = (float)(TerrainUtil.SphericalFactor(x, y, cx, cy, 50) * 0.01d); | 548 | if (h < b) |
549 | float spherFacB = (float)(TerrainUtil.SphericalFactor(x, y, cx, cy, 100) * 0.001d); | 549 | h = b; |
550 | if (h < spherFacA) | ||
551 | h = spherFacA; | ||
552 | if (h < spherFacB) | ||
553 | h = spherFacB; | ||
554 | m_terrainData[x, y] = h; | 550 | m_terrainData[x, y] = h; |
555 | } | 551 | } |
556 | } | 552 | } |