From 05e24c8f58e5cc41b3e7704b1912dfbe9703d4fe Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Mon, 21 Apr 2008 06:39:16 +0000
Subject: * Terrain Module code has been reformatted to comply with guidelines.
* Fixed a variety of code quality issues. (Yes, I've found ReSharper.)
---
.../Environment/Modules/Terrain/TerrainModule.cs | 642 ++++++++++++---------
1 file changed, 367 insertions(+), 275 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs')
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
index 27bfb36..987c3d0 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
@@ -27,18 +27,29 @@
using System;
using System.Collections.Generic;
-using System.Drawing;
+using System.IO;
+using System.Reflection;
using libsecondlife;
+using log4net;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Modules.ModuleFramework;
+using OpenSim.Region.Environment.Modules.Terrain.Effects;
+using OpenSim.Region.Environment.Modules.Terrain.FileLoaders;
+using OpenSim.Region.Environment.Modules.Terrain.FloodBrushes;
+using OpenSim.Region.Environment.Modules.Terrain.PaintBrushes;
+using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.Terrain
{
- public class TerrainModule : IRegionModule, ICommandableModule, OpenSim.Region.Environment.Modules.Terrain.ITerrainModule
+ public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule
{
+ #region StandardTerrainEffects enum
+
+ ///
+ /// A standard set of terrain brushes and effects recognised by viewers
+ ///
public enum StandardTerrainEffects : byte
{
Flatten = 0,
@@ -54,68 +65,100 @@ namespace OpenSim.Region.Environment.Modules.Terrain
Olsen = 253
}
- private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+ #endregion
- private Commander m_commander = new Commander("Terrain");
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private Dictionary m_painteffects =
- new Dictionary();
- private Dictionary m_floodeffects =
+ private readonly Commander m_commander = new Commander("Terrain");
+
+ private readonly Dictionary m_floodeffects =
new Dictionary();
- private Dictionary m_loaders = new Dictionary();
- Scene m_scene;
- ITerrainChannel m_channel;
- ITerrainChannel m_revert;
- bool m_tainted = false;
- private IConfigSource m_gConfig;
- private void InstallDefaultEffects()
- {
- // Draggable Paint Brush Effects
- m_painteffects[StandardTerrainEffects.Raise] = new PaintBrushes.RaiseSphere();
- m_painteffects[StandardTerrainEffects.Lower] = new PaintBrushes.LowerSphere();
- m_painteffects[StandardTerrainEffects.Smooth] = new PaintBrushes.SmoothSphere();
- m_painteffects[StandardTerrainEffects.Noise] = new PaintBrushes.NoiseSphere();
- m_painteffects[StandardTerrainEffects.Flatten] = new PaintBrushes.FlattenSphere();
- m_painteffects[StandardTerrainEffects.Revert] = new PaintBrushes.RevertSphere(m_revert);
- m_painteffects[StandardTerrainEffects.Erode] = new PaintBrushes.ErodeSphere();
- m_painteffects[StandardTerrainEffects.Weather] = new PaintBrushes.WeatherSphere();
- m_painteffects[StandardTerrainEffects.Olsen] = new PaintBrushes.OlsenSphere();
+ private readonly Dictionary m_loaders = new Dictionary();
- // Area of effect selection effects
- m_floodeffects[StandardTerrainEffects.Raise] = new FloodBrushes.RaiseArea();
- m_floodeffects[StandardTerrainEffects.Lower] = new FloodBrushes.LowerArea();
- m_floodeffects[StandardTerrainEffects.Smooth] = new FloodBrushes.SmoothArea();
- m_floodeffects[StandardTerrainEffects.Noise] = new FloodBrushes.NoiseArea();
- m_floodeffects[StandardTerrainEffects.Flatten] = new FloodBrushes.FlattenArea();
- m_floodeffects[StandardTerrainEffects.Revert] = new FloodBrushes.RevertArea(m_revert);
+ private readonly Dictionary m_painteffects =
+ new Dictionary();
- // Filesystem load/save loaders
- m_loaders[".r32"] = new FileLoaders.RAW32();
- m_loaders[".f32"] = m_loaders[".r32"];
- m_loaders[".ter"] = new FileLoaders.Terragen();
- m_loaders[".raw"] = new FileLoaders.LLRAW();
- m_loaders[".jpg"] = new FileLoaders.JPEG();
- m_loaders[".jpeg"] = m_loaders[".jpg"];
- m_loaders[".bmp"] = new FileLoaders.BMP();
- m_loaders[".png"] = new FileLoaders.PNG();
- m_loaders[".gif"] = new FileLoaders.GIF();
- m_loaders[".tif"] = new FileLoaders.TIFF();
- m_loaders[".tiff"] = m_loaders[".tif"];
+ private ITerrainChannel m_channel;
+ private ITerrainChannel m_revert;
+ private Scene m_scene;
+ private bool m_tainted = false;
+
+ #region ICommandableModule Members
+
+ public ICommander CommandInterface
+ {
+ get { return m_commander; }
}
- public void UpdateRevertMap()
+ #endregion
+
+ #region IRegionModule Members
+
+ ///
+ /// Creates and initialises a terrain module for a region
+ ///
+ /// Region initialising
+ /// Config for the region
+ public void Initialise(Scene scene, IConfigSource config)
{
- int x, y;
- for (x = 0; x < m_channel.Width; x++)
+ m_scene = scene;
+
+ // Install terrain module in the simulator
+ if (m_scene.Heightmap == null)
{
- for (y = 0; y < m_channel.Height; y++)
+ lock (m_scene)
{
- m_revert[x, y] = m_channel[x, y];
+ m_channel = new TerrainChannel();
+ m_scene.Heightmap = m_channel;
+ m_revert = new TerrainChannel();
+ UpdateRevertMap();
}
}
+ else
+ {
+ m_channel = m_scene.Heightmap;
+ m_revert = new TerrainChannel();
+ UpdateRevertMap();
+ }
+
+ m_scene.RegisterModuleInterface(this);
+ m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
+ m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
+ m_scene.EventManager.OnTerrainTick += EventManager_OnTerrainTick;
+ }
+
+ ///
+ /// Enables terrain module when called
+ ///
+ public void PostInitialise()
+ {
+ InstallDefaultEffects();
+ InstallInterfaces();
+ }
+
+ public void Close()
+ {
+ }
+
+ public string Name
+ {
+ get { return "TerrainModule"; }
}
+ public bool IsSharedModule
+ {
+ get { return false; }
+ }
+
+ #endregion
+
+ #region ITerrainModule Members
+
+ ///
+ /// Loads a terrain file from disk and installs it in the scene.
+ ///
+ /// Filename to terrain file. Type is determined by extension.
public void LoadFromFile(string filename)
{
foreach (KeyValuePair loader in m_loaders)
@@ -133,12 +176,14 @@ namespace OpenSim.Region.Environment.Modules.Terrain
}
catch (NotImplementedException)
{
- m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value.ToString() + " parser does not support file loading. (May be save only)");
+ m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value +
+ " parser does not support file loading. (May be save only)");
return;
}
- catch (System.IO.FileNotFoundException)
+ catch (FileNotFoundException)
{
- m_log.Error("[TERRAIN]: Unable to load heightmap, file not found. (A directory permissions error may also cause this)");
+ m_log.Error(
+ "[TERRAIN]: Unable to load heightmap, file not found. (A directory permissions error may also cause this)");
return;
}
}
@@ -149,10 +194,97 @@ namespace OpenSim.Region.Environment.Modules.Terrain
m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader availible for that format.");
}
+ ///
+ /// Saves the current heightmap to a specified file.
+ ///
+ /// The destination filename
+ public void SaveToFile(string filename)
+ {
+ try
+ {
+ foreach (KeyValuePair loader in m_loaders)
+ {
+ if (filename.EndsWith(loader.Key))
+ {
+ loader.Value.SaveFile(filename, m_channel);
+ return;
+ }
+ }
+ }
+ catch (NotImplementedException)
+ {
+ m_log.Error("Unable to save to " + filename + ", saving of this file format has not been implemented.");
+ }
+ }
+
+ #endregion
+
+ ///
+ /// Installs into terrain module the standard suite of brushes
+ ///
+ private void InstallDefaultEffects()
+ {
+ // Draggable Paint Brush Effects
+ m_painteffects[StandardTerrainEffects.Raise] = new RaiseSphere();
+ m_painteffects[StandardTerrainEffects.Lower] = new LowerSphere();
+ m_painteffects[StandardTerrainEffects.Smooth] = new SmoothSphere();
+ m_painteffects[StandardTerrainEffects.Noise] = new NoiseSphere();
+ m_painteffects[StandardTerrainEffects.Flatten] = new FlattenSphere();
+ m_painteffects[StandardTerrainEffects.Revert] = new RevertSphere(m_revert);
+ m_painteffects[StandardTerrainEffects.Erode] = new ErodeSphere();
+ m_painteffects[StandardTerrainEffects.Weather] = new WeatherSphere();
+ m_painteffects[StandardTerrainEffects.Olsen] = new OlsenSphere();
+
+ // Area of effect selection effects
+ m_floodeffects[StandardTerrainEffects.Raise] = new RaiseArea();
+ m_floodeffects[StandardTerrainEffects.Lower] = new LowerArea();
+ m_floodeffects[StandardTerrainEffects.Smooth] = new SmoothArea();
+ m_floodeffects[StandardTerrainEffects.Noise] = new NoiseArea();
+ m_floodeffects[StandardTerrainEffects.Flatten] = new FlattenArea();
+ m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_revert);
+
+ // Filesystem load/save loaders
+ m_loaders[".r32"] = new RAW32();
+ m_loaders[".f32"] = m_loaders[".r32"];
+ m_loaders[".ter"] = new Terragen();
+ m_loaders[".raw"] = new LLRAW();
+ m_loaders[".jpg"] = new JPEG();
+ m_loaders[".jpeg"] = m_loaders[".jpg"];
+ m_loaders[".bmp"] = new BMP();
+ m_loaders[".png"] = new PNG();
+ m_loaders[".gif"] = new GIF();
+ m_loaders[".tif"] = new TIFF();
+ m_loaders[".tiff"] = m_loaders[".tif"];
+ }
+
+ ///
+ /// Saves the current state of the region into the revert map buffer.
+ ///
+ public void UpdateRevertMap()
+ {
+ int x;
+ for (x = 0; x < m_channel.Width; x++)
+ {
+ int y;
+ for (y = 0; y < m_channel.Height; y++)
+ {
+ m_revert[x, y] = m_channel[x, y];
+ }
+ }
+ }
+
+ ///
+ /// Loads a tile from a larger terrain file and installs it into the region.
+ ///
+ /// The terrain file to load
+ /// The width of the file in units
+ /// The height of the file in units
+ /// Where to begin our slice
+ /// Where to begin our slice
public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY)
{
- int offsetX = (int)m_scene.RegionInfo.RegionLocX - fileStartX;
- int offsetY = (int)m_scene.RegionInfo.RegionLocY - fileStartY;
+ int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX;
+ int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY;
if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight)
{
@@ -164,7 +296,9 @@ namespace OpenSim.Region.Environment.Modules.Terrain
lock (m_scene)
{
ITerrainChannel channel = loader.Value.LoadFile(filename, offsetX, offsetY,
- fileWidth, fileHeight, (int)Constants.RegionSize, (int)Constants.RegionSize);
+ fileWidth, fileHeight,
+ (int) Constants.RegionSize,
+ (int) Constants.RegionSize);
m_scene.Heightmap = channel;
m_channel = channel;
UpdateRevertMap();
@@ -175,61 +309,137 @@ namespace OpenSim.Region.Environment.Modules.Terrain
}
}
- public void SaveToFile(string filename)
+ ///
+ /// Performs updates to the region periodically, synchronising physics and other heightmap aware sections
+ ///
+ private void EventManager_OnTerrainTick()
{
- try
+ if (m_tainted)
{
- foreach (KeyValuePair loader in m_loaders)
- {
- if (filename.EndsWith(loader.Key))
- {
- loader.Value.SaveFile(filename, m_channel);
- return;
- }
- }
+ m_tainted = false;
+ m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised());
+ m_scene.SaveTerrain();
+ m_scene.CreateTerrainTexture(true);
}
- catch (NotImplementedException)
+ }
+
+ ///
+ /// Processes commandline input. Do not call directly.
+ ///
+ /// Commandline arguments
+ private void EventManager_OnPluginConsole(string[] args)
+ {
+ if (args[0] == "terrain")
{
- m_log.Error("Unable to save to " + filename + ", saving of this file format has not been implemented.");
+ string[] tmpArgs = new string[args.Length - 2];
+ int i;
+ for (i = 2; i < args.Length; i++)
+ tmpArgs[i - 2] = args[i];
+
+ m_commander.ProcessConsoleCommand(args[1], tmpArgs);
}
}
- public void Initialise(Scene scene, IConfigSource config)
+ ///
+ /// Installs terrain brush hook to IClientAPI
+ ///
+ ///
+ private void EventManager_OnNewClient(IClientAPI client)
{
- m_scene = scene;
- m_gConfig = config;
+ client.OnModifyTerrain += client_OnModifyTerrain;
+ }
- // Install terrain module in the simulator
- if (m_scene.Heightmap == null)
+ ///
+ /// Checks to see if the terrain has been modified since last check
+ ///
+ private void CheckForTerrainUpdates()
+ {
+ bool shouldTaint = false;
+ float[] serialised = m_channel.GetFloatsSerialised();
+ int x;
+ for (x = 0; x < m_channel.Width; x += Constants.TerrainPatchSize)
{
- lock (m_scene)
+ int y;
+ for (y = 0; y < m_channel.Height; y += Constants.TerrainPatchSize)
{
- m_channel = new TerrainChannel();
- m_scene.Heightmap = m_channel;
- m_revert = new TerrainChannel();
- UpdateRevertMap();
+ if (m_channel.Tainted(x, y))
+ {
+ SendToClients(serialised, x, y);
+ shouldTaint = true;
+ }
}
}
- else
+ if (shouldTaint)
{
- m_channel = m_scene.Heightmap;
- m_revert = new TerrainChannel();
- UpdateRevertMap();
+ m_tainted = true;
}
+ }
- m_scene.RegisterModuleInterface(this);
- m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
- m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
- m_scene.EventManager.OnTerrainTick += EventManager_OnTerrainTick;
+ ///
+ /// Sends a copy of the current terrain to the scenes clients
+ ///
+ /// A copy of the terrain as a 1D float array of size w*h
+ /// The patch corner to send
+ /// The patch corner to send
+ private void SendToClients(float[] serialised, int x, int y)
+ {
+ m_scene.ForEachClient(
+ delegate(IClientAPI controller) { controller.SendLayerData(x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize, serialised); });
}
- void EventManager_OnTerrainTick()
+ private void client_OnModifyTerrain(float height, float seconds, byte size, byte action, float north, float west,
+ float south, float east, IClientAPI remoteClient)
{
- if (m_tainted)
+ // Not a good permissions check, if in area mode, need to check the entire area.
+ if (m_scene.PermissionsMngr.CanTerraform(remoteClient.AgentId, new LLVector3(north, west, 0)))
{
- m_tainted = false;
- m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised());
- m_scene.SaveTerrain();
+ if (north == south && east == west)
+ {
+ if (m_painteffects.ContainsKey((StandardTerrainEffects) action))
+ {
+ m_painteffects[(StandardTerrainEffects) action].PaintEffect(
+ m_channel, west, south, size, seconds);
+
+ CheckForTerrainUpdates();
+ }
+ else
+ {
+ m_log.Debug("Unknown terrain brush type " + action);
+ }
+ }
+ else
+ {
+ if (m_floodeffects.ContainsKey((StandardTerrainEffects) action))
+ {
+ bool[,] fillArea = new bool[m_channel.Width,m_channel.Height];
+ fillArea.Initialize();
+
+ int x;
+ for (x = 0; x < m_channel.Width; x++)
+ {
+ int y;
+ for (y = 0; y < m_channel.Height; y++)
+ {
+ if (x < east && x > west)
+ {
+ if (y < north && y > south)
+ {
+ fillArea[x, y] = true;
+ }
+ }
+ }
+ }
+
+ m_floodeffects[(StandardTerrainEffects) action].FloodEffect(
+ m_channel, fillArea, size);
+
+ CheckForTerrainUpdates();
+ }
+ else
+ {
+ m_log.Debug("Unknown terrain flood type " + action);
+ }
+ }
}
}
@@ -237,23 +447,23 @@ namespace OpenSim.Region.Environment.Modules.Terrain
private void InterfaceLoadFile(Object[] args)
{
- LoadFromFile((string)args[0]);
+ LoadFromFile((string) args[0]);
CheckForTerrainUpdates();
}
private void InterfaceLoadTileFile(Object[] args)
{
- LoadFromFile((string)args[0],
- (int)args[1],
- (int)args[2],
- (int)args[3],
- (int)args[4]);
+ LoadFromFile((string) args[0],
+ (int) args[1],
+ (int) args[2],
+ (int) args[3],
+ (int) args[4]);
CheckForTerrainUpdates();
}
private void InterfaceSaveFile(Object[] args)
{
- SaveToFile((string)args[0]);
+ SaveToFile((string) args[0]);
}
private void InterfaceBakeTerrain(Object[] args)
@@ -276,7 +486,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
int x, y;
for (x = 0; x < m_channel.Width; x++)
for (y = 0; y < m_channel.Height; y++)
- m_channel[x, y] += (double)args[0];
+ m_channel[x, y] += (double) args[0];
CheckForTerrainUpdates();
}
@@ -285,7 +495,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
int x, y;
for (x = 0; x < m_channel.Width; x++)
for (y = 0; y < m_channel.Height; y++)
- m_channel[x, y] *= (double)args[0];
+ m_channel[x, y] *= (double) args[0];
CheckForTerrainUpdates();
}
@@ -294,7 +504,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
int x, y;
for (x = 0; x < m_channel.Width; x++)
for (y = 0; y < m_channel.Height; y++)
- m_channel[x, y] -= (double)args[0];
+ m_channel[x, y] -= (double) args[0];
CheckForTerrainUpdates();
}
@@ -304,7 +514,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
for (x = 0; x < m_channel.Width; x++)
for (y = 0; y < m_channel.Height; y++)
- m_channel[x, y] = (double)args[0];
+ m_channel[x, y] = (double) args[0];
CheckForTerrainUpdates();
}
@@ -312,12 +522,13 @@ namespace OpenSim.Region.Environment.Modules.Terrain
{
double max = Double.MinValue;
double min = double.MaxValue;
- double avg = 0;
+ double avg;
double sum = 0;
- int x, y;
+ int x;
for (x = 0; x < m_channel.Width; x++)
{
+ int y;
for (y = 0; y < m_channel.Height; y++)
{
sum += m_channel[x, y];
@@ -336,11 +547,11 @@ namespace OpenSim.Region.Environment.Modules.Terrain
private void InterfaceEnableExperimentalBrushes(Object[] args)
{
- if ((bool)args[0])
+ if ((bool) args[0])
{
- m_painteffects[StandardTerrainEffects.Revert] = new PaintBrushes.WeatherSphere();
- m_painteffects[StandardTerrainEffects.Flatten] = new PaintBrushes.OlsenSphere();
- m_painteffects[StandardTerrainEffects.Smooth] = new PaintBrushes.ErodeSphere();
+ m_painteffects[StandardTerrainEffects.Revert] = new WeatherSphere();
+ m_painteffects[StandardTerrainEffects.Flatten] = new OlsenSphere();
+ m_painteffects[StandardTerrainEffects.Smooth] = new ErodeSphere();
}
else
{
@@ -350,7 +561,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
private void InterfacePerformEffectTest(Object[] args)
{
- Effects.CookieCutter cookie = new OpenSim.Region.Environment.Modules.Terrain.Effects.CookieCutter();
+ CookieCutter cookie = new CookieCutter();
cookie.RunEffect(m_channel);
}
@@ -358,46 +569,69 @@ namespace OpenSim.Region.Environment.Modules.Terrain
{
// Load / Save
string supportedFileExtensions = "";
- foreach (KeyValuePair loader in m_loaders)
- supportedFileExtensions += " " + loader.Key + " (" + loader.Value.ToString() + ")";
-
- Command loadFromFileCommand = new Command("load", InterfaceLoadFile, "Loads a terrain from a specified file.");
- loadFromFileCommand.AddArgument("filename", "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " + supportedFileExtensions, "String");
-
- Command saveToFileCommand = new Command("save", InterfaceSaveFile, "Saves the current heightmap to a specified file.");
- saveToFileCommand.AddArgument("filename", "The destination filename for your heightmap, the file extension determines the format to save in. Supported extensions include: " + supportedFileExtensions, "String");
-
- Command loadFromTileCommand = new Command("load-tile", InterfaceLoadTileFile, "Loads a terrain from a section of a larger file.");
- loadFromTileCommand.AddArgument("filename", "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " + supportedFileExtensions, "String");
+ foreach (KeyValuePair loader in m_loaders)
+ supportedFileExtensions += " " + loader.Key + " (" + loader.Value + ")";
+
+ Command loadFromFileCommand =
+ new Command("load", InterfaceLoadFile, "Loads a terrain from a specified file.");
+ loadFromFileCommand.AddArgument("filename",
+ "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " +
+ supportedFileExtensions, "String");
+
+ Command saveToFileCommand =
+ new Command("save", InterfaceSaveFile, "Saves the current heightmap to a specified file.");
+ saveToFileCommand.AddArgument("filename",
+ "The destination filename for your heightmap, the file extension determines the format to save in. Supported extensions include: " +
+ supportedFileExtensions, "String");
+
+ Command loadFromTileCommand =
+ new Command("load-tile", InterfaceLoadTileFile, "Loads a terrain from a section of a larger file.");
+ loadFromTileCommand.AddArgument("filename",
+ "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " +
+ supportedFileExtensions, "String");
loadFromTileCommand.AddArgument("file width", "The width of the file in tiles", "Integer");
loadFromTileCommand.AddArgument("file height", "The height of the file in tiles", "Integer");
- loadFromTileCommand.AddArgument("minimum X tile", "The X region coordinate of the first section on the file", "Integer");
- loadFromTileCommand.AddArgument("minimum Y tile", "The Y region coordinate of the first section on the file", "Integer");
+ loadFromTileCommand.AddArgument("minimum X tile", "The X region coordinate of the first section on the file",
+ "Integer");
+ loadFromTileCommand.AddArgument("minimum Y tile", "The Y region coordinate of the first section on the file",
+ "Integer");
// Terrain adjustments
- Command fillRegionCommand = new Command("fill", InterfaceFillTerrain, "Fills the current heightmap with a specified value.");
- fillRegionCommand.AddArgument("value", "The numeric value of the height you wish to set your region to.", "Double");
+ Command fillRegionCommand =
+ new Command("fill", InterfaceFillTerrain, "Fills the current heightmap with a specified value.");
+ fillRegionCommand.AddArgument("value", "The numeric value of the height you wish to set your region to.",
+ "Double");
- Command elevateCommand = new Command("elevate", InterfaceElevateTerrain, "Raises the current heightmap by the specified amount.");
+ Command elevateCommand =
+ new Command("elevate", InterfaceElevateTerrain, "Raises the current heightmap by the specified amount.");
elevateCommand.AddArgument("amount", "The amount of height to add to the terrain in meters.", "Double");
- Command lowerCommand = new Command("lower", InterfaceLowerTerrain, "Lowers the current heightmap by the specified amount.");
+ Command lowerCommand =
+ new Command("lower", InterfaceLowerTerrain, "Lowers the current heightmap by the specified amount.");
lowerCommand.AddArgument("amount", "The amount of height to remove from the terrain in meters.", "Double");
- Command multiplyCommand = new Command("multiply", InterfaceMultiplyTerrain, "Multiplies the heightmap by the value specified.");
+ Command multiplyCommand =
+ new Command("multiply", InterfaceMultiplyTerrain, "Multiplies the heightmap by the value specified.");
multiplyCommand.AddArgument("value", "The value to multiply the heightmap by.", "Double");
- Command bakeRegionCommand = new Command("bake", InterfaceBakeTerrain, "Saves the current terrain into the regions revert map.");
- Command revertRegionCommand = new Command("revert", InterfaceRevertTerrain, "Loads the revert map terrain into the regions heightmap.");
+ Command bakeRegionCommand =
+ new Command("bake", InterfaceBakeTerrain, "Saves the current terrain into the regions revert map.");
+ Command revertRegionCommand =
+ new Command("revert", InterfaceRevertTerrain, "Loads the revert map terrain into the regions heightmap.");
// Debug
- Command showDebugStatsCommand = new Command("stats", InterfaceShowDebugStats, "Shows some information about the regions heightmap for debugging purposes.");
+ Command showDebugStatsCommand =
+ new Command("stats", InterfaceShowDebugStats,
+ "Shows some information about the regions heightmap for debugging purposes.");
- Command experimentalBrushesCommand = new Command("newbrushes", InterfaceEnableExperimentalBrushes, "Enables experimental brushes which replace the standard terrain brushes. WARNING: This is a debug setting and may be removed at any time.");
+ Command experimentalBrushesCommand =
+ new Command("newbrushes", InterfaceEnableExperimentalBrushes,
+ "Enables experimental brushes which replace the standard terrain brushes. WARNING: This is a debug setting and may be removed at any time.");
experimentalBrushesCommand.AddArgument("Enabled?", "true / false - Enable new brushes", "Boolean");
// Effects
- Command effectsTestCommand = new Command("test", InterfacePerformEffectTest, "Performs an effects module test");
+ Command effectsTestCommand =
+ new Command("test", InterfacePerformEffectTest, "Performs an effects module test");
m_commander.RegisterCommand("load", loadFromFileCommand);
m_commander.RegisterCommand("load-tile", loadFromTileCommand);
@@ -417,147 +651,5 @@ namespace OpenSim.Region.Environment.Modules.Terrain
}
#endregion
-
- void EventManager_OnPluginConsole(string[] args)
- {
- if (args[0] == "terrain")
- {
- string[] tmpArgs = new string[args.Length - 2];
- int i = 0;
- for (i = 2; i < args.Length; i++)
- tmpArgs[i - 2] = args[i];
-
- m_commander.ProcessConsoleCommand(args[1], tmpArgs);
- }
- }
-
- void EventManager_OnNewClient(IClientAPI client)
- {
- client.OnModifyTerrain += client_OnModifyTerrain;
- }
-
- void CheckForTerrainUpdates()
- {
- bool shouldTaint = false;
- float[] serialised = m_channel.GetFloatsSerialised();
- int x, y;
- for (x = 0; x < m_channel.Width; x += Constants.TerrainPatchSize)
- {
- for (y = 0; y < m_channel.Height; y += Constants.TerrainPatchSize)
- {
- if (m_channel.Tainted(x, y))
- {
- SendToClients(serialised, x, y);
- shouldTaint = true;
- }
- }
- }
- if (shouldTaint)
- {
- m_tainted = true;
- }
- }
-
- private void SendToClients(float[] serialised, int x, int y)
- {
- m_scene.ForEachClient(delegate(IClientAPI controller)
- {
- controller.SendLayerData(x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize, serialised);
- });
- }
-
- void client_OnModifyTerrain(float height, float seconds, byte size, byte action, float north, float west, float south, float east, IClientAPI remoteClient)
- {
- // Not a good permissions check, if in area mode, need to check the entire area.
- if (m_scene.PermissionsMngr.CanTerraform(remoteClient.AgentId, new LLVector3(north, west, 0)))
- {
-
- if (north == south && east == west)
- {
- if (m_painteffects.ContainsKey((StandardTerrainEffects)action))
- {
- m_painteffects[(StandardTerrainEffects)action].PaintEffect(
- m_channel, west, south, size, seconds);
-
- bool usingTerrainModule = true;
-
- if (usingTerrainModule)
- {
- CheckForTerrainUpdates();
- }
- }
- else
- {
- m_log.Debug("Unknown terrain brush type " + action.ToString());
- }
- }
- else
- {
- if (m_floodeffects.ContainsKey((StandardTerrainEffects)action))
- {
- bool[,] fillArea = new bool[m_channel.Width, m_channel.Height];
- fillArea.Initialize();
-
- int x, y;
-
- for (x = 0; x < m_channel.Width; x++)
- {
- for (y = 0; y < m_channel.Height; y++)
- {
- if (x < east && x > west)
- {
- if (y < north && y > south)
- {
- fillArea[x, y] = true;
- }
- }
- }
- }
-
- m_floodeffects[(StandardTerrainEffects)action].FloodEffect(
- m_channel, fillArea, size);
- bool usingTerrainModule = true;
-
- if (usingTerrainModule)
- {
- CheckForTerrainUpdates();
- }
- }
- else
- {
- m_log.Debug("Unknown terrain flood type " + action.ToString());
- }
- }
- }
- }
-
- public void PostInitialise()
- {
- InstallDefaultEffects();
- InstallInterfaces();
- }
-
- public void Close()
- {
- }
-
- public string Name
- {
- get { return "TerrainModule"; }
- }
-
- public bool IsSharedModule
- {
- get { return false; }
- }
-
- #region ICommandable Members
-
- public ICommander CommandInterface
- {
- get { return m_commander; }
- }
-
- #endregion
}
-}
+}
\ No newline at end of file
--
cgit v1.1