From f5c312bc3c2567449c7268a54a08a54119f58d53 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 30 Apr 2008 21:16:36 +0000
Subject: * Refactored Environment/Modules directory - modules now reside in
their own directory with any associated module-specific classes. * Each
module directory is currently inside one of the following category folders:
Agent (Anything relating to do with Client<->Server communications.), Avatar
(Anything to do with the avatar or presence inworld), Framework (Classes
modules can use), Grid (Grid traffic, new OGS2 grid comms), Scripting
(Scripting functions, etc), World (The enrivonment/scene, IE Sun/Tree
modules.) * This should be moved into a seperate project file.
---
.../Modules/Terrain/PaintBrushes/ErodeSphere.cs | 312 ---------------------
.../Modules/Terrain/PaintBrushes/FlattenSphere.cs | 127 ---------
.../Modules/Terrain/PaintBrushes/LowerSphere.cs | 67 -----
.../Modules/Terrain/PaintBrushes/NoiseSphere.cs | 70 -----
.../Modules/Terrain/PaintBrushes/OlsenSphere.cs | 225 ---------------
.../Modules/Terrain/PaintBrushes/RaiseSphere.cs | 67 -----
.../Modules/Terrain/PaintBrushes/RevertSphere.cs | 82 ------
.../Modules/Terrain/PaintBrushes/SmoothSphere.cs | 93 ------
.../Modules/Terrain/PaintBrushes/WeatherSphere.cs | 207 --------------
9 files changed, 1250 deletions(-)
delete mode 100644 OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/ErodeSphere.cs
delete mode 100644 OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
delete mode 100644 OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs
delete mode 100644 OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs
delete mode 100644 OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/OlsenSphere.cs
delete mode 100644 OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs
delete mode 100644 OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RevertSphere.cs
delete mode 100644 OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs
delete mode 100644 OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs
(limited to 'OpenSim/Region/Environment/Modules/Terrain/PaintBrushes')
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/ErodeSphere.cs
deleted file mode 100644
index cfb1f60..0000000
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/ErodeSphere.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * 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.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/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
deleted file mode 100644
index d907ed2..0000000
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.Terrain.PaintBrushes
-{
- public class FlattenSphere : ITerrainPaintableEffect
- {
-// TODO: unused
-// private double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
-// {
-// int w = map.Width;
-// int h = map.Height;
-
-// if (x > w - 2.0)
-// x = w - 2.0;
-// if (y > h - 2.0)
-// y = h - 2.0;
-// if (x < 0.0)
-// x = 0.0;
-// if (y < 0.0)
-// y = 0.0;
-
-// int stepSize = 1;
-// double h00 = map[(int)x, (int)y];
-// double h10 = map[(int)x + stepSize, (int)y];
-// double h01 = map[(int)x, (int)y + stepSize];
-// double h11 = map[(int)x + stepSize, (int)y + stepSize];
-// double h1 = h00;
-// double h2 = h10;
-// double h3 = h01;
-// double h4 = h11;
-// double a00 = h1;
-// double a10 = h2 - h1;
-// double a01 = h3 - h1;
-// double a11 = h1 - h2 - h3 + h4;
-// double partialx = x - (int)x;
-// double partialz = y - (int)y;
-// double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
-// return hi;
-// }
-
- #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/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs
deleted file mode 100644
index ead1a49..0000000
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.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/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs
deleted file mode 100644
index e3babbf..0000000
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.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/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/OlsenSphere.cs
deleted file mode 100644
index 153fc15..0000000
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/OlsenSphere.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * 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.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/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs
deleted file mode 100644
index 8d61a7e..0000000
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.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/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RevertSphere.cs
deleted file mode 100644
index ee0edb5..0000000
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RevertSphere.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.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/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs
deleted file mode 100644
index 86a01cc..0000000
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.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/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs
deleted file mode 100644
index f46ba8f..0000000
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * 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.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