From c6bc1d28ecce5d2f7da57c396e0b964b3a750719 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 30 Jul 2010 20:34:14 +0100 Subject: move ChannelDigger from its own project into the main terrain module with the rest of the effects --- .../World/Terrain/DefaultEffects/ChannelDigger.cs | 107 --------------------- .../World/Terrain/Effects/ChannelDigger.cs | 107 +++++++++++++++++++++ prebuild.xml | 24 ----- 3 files changed, 107 insertions(+), 131 deletions(-) delete mode 100644 OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs create mode 100644 OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs diff --git a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs deleted file mode 100644 index e23be59..0000000 --- a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.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 OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using OpenSim.Region.CoreModules.World.Terrain; -using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes; -using OpenSim.Region.Framework.Interfaces; - -namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects -{ - public class ChannelDigger : ITerrainEffect - { - private readonly int num_h = 4; - private readonly int num_w = 4; - - private readonly ITerrainFloodEffect raiseFunction = new RaiseArea(); - private readonly ITerrainFloodEffect smoothFunction = new SmoothArea(); - - #region ITerrainEffect Members - - public void RunEffect(ITerrainChannel map) - { - FillMap(map, 15); - BuildTiles(map, 7); - SmoothMap(map, 3); - } - - #endregion - - private void SmoothMap(ITerrainChannel map, int rounds) - { - Boolean[,] bitmap = new bool[map.Width,map.Height]; - for (int x = 0; x < map.Width; x++) - { - for (int y = 0; y < map.Height; y++) - { - bitmap[x, y] = true; - } - } - - for (int i = 0; i < rounds; i++) - { - smoothFunction.FloodEffect(map, bitmap, 1.0); - } - } - - private void FillMap(ITerrainChannel map, double val) - { - for (int x = 0; x < map.Width; x++) - for (int y = 0; y < map.Height; y++) - map[x, y] = val; - } - - private void BuildTiles(ITerrainChannel map, double height) - { - int channelWidth = (int) Math.Floor((map.Width / num_w) * 0.8); - int channelHeight = (int) Math.Floor((map.Height / num_h) * 0.8); - int channelXOffset = (map.Width / num_w) - channelWidth; - int channelYOffset = (map.Height / num_h) - channelHeight; - - for (int x = 0; x < num_w; x++) - { - for (int y = 0; y < num_h; y++) - { - int xoff = ((channelXOffset + channelWidth) * x) + (channelXOffset / 2); - int yoff = ((channelYOffset + channelHeight) * y) + (channelYOffset / 2); - - Boolean[,] bitmap = new bool[map.Width,map.Height]; - - for (int dx = 0; dx < channelWidth; dx++) - { - for (int dy = 0; dy < channelHeight; dy++) - { - bitmap[dx + xoff, dy + yoff] = true; - } - } - - raiseFunction.FloodEffect(map, bitmap, height); - } - } - } - } -} diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs new file mode 100644 index 0000000..36917e9 --- /dev/null +++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs @@ -0,0 +1,107 @@ +/* + * 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 OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using OpenSim.Region.CoreModules.World.Terrain; +using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes; +using OpenSim.Region.Framework.Interfaces; + +namespace OpenSim.Region.CoreModules.World.Terrain.Effects +{ + public class ChannelDigger : ITerrainEffect + { + private readonly int num_h = 4; + private readonly int num_w = 4; + + private readonly ITerrainFloodEffect raiseFunction = new RaiseArea(); + private readonly ITerrainFloodEffect smoothFunction = new SmoothArea(); + + #region ITerrainEffect Members + + public void RunEffect(ITerrainChannel map) + { + FillMap(map, 15); + BuildTiles(map, 7); + SmoothMap(map, 3); + } + + #endregion + + private void SmoothMap(ITerrainChannel map, int rounds) + { + Boolean[,] bitmap = new bool[map.Width,map.Height]; + for (int x = 0; x < map.Width; x++) + { + for (int y = 0; y < map.Height; y++) + { + bitmap[x, y] = true; + } + } + + for (int i = 0; i < rounds; i++) + { + smoothFunction.FloodEffect(map, bitmap, 1.0); + } + } + + private void FillMap(ITerrainChannel map, double val) + { + for (int x = 0; x < map.Width; x++) + for (int y = 0; y < map.Height; y++) + map[x, y] = val; + } + + private void BuildTiles(ITerrainChannel map, double height) + { + int channelWidth = (int) Math.Floor((map.Width / num_w) * 0.8); + int channelHeight = (int) Math.Floor((map.Height / num_h) * 0.8); + int channelXOffset = (map.Width / num_w) - channelWidth; + int channelYOffset = (map.Height / num_h) - channelHeight; + + for (int x = 0; x < num_w; x++) + { + for (int y = 0; y < num_h; y++) + { + int xoff = ((channelXOffset + channelWidth) * x) + (channelXOffset / 2); + int yoff = ((channelYOffset + channelHeight) * y) + (channelYOffset / 2); + + Boolean[,] bitmap = new bool[map.Width,map.Height]; + + for (int dx = 0; dx < channelWidth; dx++) + { + for (int dy = 0; dy < channelHeight; dy++) + { + bitmap[dx + xoff, dy + yoff] = true; + } + } + + raiseFunction.FloodEffect(map, bitmap, height); + } + } + } + } +} diff --git a/prebuild.xml b/prebuild.xml index 491e822..5f55461 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -1366,35 +1366,11 @@ - - - - - ../../../../../../bin/Terrain/ - - - - - ../../../../../../bin/Terrain/ - - - - ../../../../../../bin/ - - - - - - - - - - -- cgit v1.1