From 7c897043bab19bf748ac3078a05a74969c409fa7 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 23 Apr 2008 10:55:04 +0000
Subject: * Removing old libTerrainBSD and associated Plugin & Project. *
Updated prebuild.xml accordingly.
---
.../libTerrainBSD/Bitmap/Bitmap.cs | 85 -----
.../libTerrainBSD/Channel/Channel.cs | 59 ----
.../libTerrainBSD/Channel/Common.cs | 281 ---------------
.../libTerrainBSD/Channel/Editing/Flatten.cs | 141 --------
.../libTerrainBSD/Channel/Editing/Raise.cs | 191 -----------
.../libTerrainBSD/Channel/File.cs | 75 ----
.../libTerrainBSD/Channel/Generators/Cellular.cs | 28 --
.../libTerrainBSD/Channel/Generators/Fracture.cs | 142 --------
.../libTerrainBSD/Channel/Generators/Gradient.cs | 60 ----
.../Channel/Generators/HillPlanter.cs | 281 ---------------
.../libTerrainBSD/Channel/Generators/Midpoint.cs | 28 --
.../libTerrainBSD/Channel/Generators/Mountain.cs | 28 --
.../libTerrainBSD/Channel/Generators/Noise.cs | 53 ---
.../libTerrainBSD/Channel/Generators/Spiral.cs | 156 ---------
.../libTerrainBSD/Channel/Generators/Voronoi.cs | 211 ------------
.../libTerrainBSD/Channel/Generators/Worms.cs | 71 ----
.../libTerrainBSD/Channel/Grid.cs | 376 ---------------------
.../Channel/Manipulators/AerobicErosion.cs | 211 ------------
.../Channel/Manipulators/HydraulicErosion.cs | 144 --------
.../Channel/Manipulators/NavierStokes.cs | 307 -----------------
.../Channel/Manipulators/ThermalWeathering.cs | 107 ------
.../libTerrainBSD/Channel/Neighbours.cs | 136 --------
.../libTerrainBSD/Channel/Operators.cs | 239 -------------
.../libTerrainBSD/Tools/Point2D.cs | 41 ---
.../libTerrainBSD/Tools/Tools.cs | 59 ----
25 files changed, 3510 deletions(-)
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Common.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Raise.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/File.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Cellular.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Gradient.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/HillPlanter.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Midpoint.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Mountain.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Noise.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Spiral.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Worms.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/NavierStokes.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Neighbours.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Point2D.cs
delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Tools.cs
(limited to 'OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD')
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs
deleted file mode 100644
index 6bb717a..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs
+++ /dev/null
@@ -1,85 +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.Drawing;
-using System.Drawing.Imaging;
-
-namespace libTerrain
-{
- internal class Raster
- {
- private Bitmap bmp;
-
- ///
- /// Creates a new Raster channel for use with bitmap or GDI functions
- ///
- /// Width in pixels
- /// Height in pixels
- public Raster(int width, int height)
- {
- bmp = new Bitmap(width, height, PixelFormat.Format24bppRgb);
- }
-
- ///
- /// Converts a raster image to a channel by averaging the RGB values to a single 0..1 heightmap
- ///
- /// A libTerrain Channel
- public Channel ToChannel()
- {
- Channel chan = new Channel(bmp.Width, bmp.Height);
-
- int x, y;
- for (x = 0; x < bmp.Width; x++)
- {
- for (y = 0; y < bmp.Height; y++)
- {
- Color val = bmp.GetPixel(x, y);
- chan.map[x, y] = (((double) val.R + (double) val.G + (double) val.B)/3.0)/255.0;
- }
- }
-
- return chan;
- }
-
- ///
- /// Draws a piece of text into the specified raster
- ///
- /// The text string to print
- /// The font to use to draw the specified image
- /// Font size (points) to use
- public void DrawText(string txt, string font, double size)
- {
- Rectangle area = new Rectangle(0, 0, 256, 256);
- StringFormat sf = new StringFormat();
- sf.Alignment = StringAlignment.Center;
- sf.LineAlignment = StringAlignment.Center;
-
- Graphics gd = Graphics.FromImage(bmp);
- gd.DrawString(txt, new Font(font, (float) size), new SolidBrush(Color.White), area, sf);
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs
deleted file mode 100644
index b19a788..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs
+++ /dev/null
@@ -1,59 +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.
- */
-
-/* Channel
- * A channel is a single heightmap array
- * */
-
-namespace libTerrain
-{
- partial class Channel
- {
- public double[,] map;
- public int[,] diff;
- public int w;
- public int h;
-
- public int seed = 1338; // One better than 1337
-
- public Channel()
- {
- w = 256;
- h = 256;
- map = new double[w,h];
- diff = new int[(int) (w/16),(int) (h/16)];
- }
-
- public Channel(int width, int height)
- {
- w = width;
- h = height;
- map = new double[w,h];
- diff = new int[(int) (w/16),(int) (h/16)];
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Common.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Common.cs
deleted file mode 100644
index 0c71ed8..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Common.cs
+++ /dev/null
@@ -1,281 +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;
-
-namespace libTerrain
-{
- public partial class Channel
- {
- public int GetWidth()
- {
- return w;
- }
-
- public int GetHeight()
- {
- return h;
- }
-
- public Channel Copy()
- {
- Channel x = new Channel(w, h);
- x.map = (double[,]) map.Clone();
- return x;
- }
-
- public void SetDiff()
- {
- SetDiff(1);
- }
-
- public void SetDiff(int val)
- {
- for (int x = 0; x < w/16; x++)
- {
- for (int y = 0; y < h/16; y++)
- {
- diff[x, y] = val;
- }
- }
- }
-
- public void SetDiff(int x, int y)
- {
- diff[x/16, y/16]++;
- }
-
- public void Set(int x, int y, double val)
- {
- if (x >= w)
- throw new Exception("Bounds error while setting pixel (width)");
- if (y >= h)
- throw new Exception("Bounds error while setting pixel (height)");
- if (x < 0)
- throw new Exception("Bounds error while setting pixel (width)");
- if (y < 0)
- throw new Exception("Bounds error while setting pixel (height)");
-
- if (map[x, y] != val)
- {
- SetDiff(x, y);
-
- map[x, y] = val;
- }
- }
-
- public void SetClip(int x, int y, double val)
- {
- SetDiff(x, y);
-
- if (x >= w)
- throw new Exception("Bounds error while setting pixel (width)");
- if (y >= h)
- throw new Exception("Bounds error while setting pixel (height)");
- if (x < 0)
- throw new Exception("Bounds error while setting pixel (width)");
- if (y < 0)
- throw new Exception("Bounds error while setting pixel (height)");
-
- if (val > 1.0)
- val = 1.0;
- if (val < 0.0)
- val = 0.0;
-
- map[x, y] = val;
- }
-
- private double GetBilinearInterpolate(double x, double y)
- {
- 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 = Get((int) x, (int) y);
- double h10 = Get((int) x + stepSize, (int) y);
- double h01 = Get((int) x, (int) y + stepSize);
- double h11 = Get((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;
- }
-
- public double Get(int x, int y)
- {
- try
- {
- return map[x, y];
- }
- catch (IndexOutOfRangeException)
- {
- if (x >= w)
- x = w - 1;
- if (y >= h)
- y = h - 1;
- if (x < 0)
- x = 0;
- if (y < 0)
- y = 0;
- return map[x, y];
- }
- }
-
- public void SetWrap(int x, int y, double val)
- {
- SetDiff(x, y);
-
- map[x%w, y%h] = val;
- }
-
- public void SetWrapClip(int x, int y, double val)
- {
- SetDiff(x, y);
-
- if (val > 1.0)
- val = 1.0;
- if (val < 0.0)
- val = 0.0;
-
- map[x%w, y%h] = val;
- }
-
- public void Fill(double val)
- {
- SetDiff();
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = val;
- }
- }
- }
-
- public void Fill(double min, double max, double val)
- {
- SetDiff();
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (map[x, y] >= min && map[x, y] <= max)
- map[x, y] = val;
- }
- }
- }
-
- public double FindMax()
- {
- int x, y;
- double max = double.MinValue;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (map[x, y] > max)
- max = map[x, y];
- }
- }
-
- return max;
- }
-
- public double FindMin()
- {
- int x, y;
- double min = double.MaxValue;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (map[x, y] < min)
- min = map[x, y];
- }
- }
-
- return min;
- }
-
- public double Sum()
- {
- int x, y;
- double sum = 0.0;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- sum += map[x, y];
- }
- }
-
- return sum;
- }
-
- public double Avg()
- {
- return Sum()/(w*h);
- }
-
- public bool ContainsNaN()
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double elm = map[x, y];
-
- if (Double.IsNaN(elm))
- return true;
- }
- }
- return false;
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs
deleted file mode 100644
index 7162758..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs
+++ /dev/null
@@ -1,141 +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.
- */
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Flattens the area underneath rx,ry by moving it to the average of the area. Uses a spherical mask provided by the raise() function.
- ///
- /// The X coordinate of the terrain mask
- /// The Y coordinate of the terrain mask
- /// The size of the terrain mask
- /// The scale of the terrain mask
- public void Flatten(double rx, double ry, double size, double amount)
- {
- FlattenSlow(rx, ry, size, amount);
- }
-
- private void FlattenSlow(double rx, double ry, double size, double amount)
- {
- // Generate the mask
- Channel temp = new Channel(w, h);
- temp.Fill(0);
- temp.Raise(rx, ry, size, amount);
- temp.Normalise();
- double total_mod = temp.Sum();
-
- // Establish the average height under the area
- Channel newmap = new Channel(w, h);
- newmap.map = (double[,]) map.Clone();
-
- newmap *= temp;
-
- double total_terrain = newmap.Sum();
- double avg_height = total_terrain/total_mod;
-
- // Create a flat terrain using the average height
- Channel flat = new Channel(w, h);
- flat.Fill(avg_height);
-
- // Blend the current terrain with the average height terrain
- // using the "raised" empty terrain as a mask
- Blend(flat, temp);
- }
-
-// TODO: unused
-// private void FlattenFast(double rx, double ry, double size, double amount)
-// {
-// int x, y;
-// double avg = 0;
-// double div = 0;
-
-// int minX = Math.Max(0, (int) (rx - (size + 1)));
-// int maxX = Math.Min(w, (int) (rx + (size + 1)));
-// int minY = Math.Max(0, (int) (ry - (size + 1)));
-// int maxY = Math.Min(h, (int) (ry + (size + 1)));
-
-// for (x = minX; x < maxX; x++)
-// {
-// for (y = minY; y < maxY; y++)
-// {
-// double z = size;
-// z *= z;
-// z -= ((x - rx)*(x - rx)) + ((y - ry)*(y - ry));
-
-// if (z < 0)
-// z = 0;
-
-// avg += z*amount;
-// div += z;
-// }
-// }
-
-// double height = avg/div;
-
-// for (x = minX; x < maxX; x++)
-// {
-// for (y = minY; y < maxY; y++)
-// {
-// double z = size;
-// z *= z;
-// z -= ((x - rx)*(x - rx)) + ((y - ry)*(y - ry));
-
-// if (z > 0.0)
-// Set(x, y, Tools.LinearInterpolate(map[x, y], height, z));
-// }
-// }
-// }
-
- public void Flatten(Channel mask, double amount)
- {
- // Generate the mask
- Channel temp = mask*amount;
- temp.Clip(0, 1); // Cut off out-of-bounds values
-
- double total_mod = temp.Sum();
-
- // Establish the average height under the area
- Channel map = new Channel(w, h);
- map.map = (double[,]) this.map.Clone();
-
- map *= temp;
-
- double total_terrain = map.Sum();
- double avg_height = total_terrain/total_mod;
-
- // Create a flat terrain using the average height
- Channel flat = new Channel(w, h);
- flat.Fill(avg_height);
-
- // Blend the current terrain with the average height terrain
- // using the "raised" empty terrain as a mask
- Blend(flat, temp);
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Raise.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Raise.cs
deleted file mode 100644
index 465005a..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Raise.cs
+++ /dev/null
@@ -1,191 +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;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Raises land around the selection
- ///
- /// The center the X coordinate of where you wish to raise the land
- /// The center the Y coordinate of where you wish to raise the land
- /// The radius of the dimple
- /// How much impact to add to the terrain (0..2 usually)
- public void Raise(double rx, double ry, double size, double amount)
- {
- RaiseSphere(rx, ry, size, amount);
- }
-
- ///
- /// Raises land in a sphere around the selection
- ///
- /// The center the X coordinate of where you wish to raise the land
- /// The center the Y coordinate of where you wish to raise the land
- /// The radius of the sphere dimple
- /// How much impact to add to the terrain (0..2 usually)
- public void RaiseSphere(double rx, double ry, double size, double amount)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double z = size;
- z *= z;
- z -= ((x - rx)*(x - rx)) + ((y - ry)*(y - ry));
-
- if (z > 0.0)
- Set(x, y, map[x, y] + (z * amount));
- }
- }
- }
-
- ///
- /// Raises land in a cone around the selection
- ///
- /// The center the X coordinate of where you wish to raise the land
- /// The center the Y coordinate of where you wish to raise the land
- /// The radius of the cone
- /// How much impact to add to the terrain (0..2 usually)
- public void RaiseCone(double rx, double ry, double size, double amount)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double z = size;
- z -= Math.Sqrt(((x - rx)*(x - rx)) + ((y - ry)*(y - ry)));
-
- if (z > 0.0)
- Set(x, y, map[x, y] + (z * amount));
- }
- }
- }
-
- ///
- /// Lowers land in a sphere around the selection
- ///
- /// The center the X coordinate of where you wish to lower the land
- /// The center the Y coordinate of where you wish to lower the land
- /// The radius of the sphere dimple
- /// How much impact to remove from the terrain (0..2 usually)
- public void Lower(double rx, double ry, double size, double amount)
- {
- LowerSphere(rx, ry, size, amount);
- }
-
- ///
- /// Lowers land in a sphere around the selection
- ///
- /// The center the X coordinate of where you wish to lower the land
- /// The center the Y coordinate of where you wish to lower the land
- /// The radius of the sphere dimple
- /// How much impact to remove from the terrain (0..2 usually)
- public void LowerSphere(double rx, double ry, double size, double amount)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double z = size;
- z *= z;
- z -= ((x - rx)*(x - rx)) + ((y - ry)*(y - ry));
-
- if (z > 0.0)
- Set(x, y, map[x, y] - (z * amount));
- }
- }
- }
-
- public 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;
- }
-
- public void SmoothRegion(double rx, double ry, double size, double amount)
- {
- int x, y;
- double[,] tweak = new double[w, h];
-
- double n, l;
- double area = size;
- double step = size / 4.0;
-
- // compute delta map
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double z = SphericalFactor(x, y, rx, ry, size);
-
- 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 += GetBilinearInterpolate(x + n, y + l);
- }
- }
- tweak[x, y] = average / avgsteps;
- //if (x == rx && y == ry)
- // Console.WriteLine("tweak[ " + x + " , " + y + " ] = " + tweak[x, y]);
- }
- }
- }
- // blend in map
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double z = SphericalFactor(x, y, rx, ry, size);
-
- if (z > 0) // add in non-zero amount
- {
- double da = z * amount;
- double a = (map[x, y] - tweak[x, y]) * da;
- double newz = map[x, y] - a;
- //if (rx == x || ry == y)
- // Console.WriteLine("map[ " + x + " , " + y + " ] = " + map[x, y] + " tweak, a , da, z, size, amount = " + tweak[x, y] + " " + a + " " + da + " " + z + " " + size + " " + amount);
- if (newz > 0.0)
- Set(x, y, newz);
- }
- }
- }
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/File.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/File.cs
deleted file mode 100644
index 84eca54..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/File.cs
+++ /dev/null
@@ -1,75 +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 System.Drawing;
-using System.Drawing.Imaging;
-
-namespace libTerrain
-{
- partial class Channel
- {
- public Channel LoadImage(string filename)
- {
- SetDiff();
-
- Bitmap bit = new Bitmap(filename);
- Channel chan = new Channel(bit.Width, bit.Height);
-
- int x, y;
- for (x = 0; x < bit.Width; x++)
- {
- for (y = 0; y < bit.Height; y++)
- {
- Color val = bit.GetPixel(x, y);
- chan.map[x, y] = (((double) val.R + (double) val.G + (double) val.B)/3.0)/255.0;
- }
- }
-
- return chan;
- }
-
- public void SaveImage(string filename)
- {
- Channel outmap = Copy();
- outmap.Normalise();
-
- Bitmap bit = new Bitmap(w, h, PixelFormat.Format24bppRgb);
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- int val = Math.Min(255, (int) (outmap.map[x, y]*255));
- Color col = Color.FromArgb(val, val, val);
- bit.SetPixel(x, y, col);
- }
- }
- bit.Save(filename);
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Cellular.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Cellular.cs
deleted file mode 100644
index 06e7e3c..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Cellular.cs
+++ /dev/null
@@ -1,28 +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.
- */
-
-/* TODO: Needs BSD rewrite */
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs
deleted file mode 100644
index 3e1c34c..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs
+++ /dev/null
@@ -1,142 +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;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Produces a set of coordinates defined by an edge point. Eg - 0 = 0,0. 256 = 0,256. 512 = 256,256
- /// Assumes a 256^2 heightmap. This needs fixing for input values of w,h
- ///
- ///
- ///
- ///
- ///
- private int[] RadialEdge256(int val)
- {
- // Four cases:
- // 1. 000..255 return 0,val
- // 2. 256..511 return val - 256,255
- // 3. 512..767 return 255, val - 511
- // 4. 768..1023 return val - 768,0
-
- int[] ret = new int[2];
-
- if (val < 256)
- {
- ret[0] = 0;
- ret[1] = val;
- return ret;
- }
- if (val < 512)
- {
- ret[0] = (val%256);
- ret[1] = 255;
- return ret;
- }
- if (val < 768)
- {
- ret[0] = 255;
- ret[1] = 255 - (val%256);
- return ret;
- }
- if (val < 1024)
- {
- ret[0] = 255 - (val%256);
- ret[1] = 255;
- return ret;
- }
-
- throw new Exception("Out of bounds parameter (val)");
- }
-
- public void Fracture(int number, double scalemin, double scalemax)
- {
- SetDiff();
-
- Random rand = new Random(seed);
-
- for (int i = 0; i < number; i++)
- {
- int[] a, b;
-
- a = RadialEdge256(rand.Next(1023)); // TODO: Broken
- b = RadialEdge256(rand.Next(1023)); // TODO: Broken
- double z = rand.NextDouble();
- double u = rand.NextDouble();
- double v = rand.NextDouble();
-
- for (int x = 0; x < w; x++)
- {
- for (int y = 0; y < h; y++)
- {
- double miny = Tools.LinearInterpolate(a[1], b[1], (double) x/(double) w);
-
- if (v >= 0.5)
- {
- if (u >= 0.5)
- {
- if (y > miny)
- {
- map[x, y] += Tools.LinearInterpolate(scalemin, scalemax, z);
- }
- }
- else
- {
- if (y < miny)
- {
- map[x, y] += Tools.LinearInterpolate(scalemin, scalemax, z);
- }
- }
- }
- else
- {
- if (u >= 0.5)
- {
- if (x > miny)
- {
- map[x, y] += Tools.LinearInterpolate(scalemin, scalemax, z);
- }
- }
- else
- {
- if (x < miny)
- {
- map[x, y] += Tools.LinearInterpolate(scalemin, scalemax, z);
- }
- }
- }
- }
- }
- }
- Normalise();
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Gradient.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Gradient.cs
deleted file mode 100644
index afe0877..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Gradient.cs
+++ /dev/null
@@ -1,60 +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.
- */
-
-namespace libTerrain
-{
- partial class Channel
- {
- public void GradientCube()
- {
- SetDiff();
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = x*y;
- }
- }
- Normalise();
- }
-
- public void GradientStripe()
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = x;
- }
- }
- Normalise();
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/HillPlanter.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/HillPlanter.cs
deleted file mode 100644
index 82b0cfd..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/HillPlanter.cs
+++ /dev/null
@@ -1,281 +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;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Generates a series of spheres which are then either max()'d or added together. Inspired by suggestion from jh.
- ///
- /// 3-Clause BSD Licensed
- /// The number of hills to generate
- /// The minimum size of each hill
- /// The maximum size of each hill
- /// Whether to bias hills towards the center of the map
- /// Whether to add hills together or to pick the largest value
- /// Generates hill-shaped noise instead of consistent hills
- public void HillsSpheres(int number, double scale_min, double scale_range, bool island, bool additive,
- bool noisy)
- {
- SetDiff();
-
- Random random = new Random(seed);
-
- int x, y;
- int i;
-
- for (i = 0; i < number; i++)
- {
- double rx = Math.Min(255.0, random.NextDouble()*w);
- double ry = Math.Min(255.0, random.NextDouble()*h);
- double rand = random.NextDouble();
-
- if (island)
- {
- // Move everything towards the center
- rx -= w/2;
- rx /= 2;
- rx += w/2;
-
- ry -= h/2;
- ry /= 2;
- ry += h/2;
- }
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (noisy)
- rand = random.NextDouble();
-
- double z = (scale_min + (scale_range*rand));
- z *= z;
- z -= ((x - rx)*(x - rx)) + ((y - ry)*(y - ry));
-
- if (z < 0)
- z = 0;
-
- if (additive)
- {
- map[x, y] += z;
- }
- else
- {
- map[x, y] = Math.Max(map[x, y], z);
- }
- }
- }
- }
-
- Normalise();
- }
-
- ///
- /// Generates a series of cones which are then either max()'d or added together. Inspired by suggestion from jh.
- ///
- /// 3-Clause BSD Licensed
- /// The number of hills to generate
- /// The minimum size of each hill
- /// The maximum size of each hill
- /// Whether to bias hills towards the center of the map
- /// Whether to add hills together or to pick the largest value
- /// Generates hill-shaped noise instead of consistent hills
- public void HillsCones(int number, double scale_min, double scale_range, bool island, bool additive, bool noisy)
- {
- SetDiff();
-
- Random random = new Random(seed);
-
- int x, y;
- int i;
-
- for (i = 0; i < number; i++)
- {
- double rx = Math.Min(255.0, random.NextDouble()*w);
- double ry = Math.Min(255.0, random.NextDouble()*h);
- double rand = random.NextDouble();
-
- if (island)
- {
- // Move everything towards the center
- rx -= w/2;
- rx /= 2;
- rx += w/2;
-
- ry -= h/2;
- ry /= 2;
- ry += h/2;
- }
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (noisy)
- rand = random.NextDouble();
-
- double z = (scale_min + (scale_range*rand));
- z -= Math.Sqrt(((x - rx)*(x - rx)) + ((y - ry)*(y - ry)));
-
- if (z < 0)
- z = 0;
-
- if (additive)
- {
- map[x, y] += z;
- }
- else
- {
- map[x, y] = Math.Max(map[x, y], z);
- }
- }
- }
- }
-
- Normalise();
- }
-
- public void HillsBlocks(int number, double scale_min, double scale_range, bool island, bool additive, bool noisy)
- {
- SetDiff();
-
- Random random = new Random(seed);
-
- int x, y;
- int i;
-
- for (i = 0; i < number; i++)
- {
- double rx = Math.Min(255.0, random.NextDouble()*w);
- double ry = Math.Min(255.0, random.NextDouble()*h);
- double rand = random.NextDouble();
-
- if (island)
- {
- // Move everything towards the center
- rx -= w/2;
- rx /= 2;
- rx += w/2;
-
- ry -= h/2;
- ry /= 2;
- ry += h/2;
- }
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (noisy)
- rand = random.NextDouble();
-
- double z = (scale_min + (scale_range*rand));
- z -= Math.Abs(x - rx) + Math.Abs(y - ry);
- //z -= Math.Sqrt(((x - rx) * (x - rx)) + ((y - ry) * (y - ry)));
-
- if (z < 0)
- z = 0;
-
- if (additive)
- {
- map[x, y] += z;
- }
- else
- {
- map[x, y] = Math.Max(map[x, y], z);
- }
- }
- }
- }
-
- Normalise();
- }
-
- public void HillsSquared(int number, double scale_min, double scale_range, bool island, bool additive,
- bool noisy)
- {
- SetDiff();
-
- Random random = new Random(seed);
-
- int x, y;
- int i;
-
- for (i = 0; i < number; i++)
- {
- double rx = Math.Min(255.0, random.NextDouble()*w);
- double ry = Math.Min(255.0, random.NextDouble()*h);
- double rand = random.NextDouble();
-
- if (island)
- {
- // Move everything towards the center
- rx -= w/2;
- rx /= 2;
- rx += w/2;
-
- ry -= h/2;
- ry /= 2;
- ry += h/2;
- }
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (noisy)
- rand = random.NextDouble();
-
- double z = (scale_min + (scale_range*rand));
- z *= z*z*z;
- double dx = Math.Abs(x - rx);
- double dy = Math.Abs(y - ry);
- z -= (dx*dx*dx*dx) + (dy*dy*dy*dy);
-
- if (z < 0)
- z = 0;
-
- if (additive)
- {
- map[x, y] += z;
- }
- else
- {
- map[x, y] = Math.Max(map[x, y], z);
- }
- }
- }
- }
-
- Normalise();
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Midpoint.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Midpoint.cs
deleted file mode 100644
index 06e7e3c..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Midpoint.cs
+++ /dev/null
@@ -1,28 +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.
- */
-
-/* TODO: Needs BSD rewrite */
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Mountain.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Mountain.cs
deleted file mode 100644
index 06e7e3c..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Mountain.cs
+++ /dev/null
@@ -1,28 +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.
- */
-
-/* TODO: Needs BSD rewrite */
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Noise.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Noise.cs
deleted file mode 100644
index 10e8160..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Noise.cs
+++ /dev/null
@@ -1,53 +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;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Fills a channel with 0..1 noise
- ///
- /// 3-Clause BSD Licensed
- public void Noise()
- {
- SetDiff();
-
- Random rand = new Random(seed);
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = rand.NextDouble();
- }
- }
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Spiral.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Spiral.cs
deleted file mode 100644
index a516d8d..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Spiral.cs
+++ /dev/null
@@ -1,156 +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 System.Collections.Generic;
-
-namespace libTerrain
-{
- partial class Channel
- {
- private double[] CoordinatesToPolar(int x, int y)
- {
- double theta = Math.Atan2(x - (w/2), y - (h/2));
- double rx = (double) x - ((double) w/2);
- double ry = (double) y - ((double) h/2);
- double r = Math.Sqrt((rx*rx) + (ry*ry));
-
- double[] coords = new double[2];
- coords[0] = r;
- coords[1] = theta;
- return coords;
- }
-
- public int[] PolarToCoordinates(double r, double theta)
- {
- double nx;
- double ny;
-
- nx = (double) r*Math.Cos(theta);
- ny = (double) r*Math.Sin(theta);
-
- nx += w/2;
- ny += h/2;
-
- if (nx >= w)
- nx = w - 1;
-
- if (ny >= h)
- ny = h - 1;
-
- if (nx < 0)
- nx = 0;
-
- if (ny < 0)
- ny = 0;
-
- int[] coords = new int[2];
- coords[0] = (int) nx;
- coords[1] = (int) ny;
- return coords;
- }
-
- public void Polar()
- {
- SetDiff();
-
- Channel n = Copy();
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double[] coords = CoordinatesToPolar(x, y);
-
- coords[0] += w/2.0;
- coords[1] += h/2.0;
-
- map[x, y] = n.map[(int) coords[0]%n.w, (int) coords[1]%n.h];
- }
- }
- }
-
- public void SpiralPlanter(int steps, double incAngle, double incRadius, double offsetRadius, double offsetAngle)
- {
- SetDiff();
-
- int i;
- double r = offsetRadius;
- double theta = offsetAngle;
- for (i = 0; i < steps; i++)
- {
- r += incRadius;
- theta += incAngle;
-
- int[] coords = PolarToCoordinates(r, theta);
- Raise(coords[0], coords[1], 20, 1);
- }
- }
-
- public void SpiralCells(int steps, double incAngle, double incRadius, double offsetRadius, double offsetAngle,
- double[] c)
- {
- SetDiff();
-
- List points = new List();
-
- int i;
- double r = offsetRadius;
- double theta = offsetAngle;
- for (i = 0; i < steps; i++)
- {
- r += incRadius;
- theta += incAngle;
-
- int[] coords = PolarToCoordinates(r, theta);
- points.Add(new Point2D(coords[0], coords[1]));
- }
-
- VoronoiDiagram(points, c);
- }
-
- public void Spiral(double wid, double hig, double offset)
- {
- SetDiff();
-
- int x, y, z;
- z = 0;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- z++;
- double dx = Math.Abs((w/2) - x);
- double dy = Math.Abs((h/2) - y);
- map[x, y] += Math.Sin(dx/wid) + Math.Cos(dy/hig);
- }
- }
- Normalise();
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs
deleted file mode 100644
index a4966a4..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs
+++ /dev/null
@@ -1,211 +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 System.Collections.Generic;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Generates a Voronoi diagram (sort of a stained glass effect) which will fill the entire channel
- ///
- /// 3-Clause BSD Licensed
- /// The number of generator points in each block
- /// A multiple of the channel width and height which will have voronoi points generated in it.
- /// This is to ensure a more even distribution of the points than pure random allocation.
- /// The Voronoi diagram type. Usually an array with values consisting of [-1,1]. Experiment with the chain, you can have as many values as you like.
- public void VoronoiDiagram(int pointsPerBlock, int blockSize, double[] c)
- {
- SetDiff();
-
- List points = new List();
- Random generator = new Random(seed);
-
- // Generate the emitter points
- int x, y, i;
- for (x = -blockSize; x < w + blockSize; x += blockSize)
- {
- for (y = -blockSize; y < h + blockSize; y += blockSize)
- {
- for (i = 0; i < pointsPerBlock; i++)
- {
- double pX = x + (generator.NextDouble()*(double) blockSize);
- double pY = y + (generator.NextDouble()*(double) blockSize);
-
- points.Add(new Point2D(pX, pY));
- }
- }
- }
-
- double[] distances = new double[points.Count];
-
- // Calculate the distance each pixel is from an emitter
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- for (i = 0; i < points.Count; i++)
- {
- double dx, dy;
- dx = Math.Abs((double) x - points[i].x);
- dy = Math.Abs((double) y - points[i].y);
-
- distances[i] = (dx*dx + dy*dy);
- }
-
- Array.Sort(distances);
-
- double f = 0.0;
-
- // Multiply the distances with their 'c' counterpart
- // ordering the distances descending
- for (i = 0; i < c.Length; i++)
- {
- if (i >= points.Count)
- break;
-
- f += c[i]*distances[i];
- }
-
- map[x, y] = f;
- }
- }
-
- // Normalise the result
- Normalise();
- }
-
- public void VoronoiDiagram(List points, double[] c)
- {
- SetDiff();
-
- int x, y, i;
- double[] distances = new double[points.Count];
-
- // Calculate the distance each pixel is from an emitter
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- for (i = 0; i < points.Count; i++)
- {
- double dx, dy;
- dx = Math.Abs((double) x - points[i].x);
- dy = Math.Abs((double) y - points[i].y);
-
- distances[i] = (dx*dx + dy*dy);
- }
-
- Array.Sort(distances);
-
- double f = 0.0;
-
- // Multiply the distances with their 'c' counterpart
- // ordering the distances descending
- for (i = 0; i < c.Length; i++)
- {
- if (i >= points.Count)
- break;
-
- f += c[i]*distances[i];
- }
-
- map[x, y] = f;
- }
- }
-
- // Normalise the result
- Normalise();
- }
-
- public void VoroflatDiagram(int pointsPerBlock, int blockSize)
- {
- SetDiff();
-
- List points = new List();
- Random generator = new Random(seed);
-
- // Generate the emitter points
- int x, y, i;
- for (x = -blockSize; x < w + blockSize; x += blockSize)
- {
- for (y = -blockSize; y < h + blockSize; y += blockSize)
- {
- for (i = 0; i < pointsPerBlock; i++)
- {
- double pX = x + (generator.NextDouble()*(double) blockSize);
- double pY = y + (generator.NextDouble()*(double) blockSize);
-
- points.Add(new Point2D(pX, pY));
- }
- }
- }
-
- double[] distances = new double[points.Count];
-
- // Calculate the distance each pixel is from an emitter
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- for (i = 0; i < points.Count; i++)
- {
- double dx, dy;
- dx = Math.Abs((double) x - points[i].x);
- dy = Math.Abs((double) y - points[i].y);
-
- distances[i] = (dx*dx + dy*dy);
- }
-
- //Array.Sort(distances);
-
- double f = 0.0;
-
- double min = double.MaxValue;
- for (int j = 0; j < distances.Length; j++)
- {
- if (distances[j] < min)
- {
- min = distances[j];
- f = j;
- }
- }
-
- // Multiply the distances with their 'c' counterpart
- // ordering the distances descending
-
- map[x, y] = f;
- }
- }
-
- // Normalise the result
- Normalise();
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Worms.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Worms.cs
deleted file mode 100644
index d9f0990..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Worms.cs
+++ /dev/null
@@ -1,71 +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;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Generates 'number' of worms which navigate randomly around the landscape creating terrain as they go.
- ///
- /// The number of worms which will traverse the map
- /// The number of steps each worm will traverse
- /// The maximum distance each worm will move each step
- /// The size of the area around the worm modified
- /// Do worms start in the middle, or randomly?
- public void Worms(int number, int rounds, double movement, double size, bool centerspawn)
- {
- SetDiff();
-
- Random random = new Random(seed);
- int i, j;
-
- for (i = 0; i < number; i++)
- {
- double rx, ry;
- if (centerspawn)
- {
- rx = w/2.0;
- ry = h/2.0;
- }
- else
- {
- rx = random.NextDouble()*(w - 1);
- ry = random.NextDouble()*(h - 1);
- }
- for (j = 0; j < rounds; j++)
- {
- rx += (random.NextDouble()*movement) - (movement/2.0);
- ry += (random.NextDouble()*movement) - (movement/2.0);
- Raise(rx, ry, size, 1.0);
- }
- }
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs
deleted file mode 100644
index a3e24a2..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs
+++ /dev/null
@@ -1,376 +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;
-
-namespace libTerrain
-{
- partial class Channel
- {
- public Channel Normalise()
- {
- SetDiff();
-
- double max = FindMax();
- double min = FindMin();
-
- int x, y;
-
- if (max != min)
- {
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = (map[x, y] - min)*(1.0/(max - min));
- }
- }
- }
- else
- {
- Fill(0.5);
- }
-
- return this;
- }
-
- public Channel Normalise(double minv, double maxv)
- {
- SetDiff();
-
- if (minv == maxv)
- {
- Fill(minv);
- return this;
- }
-
- double max = FindMax();
- double min = FindMin();
-
- int x, y;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (min != max)
- {
- double val = (map[x, y] - min)*(1.0/(max - min));
- val *= maxv - minv;
- val += minv;
-
- map[x, y] = val;
- }
- else
- {
- map[x, y] = 0.5;
- }
- }
- }
-
- return this;
- }
-
- public Channel Elevate(double meters)
- {
- SetDiff();
-
- int x, y;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] += meters;
- }
- }
-
- return this;
- }
-
-
- public Channel Clip()
- {
- int x, y;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- SetClip(x, y, map[x, y]);
- }
- }
-
- return this;
- }
-
- public Channel Clip(double min, double max)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double val = map[x, y];
- if (val > max) val = max;
- if (val < min) val = min;
-
- Set(x, y, val);
- }
- }
- return this;
- }
-
- public Channel Crop(int x1, int y1, int x2, int y2)
- {
- int width = x1 - x2 + 1;
- int height = y1 - y2 + 1;
- Channel chan = new Channel(width, height);
-
- int x, y;
- int nx, ny;
-
- nx = 0;
- for (x = x1; x < x2; x++)
- {
- ny = 0;
- for (y = y1; y < y2; y++)
- {
- chan.map[nx, ny] = map[x, y];
-
- ny++;
- }
- nx++;
- }
-
- return this;
- }
-
- public Channel AddClip(Channel other)
- {
- SetDiff();
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = other.map[x, y];
- if (map[x, y] > 1)
- map[x, y] = 1;
- if (map[x, y] < 0)
- map[x, y] = 0;
- }
- }
- return this;
- }
-
- public void Smooth(double amount)
- {
- SetDiff();
-
- double area = amount;
- double step = amount/4.0;
-
- double[,] manipulate = new double[w,h];
- int x, y;
- double n, l;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- 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 += GetBilinearInterpolate(x + n, y + l);
- }
- }
-
- manipulate[x, y] = average/avgsteps;
- }
- }
- map = manipulate;
- }
-
- public void Pertubation(double amount)
- {
- SetDiff();
-
- // Simple pertubation filter
- double[,] manipulated = new double[w,h];
- Random generator = new Random(seed); // Seeds FTW!
- //double amount = 8.0;
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double offset_x = (double) x + (generator.NextDouble()*amount) - (amount/2.0);
- double offset_y = (double) y + (generator.NextDouble()*amount) - (amount/2.0);
- double p = GetBilinearInterpolate(offset_x, offset_y);
- manipulated[x, y] = p;
- }
- }
- map = manipulated;
- }
-
- public void PertubationMask(Channel mask)
- {
- // Simple pertubation filter
- double[,] manipulated = new double[w,h];
- Random generator = new Random(seed); // Seeds FTW!
- //double amount = 8.0;
-
- double amount;
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- amount = mask.map[x, y];
- double offset_x = (double) x + (generator.NextDouble()*amount) - (amount/2.0);
- double offset_y = (double) y + (generator.NextDouble()*amount) - (amount/2.0);
-
- if (offset_x > w)
- offset_x = w - 1;
- if (offset_y > h)
- offset_y = h - 1;
- if (offset_y < 0)
- offset_y = 0;
- if (offset_x < 0)
- offset_x = 0;
-
- double p = GetBilinearInterpolate(offset_x, offset_y);
- manipulated[x, y] = p;
- SetDiff(x, y);
- }
- }
- map = manipulated;
- }
-
- public void Distort(Channel mask, double str)
- {
- // Simple pertubation filter
- double[,] manipulated = new double[w,h];
-
- double amount;
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- amount = mask.map[x, y];
- double offset_x = (double) x + (amount*str) - (0.5*str);
- double offset_y = (double) y + (amount*str) - (0.5*str);
-
- if (offset_x > w)
- offset_x = w - 1;
- if (offset_y > h)
- offset_y = h - 1;
- if (offset_y < 0)
- offset_y = 0;
- if (offset_x < 0)
- offset_x = 0;
-
- double p = GetBilinearInterpolate(offset_x, offset_y);
- manipulated[x, y] = p;
- SetDiff(x, y);
- }
- }
- map = manipulated;
- }
-
- public void Distort(Channel mask, Channel mask2, double str)
- {
- // Simple pertubation filter
- double[,] manipulated = new double[w,h];
-
- double amountX;
- double amountY;
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- amountX = mask.map[x, y];
- amountY = mask2.map[x, y];
- double offset_x = (double) x + (amountX*str) - (0.5*str);
- double offset_y = (double) y + (amountY*str) - (0.5*str);
-
- if (offset_x > w)
- offset_x = w - 1;
- if (offset_y > h)
- offset_y = h - 1;
- if (offset_y < 0)
- offset_y = 0;
- if (offset_x < 0)
- offset_x = 0;
-
- double p = GetBilinearInterpolate(offset_x, offset_y);
- manipulated[x, y] = p;
- SetDiff(x, y);
- }
- }
- map = manipulated;
- }
-
- public Channel Blend(Channel other, double amount)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- Set(x, y, Tools.LinearInterpolate(map[x, y], other.map[x, y], amount));
- }
- }
- return this;
- }
-
- public Channel Blend(Channel other, Channel amount)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- Set(x, y, Tools.LinearInterpolate(map[x, y], other.map[x, y], amount.map[x, y]));
- }
- }
- return this;
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
deleted file mode 100644
index 6a846cd..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
+++ /dev/null
@@ -1,211 +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;
-
-namespace libTerrain
-{
- partial class Channel
- {
- // Ideas for Aerobic erosion
- //
- // Unlike thermal (gravity) and hydraulic (water suspension)
- // aerobic erosion should displace mass by moving sediment
- // in "hops". The length of the hop being dictated by the
- // presence of sharp cliffs and wind speed.
-
- // The ability to pickup sediment is defined by the total
- // surface area, such that:
- // 0 0 0
- // 0 1 0
- // 0 0 0
- // Would be the best possible value for sediment to be
- // picked up (total difference = 8) and flatter land
- // will erode less quickly.
-
- // Suspended particles assist the erosion process by hitting
- // the surface and chiselling additional particles off faster
- // than alone.
-
- // Particles are deposited when one of two conditions is met
- // First:
- // When particles hit a wall - such that the
- // wind direction points at a difference >= the
- // deposition mininum talus.
- // Second:
- // When wind speed is lowered to below the minimum
- // required for transit. An idea for this is to
- // use the navier-stokes algorithms for simulating
- // pressure across the terrain.
-
- ///
- /// An experimental erosion algorithm developed by Adam. Moves sediment by factoring the surface area of each height point.
- ///
- /// 0..1 The speed of the wind
- /// The minimum angle at which rock is eroded 0..1 (recommended: <= 0.30)
- /// The minimum angle at which rock is dropped 0..1 (recommended: >= 0.00)
- /// The percentage of rock which can be picked up to pickup 0..1
- /// The number of erosion rounds (recommended: 25+)
- /// Drop sediment at the lowest point?
- public void AerobicErosion(double windspeed, double pickupTalusMinimum, double dropTalusMinimum, double carry,
- int rounds, bool lowest, bool usingFluidDynamics)
- {
- bool debugImages = false;
-
- Channel wind = new Channel(w, h);
- Channel sediment = new Channel(w, h);
- int x, y, i, j;
-
- Normalise();
-
- wind = Copy();
- wind.Noise();
-
- if (debugImages)
- wind.SaveImage("testimg/wind_start.png");
-
- if (usingFluidDynamics)
- {
- wind.navierStokes(20, 0.1, 0.0, 0.0);
- }
- else
- {
- wind.Pertubation(30);
- }
-
- if (debugImages)
- wind.SaveImage("testimg/wind_begin.png");
-
- for (i = 0; i < rounds; i++)
- {
- // Convert some rocks to sand
- for (x = 1; x < w - 1; x++)
- {
- for (y = 1; y < h - 1; y++)
- {
- double me = Get(x, y);
- double surfacearea = 0.3; // Everything will erode even if it's flat. Just slower.
-
- for (j = 0; j < 9; j++)
- {
- int[] coords = Neighbours(NeighbourSystem.Moore, j);
- double target = Get(x + coords[0], y + coords[1]);
-
- surfacearea += Math.Abs(target - me);
- }
-
- double amount = surfacearea*wind.map[x, y]*carry;
-
- if (amount < 0)
- amount = 0;
-
- if (surfacearea > pickupTalusMinimum)
- {
- Set(x, y, map[x, y] - amount);
- sediment.map[x, y] += amount;
- }
- }
- }
-
- if (usingFluidDynamics)
- {
- sediment.navierStokes(7, 0.1, 0.0, 0.1);
-
- Channel noiseChan = new Channel(w, h);
- noiseChan.Noise();
- wind.Blend(noiseChan, 0.01);
-
- wind.navierStokes(10, 0.1, 0.01, 0.01);
-
- sediment.Distort(wind, windspeed);
- }
- else
- {
- wind.Pertubation(15); // Can do better later
- wind.seed++;
- sediment.Pertubation(10); // Sediment is blown around a bit
- sediment.seed++;
- }
-
- if (debugImages)
- wind.SaveImage("testimg/wind_" + i.ToString() + ".png");
-
- // Convert some sand to rock
- for (x = 1; x < w - 1; x++)
- {
- for (y = 1; y < h - 1; y++)
- {
- double me = Get(x, y);
- double surfacearea = 0.01; // Flat land does not get deposition
- double min = double.MaxValue;
- int[] minside = new int[2];
-
- for (j = 0; j < 9; j++)
- {
- int[] coords = Neighbours(NeighbourSystem.Moore, j);
- double target = Get(x + coords[0], y + coords[1]);
-
- surfacearea += Math.Abs(target - me);
-
- if (target < min && lowest)
- {
- minside = (int[]) coords.Clone();
- min = target;
- }
- }
-
- double amount = surfacearea*(1.0 - wind.map[x, y])*carry;
-
- if (amount < 0)
- amount = 0;
-
- if (surfacearea > dropTalusMinimum)
- {
- Set(x + minside[0], y + minside[1], map[x + minside[0], y + minside[1]] + amount);
- sediment.map[x, y] -= amount;
- }
- }
- }
-
- if (debugImages)
- sediment.SaveImage("testimg/sediment_" + i.ToString() + ".png");
-
- wind.Normalise();
- wind *= windspeed;
-
- Normalise();
- }
-
- Channel myself = this;
- myself += sediment;
- myself.Normalise();
-
- if (debugImages)
- SaveImage("testimg/output.png");
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs
deleted file mode 100644
index 608e0e3..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs
+++ /dev/null
@@ -1,144 +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;
-
-namespace libTerrain
-{
- partial class Channel
- {
- public void HydraulicErosion(Channel rain, double evaporation, double solubility, int frequency, int rounds)
- {
- SetDiff();
-
- Channel water = new Channel(w, h);
- Channel sediment = new Channel(w, h);
- Channel terrain = this;
- Channel waterFlow = new Channel(w, h);
-
- NeighbourSystem type = NeighbourSystem.Moore;
- int NEIGHBOUR_ME = 4;
-
- int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
-
- for (int i = 0; i < rounds; i++)
- {
- water += rain;
-
- sediment = terrain*water;
- terrain -= sediment;
-
- for (int x = 1; x < w - 1; x++)
- {
- for (int y = 1; y < h - 1; y++)
- {
- double[] heights = new double[NEIGHBOUR_MAX];
- double[] diffs = new double[NEIGHBOUR_MAX];
-
- double heightCenter = map[x, y];
-
- for (int j = 0; j < NEIGHBOUR_MAX; j++)
- {
- if (j != NEIGHBOUR_ME)
- {
- int[] coords = Neighbours(type, j);
- coords[0] += x;
- coords[1] += y;
-
- heights[j] = map[coords[0], coords[1]] + water.map[coords[0], coords[1]] +
- sediment.map[coords[0], coords[1]];
- diffs[j] = heightCenter - heights[j];
- }
- }
-
- double totalHeight = 0;
- double totalHeightDiff = 0;
- int totalCellsCounted = 1;
-
- for (int j = 0; j < NEIGHBOUR_MAX; j++)
- {
- if (j != NEIGHBOUR_ME)
- {
- if (diffs[j] > 0)
- {
- totalHeight += heights[j];
- totalHeightDiff += diffs[j];
- totalCellsCounted++;
- }
- }
- }
-
- if (totalCellsCounted == 1)
- continue;
-
- double averageHeight = totalHeight/totalCellsCounted;
- double waterAmount = Math.Min(water.map[x, y], heightCenter - averageHeight);
-
- // TODO: Check this.
- waterFlow.map[x, y] += waterFlow.map[x, y] - waterAmount;
-
- double totalInverseDiff = waterAmount/totalHeightDiff;
-
- for (int j = 0; j < NEIGHBOUR_MAX; j++)
- {
- if (j != NEIGHBOUR_ME)
- {
- int[] coords = Neighbours(type, j);
- coords[0] += x;
- coords[1] += y;
-
- if (diffs[j] > 0)
- {
- waterFlow.SetWrap(coords[0], coords[1],
- waterFlow.map[coords[0], coords[1]] + diffs[j]*totalInverseDiff);
- }
- }
- }
- }
- }
-
- water += waterFlow;
- waterFlow.Fill(0);
-
- water *= evaporation;
-
- for (int x = 0; x < w; x++)
- {
- for (int y = 0; y < h; y++)
- {
- double deposition = sediment.map[x, y] - water.map[x, y]*solubility;
- if (deposition > 0)
- {
- sediment.map[x, y] -= deposition;
- terrain.map[x, y] += deposition;
- }
- }
- }
- }
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/NavierStokes.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/NavierStokes.cs
deleted file mode 100644
index 8f12637..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/NavierStokes.cs
+++ /dev/null
@@ -1,307 +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.
- */
-
-namespace libTerrain
-{
- partial class Channel
- {
- // Navier Stokes Algorithms ported from
- // "Real-Time Fluid Dynamics for Games" by Jos Stam.
- // presented at GDC 2003.
-
- // Poorly ported from C++. (I gave up making it properly native somewhere after nsSetBnd)
-
- private static int nsIX(int i, int j, int N)
- {
- return ((i) + (N + 2)*(j));
- }
-
-// TODO: unused
-// private static void nsSwap(ref double x0, ref double x)
-// {
-// double tmp = x0;
-// x0 = x;
-// x = tmp;
-// }
-
- private static void nsSwap(ref double[] x0, ref double[] x)
- {
- double[] tmp = x0;
- x0 = x;
- x = tmp;
- }
-
- private void nsAddSource(int N, ref double[] x, ref double[] s, double dt)
- {
- int i;
- int size = (N + 2)*(N + 2);
- for (i = 0; i < size; i++)
- {
- x[i] += dt*s[i];
- }
- }
-
- private void nsSetBnd(int N, int b, ref double[] x)
- {
- int i;
- for (i = 0; i <= N; i++)
- {
- x[nsIX(0, i, N)] = b == 1 ? -x[nsIX(1, i, N)] : x[nsIX(1, i, N)];
- x[nsIX(0, N + 1, N)] = b == 1 ? -x[nsIX(N, i, N)] : x[nsIX(N, i, N)];
- x[nsIX(i, 0, N)] = b == 2 ? -x[nsIX(i, 1, N)] : x[nsIX(i, 1, N)];
- x[nsIX(i, N + 1, N)] = b == 2 ? -x[nsIX(i, N, N)] : x[nsIX(i, N, N)];
- }
- x[nsIX(0, 0, N)] = 0.5f*(x[nsIX(1, 0, N)] + x[nsIX(0, 1, N)]);
- x[nsIX(0, N + 1, N)] = 0.5f*(x[nsIX(1, N + 1, N)] + x[nsIX(0, N, N)]);
- x[nsIX(N + 1, 0, N)] = 0.5f*(x[nsIX(N, 0, N)] + x[nsIX(N + 1, 1, N)]);
- x[nsIX(N + 1, N + 1, N)] = 0.5f*(x[nsIX(N, N + 1, N)] + x[nsIX(N + 1, N, N)]);
- }
-
- private void nsLinSolve(int N, int b, ref double[] x, ref double[] x0, double a, double c)
- {
- int i, j;
- for (i = 1; i <= N; i++)
- {
- for (j = 1; j <= N; j++)
- {
- x[nsIX(i, j, N)] = (x0[nsIX(i, j, N)] + a*
- (x[nsIX(i - 1, j, N)] +
- x[nsIX(i + 1, j, N)] +
- x[nsIX(i, j - 1, N)] + x[nsIX(i, j + 1, N)])
- )/c;
- }
- }
-
- nsSetBnd(N, b, ref x);
- }
-
- private void nsDiffuse(int N, int b, ref double[] x, ref double[] x0, double diff, double dt)
- {
- double a = dt*diff*N*N;
- nsLinSolve(N, b, ref x, ref x0, a, 1 + 4*a);
- }
-
- private void nsAdvect(int N, int b, ref double[] d, ref double[] d0, ref double[] u, ref double[] v, double dt)
- {
- int i, j, i0, j0, i1, j1;
- double x, y, s0, t0, s1, t1, dt0;
-
- dt0 = dt*N;
-
- for (i = 1; i <= N; i++)
- {
- for (j = 1; j <= N; j++)
- {
- x = i - dt0*u[nsIX(i, j, N)];
- y = j - dt0*v[nsIX(i, j, N)];
-
- if (x < 0.5)
- x = 0.5;
- if (x > N + 0.5)
- x = N + 0.5;
- i0 = (int) x;
- i1 = i0 + 1;
-
- if (y < 0.5)
- y = 0.5;
- if (y > N + 0.5)
- y = N + 0.5;
- j0 = (int) y;
- j1 = j0 + 1;
-
- s1 = x - i0;
- s0 = 1 - s1;
- t1 = y - j0;
- t0 = 1 - t1;
-
- d[nsIX(i, j, N)] = s0*(t0*d0[nsIX(i0, j0, N)] + t1*d0[nsIX(i0, j1, N)]) +
- s1*(t0*d0[nsIX(i1, j0, N)] + t1*d0[nsIX(i1, j1, N)]);
- }
- }
-
- nsSetBnd(N, b, ref d);
- }
-
- public void nsProject(int N, ref double[] u, ref double[] v, ref double[] p, ref double[] div)
- {
- int i, j;
-
- for (i = 1; i <= N; i++)
- {
- for (j = 1; j <= N; j++)
- {
- div[nsIX(i, j, N)] = -0.5*
- (u[nsIX(i + 1, j, N)] - u[nsIX(i - 1, j, N)] + v[nsIX(i, j + 1, N)] -
- v[nsIX(i, j - 1, N)])/N;
- p[nsIX(i, j, N)] = 0;
- }
- }
-
- nsSetBnd(N, 0, ref div);
- nsSetBnd(N, 0, ref p);
-
- nsLinSolve(N, 0, ref p, ref div, 1, 4);
-
- for (i = 1; i <= N; i++)
- {
- for (j = 1; j <= N; j++)
- {
- u[nsIX(i, j, N)] -= 0.5*N*(p[nsIX(i + 1, j, N)] - p[nsIX(i - 1, j, N)]);
- v[nsIX(i, j, N)] -= 0.5*N*(p[nsIX(i, j + 1, N)] - p[nsIX(i, j - 1, N)]);
- }
- }
-
- nsSetBnd(N, 1, ref u);
- nsSetBnd(N, 2, ref v);
- }
-
- private void nsDensStep(int N, ref double[] x, ref double[] x0, ref double[] u, ref double[] v, double diff,
- double dt)
- {
- nsAddSource(N, ref x, ref x0, dt);
- nsSwap(ref x0, ref x);
- nsDiffuse(N, 0, ref x, ref x0, diff, dt);
- nsSwap(ref x0, ref x);
- nsAdvect(N, 0, ref x, ref x0, ref u, ref v, dt);
- }
-
- private void nsVelStep(int N, ref double[] u, ref double[] v, ref double[] u0, ref double[] v0, double visc,
- double dt)
- {
- nsAddSource(N, ref u, ref u0, dt);
- nsAddSource(N, ref v, ref v0, dt);
- nsSwap(ref u0, ref u);
- nsDiffuse(N, 1, ref u, ref u0, visc, dt);
- nsSwap(ref v0, ref v);
- nsDiffuse(N, 2, ref v, ref v0, visc, dt);
- nsProject(N, ref u, ref v, ref u0, ref v0);
- nsSwap(ref u0, ref u);
- nsSwap(ref v0, ref v);
- nsAdvect(N, 1, ref u, ref u0, ref u0, ref v0, dt);
- nsAdvect(N, 2, ref v, ref v0, ref u0, ref v0, dt);
- nsProject(N, ref u, ref v, ref u0, ref v0);
- }
-
- private void nsBufferToDoubles(ref double[] dens, int N, ref double[,] doubles)
- {
- int i;
- int j;
-
- for (i = 1; i <= N; i++)
- {
- for (j = 1; j <= N; j++)
- {
- doubles[i - 1, j - 1] = dens[nsIX(i, j, N)];
- }
- }
- }
-
- private void nsDoublesToBuffer(double[,] doubles, int N, ref double[] dens)
- {
- int i;
- int j;
-
- for (i = 1; i <= N; i++)
- {
- for (j = 1; j <= N; j++)
- {
- dens[nsIX(i, j, N)] = doubles[i - 1, j - 1];
- }
- }
- }
-
- private void nsSimulate(int N, int rounds, double dt, double diff, double visc)
- {
- int size = (N*2)*(N*2);
-
- double[] u = new double[size]; // Force, X axis
- double[] v = new double[size]; // Force, Y axis
- double[] u_prev = new double[size];
- double[] v_prev = new double[size];
- double[] dens = new double[size];
- double[] dens_prev = new double[size];
-
- nsDoublesToBuffer(map, N, ref dens);
- nsDoublesToBuffer(map, N, ref dens_prev);
-
- for (int i = 0; i < rounds; i++)
- {
- u_prev = u;
- v_prev = v;
- dens_prev = dens;
-
- nsVelStep(N, ref u, ref v, ref u_prev, ref v_prev, visc, dt);
- nsDensStep(N, ref dens, ref dens_prev, ref u, ref v, diff, dt);
- }
-
- nsBufferToDoubles(ref dens, N, ref map);
- }
-
- ///
- /// Performs computational fluid dynamics on a channel
- ///
- /// The number of steps to perform (Recommended: 20)
- /// Delta Time - The time between steps (Recommended: 0.1)
- /// Fluid diffusion rate (Recommended: 0.0)
- /// Fluid viscosity (Recommended: 0.0)
- public void navierStokes(int rounds, double dt, double diff, double visc)
- {
- nsSimulate(h, rounds, dt, diff, visc);
- }
-
- public void navierStokes(int rounds, double dt, double diff, double visc, ref double[,] uret, ref double[,] vret)
- {
- int N = h;
-
- int size = (N*2)*(N*2);
-
- double[] u = new double[size]; // Force, X axis
- double[] v = new double[size]; // Force, Y axis
- double[] u_prev = new double[size];
- double[] v_prev = new double[size];
- double[] dens = new double[size];
- double[] dens_prev = new double[size];
-
- nsDoublesToBuffer(map, N, ref dens);
- nsDoublesToBuffer(map, N, ref dens_prev);
-
- for (int i = 0; i < rounds; i++)
- {
- u_prev = u;
- v_prev = v;
- dens_prev = dens;
-
- nsVelStep(N, ref u, ref v, ref u_prev, ref v_prev, visc, dt);
- nsDensStep(N, ref dens, ref dens_prev, ref u, ref v, diff, dt);
- }
-
- nsBufferToDoubles(ref u, N, ref uret);
- nsBufferToDoubles(ref v, N, ref vret);
- nsBufferToDoubles(ref dens, N, ref map);
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
deleted file mode 100644
index 532c2d6..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
+++ /dev/null
@@ -1,107 +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.
- */
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// A thermal weathering implementation based on Musgrave's original 1989 algorithm. This is Adam's custom implementation which may differ slightly from the original.
- ///
- /// The rock angle (represented as a dy/dx ratio) at which point it will be succeptible to breakage
- /// The number of erosion rounds
- /// The amount of rock to carry each round
- public Channel ThermalWeathering(double talus, int rounds, double c)
- {
- SetDiff();
-
- double[,] lastFrame;
- double[,] thisFrame;
-
- lastFrame = (double[,]) map.Clone();
- thisFrame = (double[,]) map.Clone();
-
- NeighbourSystem type = NeighbourSystem.Moore;
- // Using moore neighbourhood (twice as computationally expensive)
- int NEIGHBOUR_ME = 4; // I am always 4 in both systems.
-
- int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
-
- int frames = rounds; // Number of thermal erosion iterations to run
- int i, j;
- int x, y;
-
- for (i = 0; i < frames; i++)
- {
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- for (j = 0; j < NEIGHBOUR_MAX; j++)
- {
- if (j != NEIGHBOUR_ME)
- {
- int[] coords = Neighbours(type, j);
-
- coords[0] += x;
- coords[1] += y;
-
- if (coords[0] > w - 1)
- coords[0] = w - 1;
- if (coords[1] > h - 1)
- coords[1] = h - 1;
- if (coords[0] < 0)
- coords[0] = 0;
- if (coords[1] < 0)
- coords[1] = 0;
-
- double heightF = thisFrame[x, y];
- double target = thisFrame[coords[0], coords[1]];
-
- if (target > heightF + talus)
- {
- double calc = c*((target - heightF) - talus);
- heightF += calc;
- target -= calc;
- }
-
- thisFrame[x, y] = heightF;
- thisFrame[coords[0], coords[1]] = target;
- }
- }
- }
- }
- lastFrame = (double[,]) thisFrame.Clone();
- }
-
- map = thisFrame;
-
- Normalise(); // Just to guaruntee a smooth 0..1 value
- return this;
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Neighbours.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Neighbours.cs
deleted file mode 100644
index d1027a3..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Neighbours.cs
+++ /dev/null
@@ -1,136 +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.
- */
-
-namespace libTerrain
-{
- partial class Channel
- {
- 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;
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs
deleted file mode 100644
index 6e1386d..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs
+++ /dev/null
@@ -1,239 +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;
-
-namespace libTerrain
-{
- partial class Channel
- {
- /* Operator combination of channel datatypes */
-
- public static Channel operator +(Channel A, Channel B)
- {
- if (A.h != B.h)
- throw new Exception("Cannot add heightmaps, of different height.");
- if (A.w != B.w)
- throw new Exception("Cannot add heightmaps, of different width.");
-
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- if (B.map[x, y] != 0)
- A.SetDiff(x, y);
-
- A.map[x, y] += B.map[x, y];
- }
- }
-
- return A;
- }
-
- public static Channel operator *(Channel A, Channel B)
- {
- if (A.h != B.h)
- throw new Exception("Cannot multiply heightmaps, of different height.");
- if (A.w != B.w)
- throw new Exception("Cannot multiply heightmaps, of different width.");
-
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] *= B.map[x, y];
- }
- }
-
- A.SetDiff();
-
- return A;
- }
-
- public static Channel operator -(Channel A, Channel B)
- {
- if (A.h != B.h)
- throw new Exception("Cannot subtract heightmaps, of different height.");
- if (A.w != B.w)
- throw new Exception("Cannot subtract heightmaps, of different width.");
-
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- if (B.map[x, y] != 0)
- A.SetDiff(x, y);
- A.map[x, y] -= B.map[x, y];
- }
- }
-
- return A;
- }
-
- public static Channel operator /(Channel A, Channel B)
- {
- if (A.h != B.h)
- throw new Exception("Cannot divide heightmaps, of different height.");
- if (A.w != B.w)
- throw new Exception("Cannot divide heightmaps, of different width.");
-
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] /= B.map[x, y];
- }
- }
-
- A.SetDiff();
-
- return A;
- }
-
- public static Channel operator ^(Channel A, Channel B)
- {
- if (A.h != B.h)
- throw new Exception("Cannot divide heightmaps, of different height.");
- if (A.w != B.w)
- throw new Exception("Cannot divide heightmaps, of different width.");
-
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] = Math.Pow(A.map[x, y], B.map[x, y]);
- }
- }
-
- A.SetDiff();
-
- return A;
- }
-
-
- /* Operator combination of channel and double datatypes */
-
- public static Channel operator +(Channel A, double B)
- {
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] += B;
- }
- }
-
- if (B != 0)
- A.SetDiff();
-
- return A;
- }
-
- public static Channel operator -(Channel A, double B)
- {
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] -= B;
- }
- }
-
- if (B != 0)
- A.SetDiff();
-
- return A;
- }
-
- public static Channel operator *(Channel A, double B)
- {
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] *= B;
- }
- }
-
- if (B != 1)
- A.SetDiff();
-
- return A;
- }
-
- public static Channel operator /(Channel A, double B)
- {
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] /= B;
- }
- }
-
- if (B != 1)
- A.SetDiff();
-
- return A;
- }
-
- public static Channel operator ^(Channel A, double B)
- {
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] = Math.Pow(A.map[x, y], B);
- }
- }
-
- A.SetDiff();
-
- return A;
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Point2D.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Point2D.cs
deleted file mode 100644
index 19a09a4..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Point2D.cs
+++ /dev/null
@@ -1,41 +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.
- */
-
-namespace libTerrain
-{
- public class Point2D
- {
- public double x;
- public double y;
-
- public Point2D(double X, double Y)
- {
- x = X;
- y = Y;
- }
- }
-}
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Tools.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Tools.cs
deleted file mode 100644
index b653971..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Tools.cs
+++ /dev/null
@@ -1,59 +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;
-
-namespace libTerrain
-{
- internal class Tools
- {
- public static double LinearInterpolate(double a, double b, double amount)
- {
- return a + ((b - a)*amount);
- }
-
- public static double ExponentialInterpolate(double a, double b, double amount)
- {
- a = Math.Pow(a, amount);
- b = Math.Pow(b - a, 1.0 - amount);
- return a + b;
- }
-
- public static int PowerOf2Log2(int n)
- {
- for (int i = 0; i < 31; i++)
- {
- if ((n & 1) == 1)
- {
- return i;
- }
- n >>= 1;
- }
- return 0;
- }
- }
-}
--
cgit v1.1