From f64611862a46c91f416134146cb53fa720a96ec5 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Wed, 5 Mar 2008 00:52:35 +0000 Subject: * New Terrain Module (disabled, search for 'usingTerrainModule = false' to reenable) * *Much* faster terraforming (woot!) * New "Brushes" design, so you can create custom terraforming brushes then apply those inplace of the standard tools. (ie an Erode Brush for example) * New specialised "Flood Brushes" to do large area effects, ie, raise-area, now takes a bitmap rather than repeats the ordinary raise brush a thousand times. * New modular file Load/Save systems -- write importers/exporters for multiple formats without having to hard code the whole thing in. * Coming soon - effects system, ie the old Erosion functions, etc. for one-shot effects. --- .../Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs | 4 ++-- .../Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs | 4 ++-- .../Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs | 4 ++-- .../Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs | 4 ++-- .../Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/Terrain/PaintBrushes') diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs index c1ef9d6..0e98111 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs @@ -72,7 +72,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes #region ITerrainPaintableEffect Members - public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength) + public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration) { int x, y; double[,] tweak = new double[map.Width, map.Height]; @@ -106,7 +106,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes { for (y = 0; y < map.Height; y++) { - double z = SphericalFactor(x, y, rx, ry, strength); + double z = SphericalFactor(x, y, rx, ry, strength) * duration; if (z > 0) // add in non-zero amount { diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs index b6696a9..2201584 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs @@ -34,7 +34,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes { #region ITerrainPaintableEffect Members - public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength) + public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration) { int x, y; for (x = 0; x < map.Width; x++) @@ -55,7 +55,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry)); if (z > 0.0) - map[x, y] -= z; + map[x, y] -= z * duration; } } } diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs index 0471408..776e31f 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs @@ -35,7 +35,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes { #region ITerrainPaintableEffect Members - public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength) + public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration) { int x, y; for (x = 0; x < map.Width; x++) @@ -63,7 +63,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes } if (z > 0.0) - map[x, y] += (noise - 0.5) * z; + map[x, y] += (noise - 0.5) * z * duration; } } } diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs index b0fda8e..5b9f410 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs @@ -34,7 +34,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes { #region ITerrainPaintableEffect Members - public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength) + public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration) { int x, y; for (x = 0; x < map.Width; x++) @@ -55,7 +55,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry)); if (z > 0.0) - map[x, y] += z; + map[x, y] += z * duration; } } } diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs index d3ae73e..90bbafc 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs @@ -72,7 +72,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes #region ITerrainPaintableEffect Members - public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength) + public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration) { int x, y; double[,] tweak = new double[map.Width, map.Height]; @@ -116,7 +116,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes { double da = z; double a = (map[x, y] - tweak[x, y]) * da; - double newz = map[x, y] - a; + double newz = map[x, y] - (a * duration); if (newz > 0.0) map[x, y] = newz; -- cgit v1.1