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. --- .../Properties/AssemblyInfo.cs | 65 - .../Region/Terrain.BasicTerrain/TerrainEngine.cs | 1451 -------------------- .../Region/Terrain.BasicTerrain/TerrainFilter.cs | 125 -- .../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 - prebuild.xml | 37 - 29 files changed, 5188 deletions(-) delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs 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 diff --git a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs deleted file mode 100644 index ff5d999..0000000 --- a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,65 +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.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly : AssemblyTitle("OpenSim.Region.Terrain.BasicTerrain")] -[assembly : AssemblyDescription("")] -[assembly : AssemblyConfiguration("")] -[assembly : AssemblyCompany("")] -[assembly : AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")] -[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] -[assembly : AssemblyTrademark("")] -[assembly : AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. - -[assembly : ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM - -[assembly : Guid("3263f5b5-0a41-4ed5-91a2-9baaaeecc849")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: - -[assembly : AssemblyVersion("1.0.0.0")] -[assembly : AssemblyFileVersion("1.0.0.0")] diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs deleted file mode 100644 index 4ab535b..0000000 --- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs +++ /dev/null @@ -1,1451 +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; -using System.Drawing; -using System.Drawing.Imaging; -using System.Globalization; -using System.IO; -using System.Threading; -using libTerrain; -using OpenJPEGNet; -using OpenSim.Framework; - -namespace OpenSim.Region.Terrain -{ - public class TerrainCommand - { - public virtual bool run(string[] cmdargs, ref string output) - { - return false; - } - - public string args; - public string help; - } - - public class TerrainEngine - { - public static Mutex fileIOLock = new Mutex(); - - /// - /// Plugin library for scripts - /// - public FilterHost customFilters = new FilterHost(); - - /// - /// A [normally] 256x256 heightmap - /// - public Channel heightmap; - - /// - /// A copy of heightmap at the last save point (for reverting) - /// - public Channel revertmap; - - /// - /// Water heightmap (needs clientside mods to work) - /// - public Channel watermap; - - /// - /// Max amount the terrain can be raised from the revert parameters - /// - public double maxRaise = 500.0; - - /// - /// Min amount the terrain can be lowered from the revert parameters - /// - public double minLower = 500.0; - - /// - /// The last time the terrain was edited - /// - public DateTime lastEdit = DateTime.Now; - - - private int counter = 0; - - /// - /// Whether or not the terrain has been modified since it was last saved and sent to the Physics engine. - /// Counts the number of modifications since the last save. (0 = Untainted) - /// - public int tainted; - - private int w, h; - - /// - /// Used to determine what offset to use when loading singular heightmaps across multiple sims - /// - private int offsetX; - - private int offsetY; - - - /// - /// Generate a new TerrainEngine instance and creates a new heightmap - /// - public TerrainEngine(int X, int Y) - { - w = 256; - h = 256; - heightmap = new Channel(w, h); - revertmap = new Channel(w, h); - watermap = new Channel(w, h); - watermap.Fill(20); - - offsetX = X; - offsetY = Y; - - tainted++; - } - - public bool IsTainted() - { - return (tainted != 0); - } - - public bool IsUserStillEditing() - { - TimeSpan gap = DateTime.Now - lastEdit; - - if (gap.TotalSeconds <= 4.0) - return true; - - return false; - } - - public bool IsTainted(int x, int y) - { - return (heightmap.diff[x/16, y/16] != 0); - } - - public void ResetTaint() - { - tainted = 0; - heightmap.diff = new int[w/16,h/16]; - } - - //Testing to see if moving the TerraForming packet handling code into here works well - /// - /// Modifies terrain using the specified information - /// - /// The height at which the user started modifying the terrain - /// The number of seconds the modify button was pressed - /// The size of the brush used - /// The action to be performed - /// Distance from the north border where the cursor is located - /// Distance from the west border where the cursor is located - public void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west, - float south, float east, - IClientAPI remoteUser) - { - // Shiny. - double size = (double) (1 << brushsize); - //System.Console.WriteLine("SIZE:" + size.ToString() + " Seconds:" + seconds.ToString()); - if (seconds == 1) - { - seconds = 0.0315f; - } - /* Okay, so here's the deal - * This has to handle both when a user draws on the terrain *and* when a user selects - * a selection of AABB on terrain and applies whatever routine the client requests - * There's something currently wrong with the brushsize --> size conversion.. however - * it's workable.. just unpredictable. - * - * North is always higher and East is always higher - * in the AABB representation - * - * Therefore what we're doing is looping from south to north and west to east - * and applying the associated algorithm with the brush. - * - * This works good on the fast ones, but things like smooth take 12 seconds a single click.. - * for now, smooth won't be 'selectionated' - * - * If the user draws instead of selects, north will = south, and east will = west. - * if the user selects, then the selection is inclusive - * it'll always affect at least one point on the heightmap. - * - * that means we use the <= operator - * - * Again, libTerrain is yx instead of xy.. so, it's reflected in the function calls - * - */ - - - switch (action) - { - case 0: - // flatten terrain - for (float x = south; x <= north; x++) - { - for (float y = west; y <= east; y++) - { - FlattenTerrain(y, x, size, (double) seconds/5.0); - lastEdit = DateTime.Now; - //remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D()); - - } - } - break; - case 1: - // raise terrain - for (float x = south; x <= north; x++) - { - for (float y = west; y <= east; y++) - { - RaiseTerrain(y, x, size, (double) seconds/5.0); - lastEdit = DateTime.Now; - //remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D()); - } - } - break; - case 2: - //lower terrain - for (float x = south; x <= north; x++) - { - for (float y = west; y <= east; y++) - { - LowerTerrain(y, x, size, (double) seconds/5.0); - lastEdit = DateTime.Now; - //remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D()); - } - } - break; - case 3: - // smooth terrain - // - // We're leaving this out of the parcel calculations for now - // because just a single one of these will stall your sim for - // 12 seconds. Looping over the parcel on this one is just stupid - // - //for (float x = south; x <= north; x++) - //{ - //for (float y = west; y <= east; y++) - //{ - //SmoothTerrain(y, x , size, (double)seconds / 5.0); - //} - //} - SmoothTerrain(west, north, size, (double) seconds/5.0); - - break; - case 4: - // noise - for (float x = south; x <= north; x++) - { - for (float y = west; y <= east; y++) - { - NoiseTerrain(y, x, size, (double) seconds/5.0); - lastEdit = DateTime.Now; - } - } - break; - case 5: - // revert - for (float x = south; x <= north; x++) - { - for (float y = west; y <= east; y++) - { - RevertTerrain(y, x, size, (double) seconds/5.0); - lastEdit = DateTime.Now; - } - } - break; - - // CLIENT EXTENSIONS GO HERE - case 128: - // erode-thermal - break; - case 129: - // erode-aerobic - break; - case 130: - // erode-hydraulic - break; - } - - counter++; - if(counter==2) - { - counter=0; - for (int x = 0; x < 16; x++) - { - for (int y = 0; y < 16; y++) - { - if (IsTainted(x * 16, y * 16)) - { - bool usingTerrainModule = true; - - if (!usingTerrainModule) - { - remoteUser.SendLayerData(x, y, GetHeights1D()); - } - } - } - } - } - - lastEdit = DateTime.Now; - - return; - } - -// TODO: unused -// /// -// /// Checks to make sure the terrain is within baked values +/- maxRaise/minLower -// /// -// private void SetTerrainWithinBounds() -// { -// int x, y; -// for (x = 0; x < w; x++) -// { -// for (y = 0; y < h; y++) -// { -// if ((heightmap.Get(x, y) > revertmap.Get(x, y) + maxRaise)) -// { -// heightmap.map[x, y] = revertmap.Get(x, y) + maxRaise; -// } -// if ((heightmap.Get(x, y) > revertmap.Get(x, y) - minLower)) -// { -// heightmap.map[x, y] = revertmap.Get(x, y) - minLower; -// } -// } -// } -// } - - /// - /// Converts the heightmap to a 65536 value 1D floating point array - /// - /// A float[65536] array containing the heightmap - public float[] GetHeights1D() - { - float[] heights = new float[w*h]; - int i; - - for (i = 0; i < w*h; i++) - { - heights[i] = (float) heightmap.map[i%w, i/w]; - } - - return heights; - } - - /// - /// Converts the heightmap to a 256x256 value 2D floating point array. - /// - /// An array of 256,256 values containing the heightmap - public float[,] GetHeights2D() - { - float[,] heights = new float[w,h]; - int x, y; - for (x = 0; x < w; x++) - { - for (y = 0; y < h; y++) - { - heights[x, y] = (float) heightmap.map[x, y]; - } - } - return heights; - } - - /// - /// Converts the heightmap to a 256x256 value 2D floating point array. Double precision version. - /// - /// An array of 256,256 values containing the heightmap - public double[,] GetHeights2DD() - { - return heightmap.map; - } - - /// - /// Imports a 1D floating point array into the 2D heightmap array - /// - /// The array to import (must have 65536 members) - public void GetHeights1D(float[] heights) - { - int i; - for (i = 0; i < w*h; i++) - { - heightmap.map[i%w, i/w] = heights[i]; - } - - tainted++; - } - - /// - /// Loads a 2D array of values into the heightmap - /// - /// An array of 256,256 float values - public void SetHeights2D(float[,] heights) - { - int x, y; - for (x = 0; x < w; x++) - { - for (y = 0; y < h; y++) - { - heightmap.Set(x, y, (double) heights[x, y]); - } - } - SaveRevertMap(); - tainted++; - } - - /// - /// Loads a 2D array of values into the heightmap (Double Precision Version) - /// - /// An array of 256,256 float values - public void SetHeights2D(double[,] heights) - { - int x, y; - for (x = 0; x < w; x++) - { - for (y = 0; y < h; y++) - { - heightmap.Set(x, y, heights[x, y]); - } - } - SaveRevertMap(); - ResetTaint(); - } - - /// - /// Swaps the two heightmap buffers (the 'revert map' and the heightmap) - /// - public void SwapRevertMaps() - { - Channel backup = heightmap.Copy(); - heightmap = revertmap; - revertmap = backup; - } - - /// - /// Saves the current heightmap into the revertmap - /// - public void SaveRevertMap() - { - revertmap = heightmap.Copy(); - } - - /// - /// Processes a terrain-specific command - /// - /// Commandline arguments (space seperated) - /// Reference that returns error or help text if returning false - /// If the operation was successful (if not, the error is placed into resultText) - public bool RunTerrainCmd(string[] args, ref string resultText, string simName) - { - string command; - if (args.Length > 0) - { - command = args[0]; - } - else - { - command = "help"; - } - - try - { - switch (command) - { - case "help": - resultText += "terrain regenerate - rebuilds the sims terrain using a default algorithm\n"; - resultText += - "terrain hills \n"; - resultText += " type should be spheres, blocks, cones, or squared\n"; - resultText += - "terrain voronoi - generates a worley fractal with X points per block"; - resultText += "terrain seed - sets the random seed value to \n"; - resultText += - "terrain load - loads a terrain from disk, type can be 'F32', 'F64', 'RAW' or 'IMG'\n"; - resultText += - "terrain save - saves a terrain to disk, type can be 'F32', 'F64', 'PNG', 'RAW' or 'HIRAW'\n"; - resultText += - "terrain save grdmap - creates a PNG snapshot of the region using a named gradient map\n"; - resultText += - "terrain rescale - rescales a terrain to be between and meters high\n"; - resultText += "terrain fill - fills a terrain at the specified height\n"; - resultText += - "terrain erode aerobic \n"; - resultText += "terrain erode thermal \n"; - resultText += "terrain erode hydraulic \n"; - resultText += "terrain multiply - multiplies a terrain by \n"; - resultText += "terrain elevate - elevates a terrain by \n"; - resultText += "terrain revert - reverts the terrain to the stored original\n"; - resultText += "terrain bake - saves the current terrain into the revert map\n"; - resultText += - "terrain csfilter - loads a new filter from the specified .cs file\n"; - resultText += - "terrain jsfilter - loads a new filter from the specified .js file\n"; - foreach (KeyValuePair filter in customFilters.filters) - { - resultText += filter.Value.Help(); - } - - return false; - - case "revert": - SwapRevertMaps(); - SaveRevertMap(); - break; - - case "bake": - SaveRevertMap(); - break; - - case "seed": - SetSeed(Convert.ToInt32(args[1])); - break; - - case "erode": - return ConsoleErosion(args, ref resultText); - - case "voronoi": - double[] c = new double[2]; - c[0] = -1; - c[1] = 1; - heightmap.VoronoiDiagram(Convert.ToInt32(args[1]), Convert.ToInt32(args[2]), c); - break; - - case "hills": - return ConsoleHills(args, ref resultText); - - case "regenerate": - SetDefaultTerrain(); - break; - - case "rescale": - SetRange(Convert.ToSingle(args[1]), Convert.ToSingle(args[2])); - break; - - case "elevate": - Elevate(Convert.ToSingle(args[1])); - break; - - case "fill": - heightmap.Fill(Convert.ToDouble(args[1])); - tainted++; - break; - - case "clip": - heightmap.Clip(Convert.ToDouble(args[1]), Convert.ToDouble(args[2])); - tainted++; - break; - - case "smooth": - heightmap.Smooth(Convert.ToDouble(args[1])); - tainted++; - break; - - case "add": - heightmap += Convert.ToDouble(args[1]); - tainted++; - break; - - case "multiply": - heightmap *= Convert.ToDouble(args[1]); - tainted++; - break; - - case "load": - string filenameL = args[2].Replace("%name%", simName); - filenameL = filenameL.Replace("%x%", offsetX.ToString()); - filenameL = filenameL.Replace("%y%", offsetY.ToString()); - - switch (args[1].ToLower()) - { - case "f32": - LoadFromFileF32(filenameL); - break; - - case "f64": - LoadFromFileF64(filenameL); - break; - - case "raw": - LoadFromFileSLRAW(filenameL); - break; - - case "img": - heightmap = heightmap.LoadImage(filenameL); - tainted++; - break; - - default: - resultText = "Unknown image or data format"; - return false; - } - break; - - case "load-tile": - switch (args[1].ToLower()) - { - case "f32": - LoadFromFileF32(args[2], Convert.ToInt32(args[3]), Convert.ToInt32(args[4]), - Convert.ToInt32(args[5]), Convert.ToInt32(args[6])); - break; - case "raw": - LoadFromFileSLRAW(args[2], Convert.ToInt32(args[3]), Convert.ToInt32(args[4]), - Convert.ToInt32(args[5]), Convert.ToInt32(args[6])); - break; - case "img": - LoadFromFileIMG(args[2], Convert.ToInt32(args[3]), Convert.ToInt32(args[4]), - Convert.ToInt32(args[5]), Convert.ToInt32(args[6])); - break; - default: - resultText = "Unknown or unsupported image or data format"; - return false; - } - break; - - case "save": - string filename = args[2].Replace("%name%", simName); - filename = filename.Replace("%x%", offsetX.ToString()); - filename = filename.Replace("%y%", offsetY.ToString()); - - switch (args[1].ToLower()) - { - case "f32": - WriteToFileF32(filename); - break; - - case "f64": - WriteToFileF64(filename); - break; - - case "grdmap": - if (args.Length >= 4) - WriteImage(filename, args[3]); - else - WriteImage(filename, "defaultstripe.png"); - break; - - case "png": - heightmap.SaveImage(filename); - break; - - case "raw": - WriteToFileRAW(filename); - break; - - case "hiraw": - WriteToFileHiRAW(filename); - break; - - default: - resultText = "Unknown image or data format"; - return false; - } - break; - - case "csfilter": - customFilters.LoadFilterCSharp(args[1]); - break; - case "jsfilter": - customFilters.LoadFilterJScript(args[1]); - break; - - default: - // Run any custom registered filters - if (customFilters.filters.ContainsKey(command)) - { - customFilters.filters[command].Filter(heightmap, args); - break; - } - else - { - resultText = "Unknown terrain command"; - return false; - } - } - return true; - } - catch (Exception e) // SEMI-LEGIT: Catching problems caused by user input or scripts - { - resultText = "Error running terrain command: " + e.ToString(); - return false; - } - } - - private bool ConsoleErosion(string[] args, ref string resultText) - { - double min = heightmap.FindMin(); - double max = heightmap.FindMax(); - - switch (args[1].ToLower()) - { - case "aerobic": - // WindSpeed, PickupMinimum,DropMinimum,Carry,Rounds,Lowest - heightmap.AerobicErosion(Convert.ToDouble(args[2]), Convert.ToDouble(args[3]), - Convert.ToDouble(args[4]), Convert.ToDouble(args[5]), - Convert.ToInt32(args[6]), Convert.ToBoolean(args[7]), - Convert.ToBoolean(args[8])); - break; - case "thermal": - heightmap.ThermalWeathering(Convert.ToDouble(args[2]), Convert.ToInt32(args[3]), - Convert.ToDouble(args[4])); - break; - case "hydraulic": - Channel rainMap = new Channel(w, h); - rainMap.Fill(Convert.ToDouble(args[2])); - heightmap.HydraulicErosion(rainMap, Convert.ToDouble(args[3]), Convert.ToDouble(args[4]), - Convert.ToInt32(args[5]), Convert.ToInt32(args[6])); - break; - default: - resultText = "Unknown erosion type"; - return false; - } - - heightmap.Normalise(min, max); - - tainted++; - return true; - } - - private bool ConsoleHills(string[] args, ref string resultText) - { - Random RandomClass = new Random(); - SetSeed(RandomClass.Next()); - int count; - double sizeMin; - double sizeRange; - bool island; - bool additive; - bool noisy; - - if (args.GetLength(0) > 2) - { - int.TryParse(args[2].ToString(), out count); - double.TryParse(args[3].ToString(), NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, - out sizeMin); - double.TryParse(args[4].ToString(), NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, - out sizeRange); - bool.TryParse(args[5].ToString(), out island); - bool.TryParse(args[6].ToString(), out additive); - bool.TryParse(args[7].ToString(), out noisy); - } - else - { - count = 200; - sizeMin = 20; - sizeRange = 40; - island = true; - additive = true; - noisy = false; - } - - switch (args[1].ToLower()) - { - case "blocks": - heightmap.HillsBlocks(count, sizeMin, sizeRange, island, additive, noisy); - break; - case "cones": - heightmap.HillsCones(count, sizeMin, sizeRange, island, additive, noisy); - break; - case "spheres": - heightmap.HillsSpheres(count, sizeMin, sizeRange, island, additive, noisy); - break; - case "squared": - heightmap.HillsSquared(count, sizeMin, sizeRange, island, additive, noisy); - break; - default: - resultText = "Unknown hills type"; - return false; - } - tainted++; - return true; - } - - /// - /// Renormalises the array between min and max - /// - /// Minimum value of the new array - /// Maximum value of the new array - public void SetRange(float min, float max) - { - heightmap.Normalise((double) min, (double) max); - tainted++; - } - - /// - /// Adds meters (positive or negative) to terrain height - /// - /// Positive or negative value to add to new array - public void Elevate(float meters) - { - heightmap.Elevate((double)meters); - tainted++; - } - - /// - /// Loads a file consisting of 256x256 doubles and imports it as an array into the map. - /// - /// TODO: Move this to libTerrain itself - /// The filename of the double array to import - public void LoadFromFileF64(string filename) - { - FileInfo file = new FileInfo(filename); - FileStream s = file.Open(FileMode.Open, FileAccess.Read); - BinaryReader bs = new BinaryReader(s); - int x, y; - for (y = 0; y < h; y++) - { - for (x = 0; x < h; x++) - { - heightmap.Set(x, y, (double) bs.ReadSingle()); - } - } - - bs.Close(); - s.Close(); - - tainted++; - } - - /// - /// Loads a file consisting of 256x256 floats and imports it as an array into the map. - /// - /// TODO: Move this to libTerrain itself - /// The filename of the float array to import - public void LoadFromFileF32(string filename) - { - FileInfo file = new FileInfo(filename); - FileStream s = file.Open(FileMode.Open, FileAccess.Read); - BinaryReader bs = new BinaryReader(s); - int x, y; - for (y = 0; y < h; y++) - { - for (x = 0; x < w; x++) - { - heightmap.Set(x, y, (double) bs.ReadSingle()); - } - } - - bs.Close(); - s.Close(); - - tainted++; - } - - /// - /// Loads a section of a larger heightmap (F32) - /// - /// File to load - /// Size of the file - /// Size of the file - /// Where do the region coords start for this terrain? - /// Where do the region coords start for this terrain? - public void LoadFromFileF32(string filename, int dimensionX, int dimensionY, int lowerboundX, int lowerboundY) - { - fileIOLock.WaitOne(); - try - { - int sectionToLoadX = ((offsetX - lowerboundX)*w); - int sectionToLoadY = ((offsetY - lowerboundY)*h); - - double[,] tempMap = new double[dimensionX,dimensionY]; - - FileInfo file = new FileInfo(filename); - FileStream s = file.Open(FileMode.Open, FileAccess.Read); - BinaryReader bs = new BinaryReader(s); - - int x, y; - for (x = 0; x < dimensionX; x++) - { - for (y = 0; y < dimensionY; y++) - { - tempMap[x, y] = (double) bs.ReadSingle(); - } - } - - for (y = 0; y < h; y++) - { - for (x = 0; x < w; x++) - { - heightmap.Set(x, y, tempMap[x + sectionToLoadX, y + sectionToLoadY]); - } - } - - bs.Close(); - s.Close(); - - tainted++; - } - finally - { - fileIOLock.ReleaseMutex(); - } - } - - /// - /// Loads a larger tiled image across a terrain - /// - /// Filename to load from (any generic image format should work) - /// The dimensions of the image - /// The dimensions of the image - /// Where sim coords begin for this patch - /// Where sim coords begin for this patch - public void LoadFromFileIMG(string filename, int dimensionX, int dimensionY, int lowerboundX, int lowerboundY) - { - int sectionToLoadX = ((offsetX - lowerboundX)*w); - int sectionToLoadY = ((offsetY - lowerboundY)*h); - - double[,] tempMap = new double[dimensionX,dimensionY]; - - Bitmap lgrBmp = new Bitmap(filename); - - int x, y; - for (x = 0; x < dimensionX; x++) - { - for (y = 0; y < dimensionY; y++) - { - tempMap[x, y] = (float) lgrBmp.GetPixel(x, y).GetBrightness(); - } - } - - for (y = 0; y < h; y++) - { - for (x = 0; x < w; x++) - { - heightmap.Set(x, y, tempMap[x + sectionToLoadX, y + sectionToLoadY]); - } - } - - tainted++; - } - - /// - /// Loads a file formatted in the SL .RAW Format used on the main grid - /// - /// This file format stinks and is best avoided. - /// A path to the .RAW format - public void LoadFromFileSLRAW(string filename) - { - FileInfo file = new FileInfo(filename); - FileStream s = file.Open(FileMode.Open, FileAccess.Read); - BinaryReader bs = new BinaryReader(s); - int x, y; - for (y = 0; y < h; y++) - { - for (x = 0; x < w; x++) - { - heightmap.Set(x, y, (double) bs.ReadByte()*((double) bs.ReadByte()/127.0)); - bs.ReadBytes(11); // Advance the stream to next bytes. - } - } - - bs.Close(); - s.Close(); - - tainted++; - } - - /// - /// Loads a section of a larger heightmap (RAW) - /// - /// File to load - /// Size of the file - /// Size of the file - /// Where do the region coords start for this terrain? - /// Where do the region coords start for this terrain? - public void LoadFromFileSLRAW(string filename, int dimensionX, int dimensionY, int lowerboundX, int lowerboundY) - { - // TODO: Mutex fails to release readlock on folder! --> only one file can be loaded into sim - //fileIOLock.WaitOne(); - //try - //{ - int sectionToLoadX = ((offsetX - lowerboundX)*w); - int sectionToLoadY = ((offsetY - lowerboundY)*h); - - double[,] tempMap = new double[dimensionX,dimensionY]; - - FileInfo file = new FileInfo(filename); - FileStream s = file.Open(FileMode.Open, FileAccess.Read); - BinaryReader bs = new BinaryReader(s); - - int x, y; - for (x = 0; x < dimensionX; x++) - { - for (y = 0; y < dimensionY; y++) - { - tempMap[x, y] = (double) bs.ReadByte()*((double) bs.ReadByte()/127.0); - bs.ReadBytes(11); // Advance the stream to next bytes. - } - } - - for (y = 0; y < h; y++) - { - for (x = 0; x < w; x++) - { - heightmap.Set(x, y, tempMap[x + sectionToLoadX, y + sectionToLoadY]); - } - } - - bs.Close(); - s.Close(); - - tainted++; - //} - //finally - //{ - // fileIOLock.ReleaseMutex(); - //} - } - - /// - /// Writes the current terrain heightmap to disk, in the format of a 65536 entry double[] array. - /// - /// The desired output filename - public void WriteToFileF64(string filename) - { - FileInfo file = new FileInfo(filename); - FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write); - BinaryWriter bs = new BinaryWriter(s); - - int x, y; - for (y = 0; y < h; y++) - { - for (x = 0; x < w; x++) - { - bs.Write(heightmap.Get(x, y)); - } - } - - bs.Close(); - s.Close(); - } - - /// - /// Writes the current terrain heightmap to disk, in the format of a 65536 entry float[] array - /// - /// The desired output filename - public void WriteToFileF32(string filename) - { - FileInfo file = new FileInfo(filename); - FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write); - BinaryWriter bs = new BinaryWriter(s); - - int x, y; - for (y = 0; y < h; y++) - { - for (x = 0; x < w; x++) - { - bs.Write((float) heightmap.Get(x, y)); - } - } - - bs.Close(); - s.Close(); - } - - /// - /// A very fast LL-RAW file output mechanism - lower precision mechanism but wont take 5 minutes to run either. - /// (is also editable in an image application) - /// - /// Filename to write to - public void WriteToFileRAW(string filename) - { - FileInfo file = new FileInfo(filename); - FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write); - BinaryWriter binStream = new BinaryWriter(s); - - int x, y; - - // Used for the 'green' channel. - byte avgMultiplier = (byte) heightmap.Avg(); - byte backupMultiplier = (byte) revertmap.Avg(); - - // Limit the multiplier so it can represent points >64m. - if (avgMultiplier > 196) - avgMultiplier = 196; - if (backupMultiplier > 196) - backupMultiplier = 196; - // Make sure it's at least one to prevent a div by zero - if (avgMultiplier < 1) - avgMultiplier = 1; - if (backupMultiplier < 1) - backupMultiplier = 1; - - for (y = 0; y < h; y++) - { - for (x = 0; x < h; x++) - { - byte red = (byte) (heightmap.Get(x, y)/((double) avgMultiplier/128.0)); - byte green = avgMultiplier; - byte blue = (byte) watermap.Get(x, y); - byte alpha1 = 0; // Land Parcels - byte alpha2 = 0; // For Sale Land - byte alpha3 = 0; // Public Edit Object - byte alpha4 = 0; // Public Edit Land - byte alpha5 = 255; // Safe Land - byte alpha6 = 255; // Flying Allowed - byte alpha7 = 255; // Create Landmark - byte alpha8 = 255; // Outside Scripts - byte alpha9 = (byte) (revertmap.Get(x, y)/((double) backupMultiplier/128.0)); - byte alpha10 = backupMultiplier; - - binStream.Write(red); - binStream.Write(green); - binStream.Write(blue); - binStream.Write(alpha1); - binStream.Write(alpha2); - binStream.Write(alpha3); - binStream.Write(alpha4); - binStream.Write(alpha5); - binStream.Write(alpha6); - binStream.Write(alpha7); - binStream.Write(alpha8); - binStream.Write(alpha9); - binStream.Write(alpha10); - } - } - binStream.Close(); - s.Close(); - } - - /// - /// Outputs to a LL compatible RAW in the most efficient manner possible - /// - /// Does not calculate the revert map - /// The filename to output to - public void WriteToFileHiRAW(string filename) - { - FileInfo file = new FileInfo(filename); - FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write); - BinaryWriter binStream = new BinaryWriter(s); - - // Generate a smegging big lookup table to speed the operation up (it needs it) - double[] lookupHeightTable = new double[65536]; - int i, j, x, y; - for (i = 0; i < 256; i++) - { - for (j = 0; j < 256; j++) - { - lookupHeightTable[i + (j*256)] = ((double) i*((double) j/127.0)); - } - } - - // Output the calculated raw - for (y = 0; y < h; y++) - { - for (x = 0; x < w; x++) - { - double t = heightmap.Get(x, y); - double min = double.MaxValue; - int index = 0; - - for (i = 0; i < 65536; i++) - { - if (Math.Abs(t - lookupHeightTable[i]) < min) - { - min = Math.Abs(t - lookupHeightTable[i]); - index = i; - } - } - - byte red = (byte) (index & 0xFF); - byte green = (byte) ((index >> 8) & 0xFF); - byte blue = (byte) watermap.Get(x, y); - byte alpha1 = 0; // Land Parcels - byte alpha2 = 0; // For Sale Land - byte alpha3 = 0; // Public Edit Object - byte alpha4 = 0; // Public Edit Land - byte alpha5 = 255; // Safe Land - byte alpha6 = 255; // Flying Allowed - byte alpha7 = 255; // Create Landmark - byte alpha8 = 255; // Outside Scripts - byte alpha9 = red; - byte alpha10 = green; - - binStream.Write(red); - binStream.Write(green); - binStream.Write(blue); - binStream.Write(alpha1); - binStream.Write(alpha2); - binStream.Write(alpha3); - binStream.Write(alpha4); - binStream.Write(alpha5); - binStream.Write(alpha6); - binStream.Write(alpha7); - binStream.Write(alpha8); - binStream.Write(alpha9); - binStream.Write(alpha10); - } - } - - binStream.Close(); - s.Close(); - } - - /// - /// Sets the random seed to be used by procedural functions which involve random numbers. - /// - /// The desired seed - public void SetSeed(int val) - { - heightmap.seed = val; - } - - /// - /// Sets a particular heightmap point to a specified value - /// - /// X Coordinate - /// Y Coordinate - /// Value - public void Set(int x, int y, double val) - { - lock (heightmap) - { - heightmap.Set(x, y, val); - } - tainted++; - } - - /// - /// Raises land in a sphere around the specified coordinates - /// - /// Center of the sphere on the X axis - /// Center of the sphere on the Y axis - /// The radius of the sphere - /// Scale the height of the sphere by this amount (recommended 0..2) - public void RaiseTerrain(double rx, double ry, double size, double amount) - { - lock (heightmap) - { - heightmap.Raise(rx, ry, size, amount); - } - - tainted++; - } - - /// - /// Lowers the land in a sphere around the specified coordinates - /// - /// The center of the sphere at the X axis - /// The center of the sphere at the Y axis - /// The radius of the sphere in meters - /// Scale the height of the sphere by this amount (recommended 0..2) - public void LowerTerrain(double rx, double ry, double size, double amount) - { - lock (heightmap) - { - heightmap.Lower(rx, ry, size, amount); - } - - tainted++; - } - - /// - /// Flattens the land under the brush of specified coordinates (spherical mask) - /// - /// Center of sphere - /// Center of sphere - /// Radius of the sphere - /// Thickness of the mask (0..2 recommended) - public void FlattenTerrain(double rx, double ry, double size, double amount) - { - lock (heightmap) - { - heightmap.Flatten(rx, ry, size, amount); - } - - tainted++; - } - - /// - /// Creates noise within the specified bounds - /// - /// Center of the bounding sphere - /// Center of the bounding sphere - /// The radius of the sphere - /// Strength of the mask (0..2) recommended - public void NoiseTerrain(double rx, double ry, double size, double amount) - { - lock (heightmap) - { - Channel smoothed = new Channel(); - smoothed.Noise(); - - Channel mask = new Channel(); - mask.Raise(rx, ry, size, amount); - - heightmap.Blend(smoothed, mask); - } - - tainted++; - } - - /// - /// Reverts land within the specified bounds - /// - /// Center of the bounding sphere - /// Center of the bounding sphere - /// The radius of the sphere - /// Strength of the mask (0..2) recommended - public void RevertTerrain(double rx, double ry, double size, double amount) - { - lock (heightmap) - { - Channel mask = new Channel(); - mask.Raise(rx, ry, size, amount); - - heightmap.Blend(revertmap, mask); - } - - tainted++; - } - - /// - /// Smooths land under the brush of specified coordinates (spherical mask) - /// - /// Center of the sphere - /// Center of the sphere - /// Radius of the sphere - /// Thickness of the mask (0..2 recommended) - public void SmoothTerrain(double rx, double ry, double size, double amount) - { - lock (heightmap) - { - // perform essential computation as a channel method - heightmap.SmoothRegion(rx, ry, size, amount); - } - - tainted++; - } - - /// - /// Generates a simple set of hills in the shape of an island - /// - public void SetDefaultTerrain() - { - lock (heightmap) - { - heightmap.HillsSpheres(200, 20, 40, true, true, false); - heightmap.Normalise(); - heightmap *= 60.0; // Raise to 60m - heightmap.Clip(0.0, 25.0); - heightmap.Pertubation(2.5); - heightmap.Smooth(35.0); - heightmap.Normalise(0.0, 21.0); - } - - tainted++; - } - - /// - /// Wrapper to heightmap.get() - /// - /// X coord - /// Y coord - /// Height at specified coordinates - public double GetHeight(int x, int y) - { - return heightmap.Get(x, y); - } - - /// - /// Multiplies the heightfield by val - /// - /// The heightfield - /// The multiplier - /// - public static TerrainEngine operator *(TerrainEngine terrain, Double val) - { - terrain.heightmap *= val; - terrain.tainted++; - return terrain; - } - - /// - /// Exports the current heightmap to a PNG file - /// - /// The destination filename for the image - /// A 1x*height* image which contains the colour gradient to export with. Must be at least 1x2 pixels, 1x256 or more is ideal. - public void WriteImage(string filename, string gradientmap) - { - try - { - Bitmap bmp = TerrainToBitmap(gradientmap); - - bmp.Save(filename, ImageFormat.Png); - } - catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke - { - Console.WriteLine("Failed generating terrain map: " + e.ToString()); - } - } - - /// - /// Exports the current heightmap in Jpeg2000 format to a byte[] - /// - /// A 1x*height* image which contains the colour gradient to export with. Must be at least 1x2 pixels, 1x256 or more is ideal. - public byte[] WriteJpegImage(string gradientmap) - { - byte[] imageData = null; - try - { - Bitmap bmp = TerrainToBitmap(gradientmap); - - imageData = OpenJPEG.EncodeFromImage(bmp, true); - } - catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke - { - Console.WriteLine("Failed generating terrain map: " + e.ToString()); - } - - return imageData; - } - - private Bitmap TerrainToBitmap(string gradientmap) - { - Bitmap gradientmapLd = new Bitmap(gradientmap); - - int pallete = gradientmapLd.Height; - - Bitmap bmp = new Bitmap(heightmap.w, heightmap.h); - Color[] colours = new Color[pallete]; - - for (int i = 0; i < pallete; i++) - { - colours[i] = gradientmapLd.GetPixel(0, i); - } - - Channel copy = heightmap.Copy(); - for (int y = 0; y < copy.h; y++) - { - for (int x = 0; x < copy.w; x++) - { - // 512 is the largest possible height before colours clamp - int colorindex = (int) (Math.Max(Math.Min(1.0, copy.Get(x, y)/512.0), 0.0)*(pallete - 1)); - bmp.SetPixel(x, copy.h - y - 1, colours[colorindex]); - } - } - return bmp; - } - } -} diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs deleted file mode 100644 index 3e94dca..0000000 --- a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs +++ /dev/null @@ -1,125 +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.CodeDom.Compiler; -using System.Collections.Generic; -using libTerrain; -using Microsoft.CSharp; -using Microsoft.JScript; - -namespace OpenSim.Region.Terrain -{ - public interface ITerrainFilter - { - void Filter(Channel heightmap, string[] args); - string Register(); - string Help(); - } - - public class TestFilter : ITerrainFilter - { - public void Filter(Channel heightmap, string[] args) - { - Console.WriteLine("Hello world"); - } - - public string Register() - { - return "demofilter"; - } - - public string Help() - { - return "demofilter - Does nothing"; - } - } - - public class FilterHost - { - public Dictionary filters = new Dictionary(); - - private void LoadFilter(CodeDomProvider compiler, string filename) - { - CompilerParameters compilerParams = new CompilerParameters(); - CompilerResults compilerResults; - compilerParams.GenerateExecutable = false; - compilerParams.GenerateInMemory = true; - compilerParams.IncludeDebugInformation = false; - compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll"); - compilerParams.ReferencedAssemblies.Add("System.dll"); - - compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); - - if (compilerResults.Errors.Count > 0) - { - Console.WriteLine("Compile errors:"); - foreach (CompilerError error in compilerResults.Errors) - { - Console.WriteLine(error.Line.ToString() + ": " + error.ErrorText.ToString()); - } - } - else - { - foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes()) - { - Type testInterface = pluginType.GetInterface("ITerrainFilter", true); - - if (testInterface != null) - { - ITerrainFilter filter = - (ITerrainFilter) compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString()); - - string filterName = filter.Register(); - Console.WriteLine("Plugin: " + filterName + " loaded."); - - if (!filters.ContainsKey(filterName)) - { - filters.Add(filterName, filter); - } - else - { - filters[filterName] = filter; - } - } - } - } - } - - public void LoadFilterCSharp(string filename) - { - CSharpCodeProvider compiler = new CSharpCodeProvider(); - LoadFilter(compiler, filename); - } - - public void LoadFilterJScript(string filename) - { - JScriptCodeProvider compiler = new JScriptCodeProvider(); - LoadFilter(compiler, filename); - } - } -} 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; - } - } -} diff --git a/prebuild.xml b/prebuild.xml index 40aa2fb..5fc0a42 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -646,35 +646,6 @@ - - - - - - ../../../bin/ - - - - - ../../../bin/ - - - - ../../../bin/ - - - - - - - - - - - - - - @@ -816,7 +787,6 @@ - @@ -852,7 +822,6 @@ - @@ -1057,7 +1026,6 @@ - @@ -1506,7 +1474,6 @@ - @@ -1539,7 +1506,6 @@ - @@ -1574,7 +1540,6 @@ - @@ -1611,7 +1576,6 @@ - @@ -1698,7 +1662,6 @@ - -- cgit v1.1