* New terrainmodule paint brush "Olsen Erosion"
* Implements the Optimised Erosion routine defined by Jacob Olsen in the paper 'Procedural Terrain Generation' (http://www.oddlabs.com/download/terrain_generation.pdf) * Replaces the 'flatten' brush when 'newbrushes' is enabled.0.6.0-stable
Adam Frisby
parent
13a4d13d67
commit
b46b152954
|
|
@ -0,0 +1,223 @@
|
||||||
|
/*
|
||||||
|
* 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;
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Speed-Optimised Hybrid Erosion Brush
|
||||||
|
///
|
||||||
|
/// As per Jacob Olsen's Paper
|
||||||
|
/// http://www.oddlabs.com/download/terrain_generation.pdf
|
||||||
|
/// </summary>
|
||||||
|
public class OlsenSphere : ITerrainPaintableEffect
|
||||||
|
{
|
||||||
|
NeighbourSystem type = NeighbourSystem.Moore; // Parameter
|
||||||
|
|
||||||
|
double nConst = 256.0;
|
||||||
|
|
||||||
|
#region Supporting Functions
|
||||||
|
private enum NeighbourSystem
|
||||||
|
{
|
||||||
|
Moore,
|
||||||
|
VonNeumann
|
||||||
|
} ;
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region ITerrainPaintableEffect Members
|
||||||
|
|
||||||
|
public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
|
||||||
|
{
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -336,6 +336,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
|
||||||
if (Boolean.Parse(param))
|
if (Boolean.Parse(param))
|
||||||
{
|
{
|
||||||
m_painteffects[StandardTerrainEffects.Revert] = new PaintBrushes.WeatherSphere();
|
m_painteffects[StandardTerrainEffects.Revert] = new PaintBrushes.WeatherSphere();
|
||||||
|
m_painteffects[StandardTerrainEffects.Flatten] = new PaintBrushes.OlsenSphere();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue