From d51ce47b2d7635b17f3dd429158e8f59b78b83aa Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 1 May 2008 14:31:30 +0000
Subject: Update svn properties. Minor formatting cleanup.
---
.../World/Terrain/PaintBrushes/ErodeSphere.cs | 622 ++++++++++-----------
.../World/Terrain/PaintBrushes/FlattenSphere.cs | 186 +++---
.../World/Terrain/PaintBrushes/LowerSphere.cs | 132 ++---
.../World/Terrain/PaintBrushes/NoiseSphere.cs | 138 ++---
.../World/Terrain/PaintBrushes/OlsenSphere.cs | 448 +++++++--------
.../World/Terrain/PaintBrushes/RaiseSphere.cs | 132 ++---
.../World/Terrain/PaintBrushes/RevertSphere.cs | 162 +++---
.../World/Terrain/PaintBrushes/SmoothSphere.cs | 184 +++---
.../World/Terrain/PaintBrushes/WeatherSphere.cs | 412 +++++++-------
9 files changed, 1208 insertions(+), 1208 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes')
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
index 29448aa..e036988 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
@@ -1,312 +1,312 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
- ///
- /// Hydraulic Erosion Brush
- ///
- public class ErodeSphere : ITerrainPaintableEffect
- {
- private double rainHeight = 0.2;
- private int rounds = 10;
- private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
- private double waterSaturation = 0.30; // Can carry 1% of water in height
-
- #region Supporting Functions
-
- private int[] Neighbours(NeighbourSystem type, int index)
- {
- int[] coord = new int[2];
-
- index++;
-
- switch (type)
- {
- case NeighbourSystem.Moore:
- switch (index)
- {
- case 1:
- coord[0] = -1;
- coord[1] = -1;
- break;
-
- case 2:
- coord[0] = -0;
- coord[1] = -1;
- break;
-
- case 3:
- coord[0] = +1;
- coord[1] = -1;
- break;
-
- case 4:
- coord[0] = -1;
- coord[1] = -0;
- break;
-
- case 5:
- coord[0] = -0;
- coord[1] = -0;
- break;
-
- case 6:
- coord[0] = +1;
- coord[1] = -0;
- break;
-
- case 7:
- coord[0] = -1;
- coord[1] = +1;
- break;
-
- case 8:
- coord[0] = -0;
- coord[1] = +1;
- break;
-
- case 9:
- coord[0] = +1;
- coord[1] = +1;
- break;
-
- default:
- break;
- }
- break;
-
- case NeighbourSystem.VonNeumann:
- switch (index)
- {
- case 1:
- coord[0] = 0;
- coord[1] = -1;
- break;
-
- case 2:
- coord[0] = -1;
- coord[1] = 0;
- break;
-
- case 3:
- coord[0] = +1;
- coord[1] = 0;
- break;
-
- case 4:
- coord[0] = 0;
- coord[1] = +1;
- break;
-
- case 5:
- coord[0] = -0;
- coord[1] = -0;
- break;
-
- default:
- break;
- }
- break;
- }
-
- return coord;
- }
-
- private enum NeighbourSystem
- {
- Moore,
- VonNeumann
- } ;
-
- #endregion
-
- #region ITerrainPaintableEffect Members
-
- public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
- {
- strength = TerrainUtil.MetersToSphericalStrength(strength);
-
- int x, y;
- // Using one 'rain' round for this, so skipping a useless loop
- // Will need to adapt back in for the Flood brush
-
- ITerrainChannel water = new TerrainChannel(map.Width, map.Height);
- ITerrainChannel sediment = new TerrainChannel(map.Width, map.Height);
-
- // Fill with rain
- for (x = 0; x < water.Width; x++)
- for (y = 0; y < water.Height; y++)
- water[x, y] = Math.Max(0.0, TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * rainHeight * duration);
-
- for (int i = 0; i < rounds; i++)
- {
- // Erode underlying terrain
- for (x = 0; x < water.Width; x++)
- {
- for (y = 0; y < water.Height; y++)
- {
- double solConst = (1.0 / rounds);
- double sedDelta = water[x, y] * solConst;
- map[x, y] -= sedDelta;
- sediment[x, y] += sedDelta;
- }
- }
-
- // Move water
- for (x = 0; x < water.Width; x++)
- {
- for (y = 0; y < water.Height; y++)
- {
- if (water[x, y] <= 0)
- continue;
-
- // Step 1. Calculate average of neighbours
-
- int neighbours = 0;
- double altitudeTotal = 0.0;
- double altitudeMe = map[x, y] + water[x, y];
-
- int NEIGHBOUR_ME = 4;
-
- int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
-
- for (int j = 0; j < NEIGHBOUR_MAX; j++)
- {
- if (j != NEIGHBOUR_ME)
- {
- int[] coords = Neighbours(type, j);
-
- coords[0] += x;
- coords[1] += y;
-
- if (coords[0] > map.Width - 1)
- continue;
- if (coords[1] > map.Height - 1)
- continue;
- if (coords[0] < 0)
- continue;
- if (coords[1] < 0)
- continue;
-
- // Calculate total height of this neighbour
- double altitudeNeighbour = water[coords[0], coords[1]] + map[coords[0], coords[1]];
-
- // If it's greater than me...
- if (altitudeNeighbour - altitudeMe < 0)
- {
- // Add it to our calculations
- neighbours++;
- altitudeTotal += altitudeNeighbour;
- }
- }
- }
-
- if (neighbours == 0)
- continue;
-
- double altitudeAvg = altitudeTotal / neighbours;
-
- // Step 2. Allocate water to neighbours.
- for (int j = 0; j < NEIGHBOUR_MAX; j++)
- {
- if (j != NEIGHBOUR_ME)
- {
- int[] coords = Neighbours(type, j);
-
- coords[0] += x;
- coords[1] += y;
-
- if (coords[0] > map.Width - 1)
- continue;
- if (coords[1] > map.Height - 1)
- continue;
- if (coords[0] < 0)
- continue;
- if (coords[1] < 0)
- continue;
-
- // Skip if we dont have water to begin with.
- if (water[x, y] < 0)
- continue;
-
- // Calculate our delta average
- double altitudeDelta = altitudeMe - altitudeAvg;
-
- if (altitudeDelta < 0)
- continue;
-
- // Calculate how much water we can move
- double waterMin = Math.Min(water[x, y], altitudeDelta);
- double waterDelta = waterMin * ((water[coords[0], coords[1]] + map[coords[0], coords[1]])
- / altitudeTotal);
-
- double sedimentDelta = sediment[x, y] * (waterDelta / water[x, y]);
-
- if (sedimentDelta > 0)
- {
- sediment[x, y] -= sedimentDelta;
- sediment[coords[0], coords[1]] += sedimentDelta;
- }
- }
- }
- }
- }
-
- // Evaporate
-
- for (x = 0; x < water.Width; x++)
- {
- for (y = 0; y < water.Height; y++)
- {
- water[x, y] *= 1.0 - (rainHeight / rounds);
-
- double waterCapacity = waterSaturation * water[x, y];
-
- double sedimentDeposit = sediment[x, y] - waterCapacity;
- if (sedimentDeposit > 0)
- {
- sediment[x, y] -= sedimentDeposit;
- map[x, y] += sedimentDeposit;
- }
- }
- }
- }
-
- // Deposit any remainder (should be minimal)
- for (x = 0; x < water.Width; x++)
- for (y = 0; y < water.Height; y++)
- if (sediment[x, y] > 0)
- map[x, y] += sediment[x, y];
- }
-
- #endregion
- }
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+ ///
+ /// Hydraulic Erosion Brush
+ ///
+ public class ErodeSphere : ITerrainPaintableEffect
+ {
+ private double rainHeight = 0.2;
+ private int rounds = 10;
+ private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
+ private double waterSaturation = 0.30; // Can carry 1% of water in height
+
+ #region Supporting Functions
+
+ private int[] Neighbours(NeighbourSystem type, int index)
+ {
+ int[] coord = new int[2];
+
+ index++;
+
+ switch (type)
+ {
+ case NeighbourSystem.Moore:
+ switch (index)
+ {
+ case 1:
+ coord[0] = -1;
+ coord[1] = -1;
+ break;
+
+ case 2:
+ coord[0] = -0;
+ coord[1] = -1;
+ break;
+
+ case 3:
+ coord[0] = +1;
+ coord[1] = -1;
+ break;
+
+ case 4:
+ coord[0] = -1;
+ coord[1] = -0;
+ break;
+
+ case 5:
+ coord[0] = -0;
+ coord[1] = -0;
+ break;
+
+ case 6:
+ coord[0] = +1;
+ coord[1] = -0;
+ break;
+
+ case 7:
+ coord[0] = -1;
+ coord[1] = +1;
+ break;
+
+ case 8:
+ coord[0] = -0;
+ coord[1] = +1;
+ break;
+
+ case 9:
+ coord[0] = +1;
+ coord[1] = +1;
+ break;
+
+ default:
+ break;
+ }
+ break;
+
+ case NeighbourSystem.VonNeumann:
+ switch (index)
+ {
+ case 1:
+ coord[0] = 0;
+ coord[1] = -1;
+ break;
+
+ case 2:
+ coord[0] = -1;
+ coord[1] = 0;
+ break;
+
+ case 3:
+ coord[0] = +1;
+ coord[1] = 0;
+ break;
+
+ case 4:
+ coord[0] = 0;
+ coord[1] = +1;
+ break;
+
+ case 5:
+ coord[0] = -0;
+ coord[1] = -0;
+ break;
+
+ default:
+ break;
+ }
+ break;
+ }
+
+ return coord;
+ }
+
+ private enum NeighbourSystem
+ {
+ Moore,
+ VonNeumann
+ } ;
+
+ #endregion
+
+ #region ITerrainPaintableEffect Members
+
+ public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+ {
+ strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+ int x, y;
+ // Using one 'rain' round for this, so skipping a useless loop
+ // Will need to adapt back in for the Flood brush
+
+ ITerrainChannel water = new TerrainChannel(map.Width, map.Height);
+ ITerrainChannel sediment = new TerrainChannel(map.Width, map.Height);
+
+ // Fill with rain
+ for (x = 0; x < water.Width; x++)
+ for (y = 0; y < water.Height; y++)
+ water[x, y] = Math.Max(0.0, TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * rainHeight * duration);
+
+ for (int i = 0; i < rounds; i++)
+ {
+ // Erode underlying terrain
+ for (x = 0; x < water.Width; x++)
+ {
+ for (y = 0; y < water.Height; y++)
+ {
+ double solConst = (1.0 / rounds);
+ double sedDelta = water[x, y] * solConst;
+ map[x, y] -= sedDelta;
+ sediment[x, y] += sedDelta;
+ }
+ }
+
+ // Move water
+ for (x = 0; x < water.Width; x++)
+ {
+ for (y = 0; y < water.Height; y++)
+ {
+ if (water[x, y] <= 0)
+ continue;
+
+ // Step 1. Calculate average of neighbours
+
+ int neighbours = 0;
+ double altitudeTotal = 0.0;
+ double altitudeMe = map[x, y] + water[x, y];
+
+ int NEIGHBOUR_ME = 4;
+
+ int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
+
+ for (int j = 0; j < NEIGHBOUR_MAX; j++)
+ {
+ if (j != NEIGHBOUR_ME)
+ {
+ int[] coords = Neighbours(type, j);
+
+ coords[0] += x;
+ coords[1] += y;
+
+ if (coords[0] > map.Width - 1)
+ continue;
+ if (coords[1] > map.Height - 1)
+ continue;
+ if (coords[0] < 0)
+ continue;
+ if (coords[1] < 0)
+ continue;
+
+ // Calculate total height of this neighbour
+ double altitudeNeighbour = water[coords[0], coords[1]] + map[coords[0], coords[1]];
+
+ // If it's greater than me...
+ if (altitudeNeighbour - altitudeMe < 0)
+ {
+ // Add it to our calculations
+ neighbours++;
+ altitudeTotal += altitudeNeighbour;
+ }
+ }
+ }
+
+ if (neighbours == 0)
+ continue;
+
+ double altitudeAvg = altitudeTotal / neighbours;
+
+ // Step 2. Allocate water to neighbours.
+ for (int j = 0; j < NEIGHBOUR_MAX; j++)
+ {
+ if (j != NEIGHBOUR_ME)
+ {
+ int[] coords = Neighbours(type, j);
+
+ coords[0] += x;
+ coords[1] += y;
+
+ if (coords[0] > map.Width - 1)
+ continue;
+ if (coords[1] > map.Height - 1)
+ continue;
+ if (coords[0] < 0)
+ continue;
+ if (coords[1] < 0)
+ continue;
+
+ // Skip if we dont have water to begin with.
+ if (water[x, y] < 0)
+ continue;
+
+ // Calculate our delta average
+ double altitudeDelta = altitudeMe - altitudeAvg;
+
+ if (altitudeDelta < 0)
+ continue;
+
+ // Calculate how much water we can move
+ double waterMin = Math.Min(water[x, y], altitudeDelta);
+ double waterDelta = waterMin * ((water[coords[0], coords[1]] + map[coords[0], coords[1]])
+ / altitudeTotal);
+
+ double sedimentDelta = sediment[x, y] * (waterDelta / water[x, y]);
+
+ if (sedimentDelta > 0)
+ {
+ sediment[x, y] -= sedimentDelta;
+ sediment[coords[0], coords[1]] += sedimentDelta;
+ }
+ }
+ }
+ }
+ }
+
+ // Evaporate
+
+ for (x = 0; x < water.Width; x++)
+ {
+ for (y = 0; y < water.Height; y++)
+ {
+ water[x, y] *= 1.0 - (rainHeight / rounds);
+
+ double waterCapacity = waterSaturation * water[x, y];
+
+ double sedimentDeposit = sediment[x, y] - waterCapacity;
+ if (sedimentDeposit > 0)
+ {
+ sediment[x, y] -= sedimentDeposit;
+ map[x, y] += sedimentDeposit;
+ }
+ }
+ }
+ }
+
+ // Deposit any remainder (should be minimal)
+ for (x = 0; x < water.Width; x++)
+ for (y = 0; y < water.Height; y++)
+ if (sediment[x, y] > 0)
+ map[x, y] += sediment[x, y];
+ }
+
+ #endregion
+ }
}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
index d4f3b9f..dee455f 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -1,94 +1,94 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
- public class FlattenSphere : ITerrainPaintableEffect
- {
-
- #region ITerrainPaintableEffect Members
-
- public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
- {
- strength = TerrainUtil.MetersToSphericalStrength(strength);
-
- int x, y;
- double[,] tweak = new double[map.Width,map.Height];
-
- double area = strength;
- double step = strength / 4.0;
-
- double sum = 0.0;
- double step2 = 0.0;
- double avg = 0.0;
-
- // compute delta map
- for (x = 0; x < map.Width; x++)
- {
- for (y = 0; y < map.Height; y++)
- {
- double z = SphericalFactor(x, y, rx, ry, strength);
-
- if (z > 0) // add in non-zero amount
- {
- sum += map[x, y] * z;
- step2 += z;
- }
- }
- }
-
- avg = sum / step2;
-
- // blend in map
- for (x = 0; x < map.Width; x++)
- {
- for (y = 0; y < map.Height; y++)
- {
- double z = SphericalFactor(x, y, rx, ry, strength) * duration;
-
- if (z > 0) // add in non-zero amount
- {
- if (z > 1.0)
- z = 1.0;
-
- map[x, y] = (map[x, y] * (1.0 - z)) + (avg * z);
- }
- }
- }
- }
-
- #endregion
-
- private double SphericalFactor(double x, double y, double rx, double ry, double size)
- {
- double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
- return z;
- }
- }
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+ public class FlattenSphere : ITerrainPaintableEffect
+ {
+
+ #region ITerrainPaintableEffect Members
+
+ public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+ {
+ strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+ int x, y;
+ double[,] tweak = new double[map.Width,map.Height];
+
+ double area = strength;
+ double step = strength / 4.0;
+
+ double sum = 0.0;
+ double step2 = 0.0;
+ double avg = 0.0;
+
+ // compute delta map
+ for (x = 0; x < map.Width; x++)
+ {
+ for (y = 0; y < map.Height; y++)
+ {
+ double z = SphericalFactor(x, y, rx, ry, strength);
+
+ if (z > 0) // add in non-zero amount
+ {
+ sum += map[x, y] * z;
+ step2 += z;
+ }
+ }
+ }
+
+ avg = sum / step2;
+
+ // blend in map
+ for (x = 0; x < map.Width; x++)
+ {
+ for (y = 0; y < map.Height; y++)
+ {
+ double z = SphericalFactor(x, y, rx, ry, strength) * duration;
+
+ if (z > 0) // add in non-zero amount
+ {
+ if (z > 1.0)
+ z = 1.0;
+
+ map[x, y] = (map[x, y] * (1.0 - z)) + (avg * z);
+ }
+ }
+ }
+ }
+
+ #endregion
+
+ private double SphericalFactor(double x, double y, double rx, double ry, double size)
+ {
+ double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
+ return z;
+ }
+ }
}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
index 0b80407..092bd29 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
@@ -1,67 +1,67 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
- public class LowerSphere : ITerrainPaintableEffect
- {
- #region ITerrainPaintableEffect Members
-
- public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
- {
- strength = TerrainUtil.MetersToSphericalStrength(strength);
-
- int x, y;
- for (x = 0; x < map.Width; x++)
- {
- // Skip everything unlikely to be affected
- if (Math.Abs(x - rx) > strength * 1.1)
- continue;
-
- for (y = 0; y < map.Height; y++)
- {
- // Skip everything unlikely to be affected
- if (Math.Abs(y - ry) > strength * 1.1)
- continue;
-
- // Calculate a sphere and add it to the heighmap
- double z = strength;
- z *= z;
- z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
-
- if (z > 0.0)
- map[x, y] -= z * duration;
- }
- }
- }
-
- #endregion
- }
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+ public class LowerSphere : ITerrainPaintableEffect
+ {
+ #region ITerrainPaintableEffect Members
+
+ public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+ {
+ strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+ int x, y;
+ for (x = 0; x < map.Width; x++)
+ {
+ // Skip everything unlikely to be affected
+ if (Math.Abs(x - rx) > strength * 1.1)
+ continue;
+
+ for (y = 0; y < map.Height; y++)
+ {
+ // Skip everything unlikely to be affected
+ if (Math.Abs(y - ry) > strength * 1.1)
+ continue;
+
+ // Calculate a sphere and add it to the heighmap
+ double z = strength;
+ z *= z;
+ z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+
+ if (z > 0.0)
+ map[x, y] -= z * duration;
+ }
+ }
+ }
+
+ #endregion
+ }
}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
index a188e9f..8ae583e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
@@ -1,70 +1,70 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
- public class NoiseSphere : ITerrainPaintableEffect
- {
- #region ITerrainPaintableEffect Members
-
- public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
- {
- strength = TerrainUtil.MetersToSphericalStrength(strength);
-
- int x, y;
- for (x = 0; x < map.Width; x++)
- {
- // Skip everything unlikely to be affected
- if (Math.Abs(x - rx) > strength * 1.1)
- continue;
-
- for (y = 0; y < map.Height; y++)
- {
- // Skip everything unlikely to be affected
- if (Math.Abs(y - ry) > strength * 1.1)
- continue;
-
- // Calculate a sphere and add it to the heighmap
- double z = strength;
- z *= z;
- z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
-
- double noise = TerrainUtil.PerlinNoise2D((double) x / (double) Constants.RegionSize, (double) y / (double) Constants.RegionSize, 8, 1.0);
-
- if (z > 0.0)
- map[x, y] += noise * z * duration;
- }
- }
- }
-
- #endregion
- }
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Framework;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+ public class NoiseSphere : ITerrainPaintableEffect
+ {
+ #region ITerrainPaintableEffect Members
+
+ public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+ {
+ strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+ int x, y;
+ for (x = 0; x < map.Width; x++)
+ {
+ // Skip everything unlikely to be affected
+ if (Math.Abs(x - rx) > strength * 1.1)
+ continue;
+
+ for (y = 0; y < map.Height; y++)
+ {
+ // Skip everything unlikely to be affected
+ if (Math.Abs(y - ry) > strength * 1.1)
+ continue;
+
+ // Calculate a sphere and add it to the heighmap
+ double z = strength;
+ z *= z;
+ z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+
+ double noise = TerrainUtil.PerlinNoise2D((double) x / (double) Constants.RegionSize, (double) y / (double) Constants.RegionSize, 8, 1.0);
+
+ if (z > 0.0)
+ map[x, y] += noise * z * duration;
+ }
+ }
+ }
+
+ #endregion
+ }
}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
index dc56cf1..ba01a01 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
@@ -1,225 +1,225 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
- ///
- /// Speed-Optimised Hybrid Erosion Brush
- ///
- /// As per Jacob Olsen's Paper
- /// http://www.oddlabs.com/download/terrain_generation.pdf
- ///
- public class OlsenSphere : ITerrainPaintableEffect
- {
- private double nConst = 1024.0;
- private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
-
- #region Supporting Functions
-
- private int[] Neighbours(NeighbourSystem type, int index)
- {
- int[] coord = new int[2];
-
- index++;
-
- switch (type)
- {
- case NeighbourSystem.Moore:
- switch (index)
- {
- case 1:
- coord[0] = -1;
- coord[1] = -1;
- break;
-
- case 2:
- coord[0] = -0;
- coord[1] = -1;
- break;
-
- case 3:
- coord[0] = +1;
- coord[1] = -1;
- break;
-
- case 4:
- coord[0] = -1;
- coord[1] = -0;
- break;
-
- case 5:
- coord[0] = -0;
- coord[1] = -0;
- break;
-
- case 6:
- coord[0] = +1;
- coord[1] = -0;
- break;
-
- case 7:
- coord[0] = -1;
- coord[1] = +1;
- break;
-
- case 8:
- coord[0] = -0;
- coord[1] = +1;
- break;
-
- case 9:
- coord[0] = +1;
- coord[1] = +1;
- break;
-
- default:
- break;
- }
- break;
-
- case NeighbourSystem.VonNeumann:
- switch (index)
- {
- case 1:
- coord[0] = 0;
- coord[1] = -1;
- break;
-
- case 2:
- coord[0] = -1;
- coord[1] = 0;
- break;
-
- case 3:
- coord[0] = +1;
- coord[1] = 0;
- break;
-
- case 4:
- coord[0] = 0;
- coord[1] = +1;
- break;
-
- case 5:
- coord[0] = -0;
- coord[1] = -0;
- break;
-
- default:
- break;
- }
- break;
- }
-
- return coord;
- }
-
- private double SphericalFactor(double x, double y, double rx, double ry, double size)
- {
- double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
- return z;
- }
-
- private enum NeighbourSystem
- {
- Moore,
- VonNeumann
- } ;
-
- #endregion
-
- #region ITerrainPaintableEffect Members
-
- public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
- {
- strength = TerrainUtil.MetersToSphericalStrength(strength);
-
- int x, y;
-
- for (x = 0; x < map.Width; x++)
- {
- for (y = 0; y < map.Height; y++)
- {
- double z = SphericalFactor(x, y, rx, ry, strength);
-
- if (z > 0) // add in non-zero amount
- {
- int NEIGHBOUR_ME = 4;
- int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
-
- double max = Double.MinValue;
- int loc = 0;
- double cellmax = 0;
-
-
- for (int j = 0; j < NEIGHBOUR_MAX; j++)
- {
- if (j != NEIGHBOUR_ME)
- {
- int[] coords = Neighbours(type, j);
-
- coords[0] += x;
- coords[1] += y;
-
- if (coords[0] > map.Width - 1)
- continue;
- if (coords[1] > map.Height - 1)
- continue;
- if (coords[0] < 0)
- continue;
- if (coords[1] < 0)
- continue;
-
- cellmax = map[x, y] - map[coords[0], coords[1]];
- if (cellmax > max)
- {
- max = cellmax;
- loc = j;
- }
- }
- }
-
- double T = nConst / ((map.Width + map.Height) / 2);
- // Apply results
- if (0 < max && max <= T)
- {
- int[] maxCoords = Neighbours(type, loc);
- double heightDelta = 0.5 * max * z * duration;
- map[x, y] -= heightDelta;
- map[x + maxCoords[0], y + maxCoords[1]] += heightDelta;
- }
- }
- }
- }
- }
-
- #endregion
- }
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+ ///
+ /// Speed-Optimised Hybrid Erosion Brush
+ ///
+ /// As per Jacob Olsen's Paper
+ /// http://www.oddlabs.com/download/terrain_generation.pdf
+ ///
+ public class OlsenSphere : ITerrainPaintableEffect
+ {
+ private double nConst = 1024.0;
+ private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
+
+ #region Supporting Functions
+
+ private int[] Neighbours(NeighbourSystem type, int index)
+ {
+ int[] coord = new int[2];
+
+ index++;
+
+ switch (type)
+ {
+ case NeighbourSystem.Moore:
+ switch (index)
+ {
+ case 1:
+ coord[0] = -1;
+ coord[1] = -1;
+ break;
+
+ case 2:
+ coord[0] = -0;
+ coord[1] = -1;
+ break;
+
+ case 3:
+ coord[0] = +1;
+ coord[1] = -1;
+ break;
+
+ case 4:
+ coord[0] = -1;
+ coord[1] = -0;
+ break;
+
+ case 5:
+ coord[0] = -0;
+ coord[1] = -0;
+ break;
+
+ case 6:
+ coord[0] = +1;
+ coord[1] = -0;
+ break;
+
+ case 7:
+ coord[0] = -1;
+ coord[1] = +1;
+ break;
+
+ case 8:
+ coord[0] = -0;
+ coord[1] = +1;
+ break;
+
+ case 9:
+ coord[0] = +1;
+ coord[1] = +1;
+ break;
+
+ default:
+ break;
+ }
+ break;
+
+ case NeighbourSystem.VonNeumann:
+ switch (index)
+ {
+ case 1:
+ coord[0] = 0;
+ coord[1] = -1;
+ break;
+
+ case 2:
+ coord[0] = -1;
+ coord[1] = 0;
+ break;
+
+ case 3:
+ coord[0] = +1;
+ coord[1] = 0;
+ break;
+
+ case 4:
+ coord[0] = 0;
+ coord[1] = +1;
+ break;
+
+ case 5:
+ coord[0] = -0;
+ coord[1] = -0;
+ break;
+
+ default:
+ break;
+ }
+ break;
+ }
+
+ return coord;
+ }
+
+ private double SphericalFactor(double x, double y, double rx, double ry, double size)
+ {
+ double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
+ return z;
+ }
+
+ private enum NeighbourSystem
+ {
+ Moore,
+ VonNeumann
+ } ;
+
+ #endregion
+
+ #region ITerrainPaintableEffect Members
+
+ public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+ {
+ strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+ int x, y;
+
+ for (x = 0; x < map.Width; x++)
+ {
+ for (y = 0; y < map.Height; y++)
+ {
+ double z = SphericalFactor(x, y, rx, ry, strength);
+
+ if (z > 0) // add in non-zero amount
+ {
+ int NEIGHBOUR_ME = 4;
+ int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
+
+ double max = Double.MinValue;
+ int loc = 0;
+ double cellmax = 0;
+
+
+ for (int j = 0; j < NEIGHBOUR_MAX; j++)
+ {
+ if (j != NEIGHBOUR_ME)
+ {
+ int[] coords = Neighbours(type, j);
+
+ coords[0] += x;
+ coords[1] += y;
+
+ if (coords[0] > map.Width - 1)
+ continue;
+ if (coords[1] > map.Height - 1)
+ continue;
+ if (coords[0] < 0)
+ continue;
+ if (coords[1] < 0)
+ continue;
+
+ cellmax = map[x, y] - map[coords[0], coords[1]];
+ if (cellmax > max)
+ {
+ max = cellmax;
+ loc = j;
+ }
+ }
+ }
+
+ double T = nConst / ((map.Width + map.Height) / 2);
+ // Apply results
+ if (0 < max && max <= T)
+ {
+ int[] maxCoords = Neighbours(type, loc);
+ double heightDelta = 0.5 * max * z * duration;
+ map[x, y] -= heightDelta;
+ map[x + maxCoords[0], y + maxCoords[1]] += heightDelta;
+ }
+ }
+ }
+ }
+ }
+
+ #endregion
+ }
}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
index cd5a22b..5d6f093 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -1,67 +1,67 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
- public class RaiseSphere : ITerrainPaintableEffect
- {
- #region ITerrainPaintableEffect Members
-
- public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
- {
- strength = TerrainUtil.MetersToSphericalStrength(strength);
-
- int x, y;
- for (x = 0; x < map.Width; x++)
- {
- // Skip everything unlikely to be affected
- if (Math.Abs(x - rx) > strength * 1.1)
- continue;
-
- for (y = 0; y < map.Height; y++)
- {
- // Skip everything unlikely to be affected
- if (Math.Abs(y - ry) > strength * 1.1)
- continue;
-
- // Calculate a sphere and add it to the heighmap
- double z = strength;
- z *= z;
- z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
-
- if (z > 0.0)
- map[x, y] += z * duration;
- }
- }
- }
-
- #endregion
- }
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+ public class RaiseSphere : ITerrainPaintableEffect
+ {
+ #region ITerrainPaintableEffect Members
+
+ public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+ {
+ strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+ int x, y;
+ for (x = 0; x < map.Width; x++)
+ {
+ // Skip everything unlikely to be affected
+ if (Math.Abs(x - rx) > strength * 1.1)
+ continue;
+
+ for (y = 0; y < map.Height; y++)
+ {
+ // Skip everything unlikely to be affected
+ if (Math.Abs(y - ry) > strength * 1.1)
+ continue;
+
+ // Calculate a sphere and add it to the heighmap
+ double z = strength;
+ z *= z;
+ z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+
+ if (z > 0.0)
+ map[x, y] += z * duration;
+ }
+ }
+ }
+
+ #endregion
+ }
}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
index 5b92cb5..b47e041 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -1,82 +1,82 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
- public class RevertSphere : ITerrainPaintableEffect
- {
- private ITerrainChannel m_revertmap;
-
- public RevertSphere(ITerrainChannel revertmap)
- {
- m_revertmap = revertmap;
- }
-
- #region ITerrainPaintableEffect Members
-
- public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
- {
- strength = TerrainUtil.MetersToSphericalStrength(strength);
-
- if (duration > 1.0)
- duration = 1.0;
- if (duration < 0)
- return;
-
- int x, y;
- for (x = 0; x < map.Width; x++)
- {
- // Skip everything unlikely to be affected
- if (Math.Abs(x - rx) > strength * 1.1)
- continue;
-
- for (y = 0; y < map.Height; y++)
- {
- // Skip everything unlikely to be affected
- if (Math.Abs(y - ry) > strength * 1.1)
- continue;
-
- // Calculate a sphere and add it to the heighmap
- double z = strength;
- z *= z;
- z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
-
- if (z > 0.0)
- {
- z *= duration;
- map[x, y] += (map[x, y] * (1.0 - z)) + (m_revertmap[x, y] * z);
- }
- }
- }
- }
-
- #endregion
- }
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+ public class RevertSphere : ITerrainPaintableEffect
+ {
+ private ITerrainChannel m_revertmap;
+
+ public RevertSphere(ITerrainChannel revertmap)
+ {
+ m_revertmap = revertmap;
+ }
+
+ #region ITerrainPaintableEffect Members
+
+ public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+ {
+ strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+ if (duration > 1.0)
+ duration = 1.0;
+ if (duration < 0)
+ return;
+
+ int x, y;
+ for (x = 0; x < map.Width; x++)
+ {
+ // Skip everything unlikely to be affected
+ if (Math.Abs(x - rx) > strength * 1.1)
+ continue;
+
+ for (y = 0; y < map.Height; y++)
+ {
+ // Skip everything unlikely to be affected
+ if (Math.Abs(y - ry) > strength * 1.1)
+ continue;
+
+ // Calculate a sphere and add it to the heighmap
+ double z = strength;
+ z *= z;
+ z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+
+ if (z > 0.0)
+ {
+ z *= duration;
+ map[x, y] += (map[x, y] * (1.0 - z)) + (m_revertmap[x, y] * z);
+ }
+ }
+ }
+ }
+
+ #endregion
+ }
}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 305a875..51d5f0e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -1,93 +1,93 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
- public class SmoothSphere : ITerrainPaintableEffect
- {
- #region ITerrainPaintableEffect Members
-
- public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
- {
- strength = TerrainUtil.MetersToSphericalStrength(strength);
-
- int x, y;
- double[,] tweak = new double[map.Width,map.Height];
-
- double n, l;
- double area = strength;
- double step = strength / 4.0;
-
- // compute delta map
- for (x = 0; x < map.Width; x++)
- {
- for (y = 0; y < map.Height; y++)
- {
- double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-
- if (z > 0) // add in non-zero amount
- {
- double average = 0.0;
- int avgsteps = 0;
-
- for (n = 0.0 - area; n < area; n += step)
- {
- for (l = 0.0 - area; l < area; l += step)
- {
- avgsteps++;
- average += TerrainUtil.GetBilinearInterpolate(x + n, y + l, map);
- }
- }
- tweak[x, y] = average / avgsteps;
- }
- }
- }
- // blend in map
- for (x = 0; x < map.Width; x++)
- {
- for (y = 0; y < map.Height; y++)
- {
- double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-
- if (z > 0) // add in non-zero amount
- {
- double da = z;
- double a = (map[x, y] - tweak[x, y]) * da;
- double newz = map[x, y] - (a * duration);
-
- if (newz > 0.0)
- map[x, y] = newz;
- }
- }
- }
- }
-
- #endregion
- }
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+ public class SmoothSphere : ITerrainPaintableEffect
+ {
+ #region ITerrainPaintableEffect Members
+
+ public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+ {
+ strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+ int x, y;
+ double[,] tweak = new double[map.Width,map.Height];
+
+ double n, l;
+ double area = strength;
+ double step = strength / 4.0;
+
+ // compute delta map
+ for (x = 0; x < map.Width; x++)
+ {
+ for (y = 0; y < map.Height; y++)
+ {
+ double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
+
+ if (z > 0) // add in non-zero amount
+ {
+ double average = 0.0;
+ int avgsteps = 0;
+
+ for (n = 0.0 - area; n < area; n += step)
+ {
+ for (l = 0.0 - area; l < area; l += step)
+ {
+ avgsteps++;
+ average += TerrainUtil.GetBilinearInterpolate(x + n, y + l, map);
+ }
+ }
+ tweak[x, y] = average / avgsteps;
+ }
+ }
+ }
+ // blend in map
+ for (x = 0; x < map.Width; x++)
+ {
+ for (y = 0; y < map.Height; y++)
+ {
+ double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
+
+ if (z > 0) // add in non-zero amount
+ {
+ double da = z;
+ double a = (map[x, y] - tweak[x, y]) * da;
+ double newz = map[x, y] - (a * duration);
+
+ if (newz > 0.0)
+ map[x, y] = newz;
+ }
+ }
+ }
+ }
+
+ #endregion
+ }
}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
index 2d81054..b48beb8 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
@@ -1,207 +1,207 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
- ///
- /// Thermal Weathering Paint Brush
- ///
- public class WeatherSphere : ITerrainPaintableEffect
- {
- private double talus = 0.2; // Number of meters max difference before stop eroding. Tweakage required.
- private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
-
- #region Supporting Functions
-
- private int[] Neighbours(NeighbourSystem type, int index)
- {
- int[] coord = new int[2];
-
- index++;
-
- switch (type)
- {
- case NeighbourSystem.Moore:
- switch (index)
- {
- case 1:
- coord[0] = -1;
- coord[1] = -1;
- break;
-
- case 2:
- coord[0] = -0;
- coord[1] = -1;
- break;
-
- case 3:
- coord[0] = +1;
- coord[1] = -1;
- break;
-
- case 4:
- coord[0] = -1;
- coord[1] = -0;
- break;
-
- case 5:
- coord[0] = -0;
- coord[1] = -0;
- break;
-
- case 6:
- coord[0] = +1;
- coord[1] = -0;
- break;
-
- case 7:
- coord[0] = -1;
- coord[1] = +1;
- break;
-
- case 8:
- coord[0] = -0;
- coord[1] = +1;
- break;
-
- case 9:
- coord[0] = +1;
- coord[1] = +1;
- break;
-
- default:
- break;
- }
- break;
-
- case NeighbourSystem.VonNeumann:
- switch (index)
- {
- case 1:
- coord[0] = 0;
- coord[1] = -1;
- break;
-
- case 2:
- coord[0] = -1;
- coord[1] = 0;
- break;
-
- case 3:
- coord[0] = +1;
- coord[1] = 0;
- break;
-
- case 4:
- coord[0] = 0;
- coord[1] = +1;
- break;
-
- case 5:
- coord[0] = -0;
- coord[1] = -0;
- break;
-
- default:
- break;
- }
- break;
- }
-
- return coord;
- }
-
- private enum NeighbourSystem
- {
- Moore,
- VonNeumann
- } ;
-
- #endregion
-
- #region ITerrainPaintableEffect Members
-
- public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
- {
- strength = TerrainUtil.MetersToSphericalStrength(strength);
-
- int x, y;
-
- for (x = 0; x < map.Width; x++)
- {
- for (y = 0; y < map.Height; y++)
- {
- double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-
- if (z > 0) // add in non-zero amount
- {
- int NEIGHBOUR_ME = 4;
-
- int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
-
- for (int j = 0; j < NEIGHBOUR_MAX; j++)
- {
- if (j != NEIGHBOUR_ME)
- {
- int[] coords = Neighbours(type, j);
-
- coords[0] += x;
- coords[1] += y;
-
- if (coords[0] > map.Width - 1)
- continue;
- if (coords[1] > map.Height - 1)
- continue;
- if (coords[0] < 0)
- continue;
- if (coords[1] < 0)
- continue;
-
- double heightF = map[x, y];
- double target = map[coords[0], coords[1]];
-
- if (target > heightF + talus)
- {
- double calc = duration * ((target - heightF) - talus) * z;
- heightF += calc;
- target -= calc;
- }
-
- map[x, y] = heightF;
- map[coords[0], coords[1]] = target;
- }
- }
- }
- }
- }
- }
-
- #endregion
- }
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+ ///
+ /// Thermal Weathering Paint Brush
+ ///
+ public class WeatherSphere : ITerrainPaintableEffect
+ {
+ private double talus = 0.2; // Number of meters max difference before stop eroding. Tweakage required.
+ private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
+
+ #region Supporting Functions
+
+ private int[] Neighbours(NeighbourSystem type, int index)
+ {
+ int[] coord = new int[2];
+
+ index++;
+
+ switch (type)
+ {
+ case NeighbourSystem.Moore:
+ switch (index)
+ {
+ case 1:
+ coord[0] = -1;
+ coord[1] = -1;
+ break;
+
+ case 2:
+ coord[0] = -0;
+ coord[1] = -1;
+ break;
+
+ case 3:
+ coord[0] = +1;
+ coord[1] = -1;
+ break;
+
+ case 4:
+ coord[0] = -1;
+ coord[1] = -0;
+ break;
+
+ case 5:
+ coord[0] = -0;
+ coord[1] = -0;
+ break;
+
+ case 6:
+ coord[0] = +1;
+ coord[1] = -0;
+ break;
+
+ case 7:
+ coord[0] = -1;
+ coord[1] = +1;
+ break;
+
+ case 8:
+ coord[0] = -0;
+ coord[1] = +1;
+ break;
+
+ case 9:
+ coord[0] = +1;
+ coord[1] = +1;
+ break;
+
+ default:
+ break;
+ }
+ break;
+
+ case NeighbourSystem.VonNeumann:
+ switch (index)
+ {
+ case 1:
+ coord[0] = 0;
+ coord[1] = -1;
+ break;
+
+ case 2:
+ coord[0] = -1;
+ coord[1] = 0;
+ break;
+
+ case 3:
+ coord[0] = +1;
+ coord[1] = 0;
+ break;
+
+ case 4:
+ coord[0] = 0;
+ coord[1] = +1;
+ break;
+
+ case 5:
+ coord[0] = -0;
+ coord[1] = -0;
+ break;
+
+ default:
+ break;
+ }
+ break;
+ }
+
+ return coord;
+ }
+
+ private enum NeighbourSystem
+ {
+ Moore,
+ VonNeumann
+ } ;
+
+ #endregion
+
+ #region ITerrainPaintableEffect Members
+
+ public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+ {
+ strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+ int x, y;
+
+ for (x = 0; x < map.Width; x++)
+ {
+ for (y = 0; y < map.Height; y++)
+ {
+ double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
+
+ if (z > 0) // add in non-zero amount
+ {
+ int NEIGHBOUR_ME = 4;
+
+ int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
+
+ for (int j = 0; j < NEIGHBOUR_MAX; j++)
+ {
+ if (j != NEIGHBOUR_ME)
+ {
+ int[] coords = Neighbours(type, j);
+
+ coords[0] += x;
+ coords[1] += y;
+
+ if (coords[0] > map.Width - 1)
+ continue;
+ if (coords[1] > map.Height - 1)
+ continue;
+ if (coords[0] < 0)
+ continue;
+ if (coords[1] < 0)
+ continue;
+
+ double heightF = map[x, y];
+ double target = map[coords[0], coords[1]];
+
+ if (target > heightF + talus)
+ {
+ double calc = duration * ((target - heightF) - talus) * z;
+ heightF += calc;
+ target -= calc;
+ }
+
+ map[x, y] = heightF;
+ map[coords[0], coords[1]] = target;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ #endregion
+ }
}
\ No newline at end of file
--
cgit v1.1