Add 'terrain feature' command

1 files changed, 55 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index cd76693..3bb8040 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -42,6 +42,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
+using OpenSim.Region.CoreModules.World.Terrain.Features;
 using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
 using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
 using OpenSim.Region.Framework.Interfaces;
@@ -74,6 +75,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         #endregion
 
+        /// <summary>
+        /// Terrain Features
+        /// </summary>
+        public enum TerrainFeatures: byte
+        {
+            Rectangle = 1,
+        }
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
 #pragma warning disable 414
@@ -90,8 +99,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private readonly Dictionary<StandardTerrainEffects, ITerrainPaintableEffect> m_painteffects =
             new Dictionary<StandardTerrainEffects, ITerrainPaintableEffect>();
 
-        private ITerrainChannel m_channel;
         private Dictionary<string, ITerrainEffect> m_plugineffects;
+
+        private Dictionary<string, ITerrainFeature> m_featureEffects =
+            new Dictionary<string, ITerrainFeature>();
+
+        private ITerrainChannel m_channel;
         private ITerrainChannel m_revert;
         private Scene m_scene;
         private volatile bool m_tainted;
@@ -648,6 +661,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             m_floodeffects[StandardTerrainEffects.Flatten] = new FlattenArea();
             m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_revert);
 
+            // Terrain Feature effects
+            m_featureEffects["rectangle"] = new RectangleFeature(this);
+
             // Filesystem load/save loaders
             m_loaders[".r32"] = new RAW32();
             m_loaders[".f32"] = m_loaders[".r32"];
@@ -1622,7 +1638,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                             "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");
 
-            //Plugins
+            // Plugins
             Command pluginRunCommand =
                 new Command("effect", CommandIntentions.COMMAND_HAZARDOUS, InterfaceRunPluginEffect, "Runs a specified plugin effect");
             pluginRunCommand.AddArgument("name", "The plugin effect you wish to run, or 'list' to see all plugins", "String");
@@ -1648,9 +1664,46 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             // Add this to our scene so scripts can call these functions
             m_scene.RegisterModuleCommander(m_commander);
+
+            // Add Feature command to Scene, since Command object requires fixed-length arglists
+            m_scene.AddCommand("Terrain", this, "terrain feature",
+                               "terrain feature <type> <parameters...>", "Constructs a feature of the requested type.", FeatureCommand);
+
         }
 
+        public void FeatureCommand(string module, string[] cmd)
+        {
+            string result;
+            if (cmd.Length > 2)
+            {
+                string featureType = cmd[2];
 
+                ITerrainFeature feature;
+                if (!m_featureEffects.TryGetValue(featureType, out feature))
+                {
+                    result = String.Format("Terrain Feature \"{0}\" not found.", featureType);
+                }
+                else if ((cmd.Length > 3) &&  (cmd[3] == "usage"))
+                {
+                    result = "Usage: " + feature.GetUsage();
+                }
+                else
+                {
+                    result = feature.CreateFeature(m_channel, cmd);
+                }
+
+                if(result == String.Empty)
+                {
+                    result = "Created Feature";
+                    m_log.DebugFormat("Created terrain feature {0}", featureType);
+                }
+            }
+            else
+            {
+                result = "Usage: <feature-name> <arg1> <arg2>...";
+            }
+            MainConsole.Instance.Output(result);
+        }
         #endregion
 
     }