* Renamed terrain functions to match OpenSim naming styles.

* Added capability to support minimum/maximum terrain limits (from the last 'bake')

4 files changed, 25 insertions, 25 deletions

diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs
index b333f36..bae3b0e 100644
--- a/OpenSim/Region/Environment/LandManagement/Land.cs
+++ b/OpenSim/Region/Environment/LandManagement/Land.cs
@@ -219,8 +219,8 @@ namespace OpenSim.Region.Environment.LandManagement
                     }

                 }

             }

-            landData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), (float)m_world.Terrain.get((min_x * 4), (min_y * 4)));

-            landData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), (float)m_world.Terrain.get((max_x * 4), (max_y * 4)));

+            landData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), (float)m_world.Terrain.GetHeight((min_x * 4), (min_y * 4)));

+            landData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), (float)m_world.Terrain.GetHeight((max_x * 4), (max_y * 4)));

             landData.area = tempArea;

         }

 

diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 9a81a5f..e963737 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -54,32 +54,32 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 case 0:
                     // flatten terrain
-                    Terrain.flatten(north, west, size, (double)seconds / 5.0);
+                    Terrain.FlattenTerrain(north, west, size, (double)seconds / 5.0);
                     RegenerateTerrain(true, (int)north, (int)west);
                     break;
                 case 1:
                     // raise terrain
-                    Terrain.raise(north, west, size, (double)seconds / 5.0);
+                    Terrain.RaiseTerrain(north, west, size, (double)seconds / 5.0);
                     RegenerateTerrain(true, (int)north, (int)west);
                     break;
                 case 2:
                     //lower terrain
-                    Terrain.lower(north, west, size, (double)seconds / 5.0);
+                    Terrain.LowerTerrain(north, west, size, (double)seconds / 5.0);
                     RegenerateTerrain(true, (int)north, (int)west);
                     break;
                 case 3:
                     // smooth terrain
-                    Terrain.smooth(north, west, size, (double)seconds / 5.0);
+                    Terrain.SmoothTerrain(north, west, size, (double)seconds / 5.0);
                     RegenerateTerrain(true, (int)north, (int)west);
                     break;
                 case 4:
                     // noise
-                    Terrain.noise(north, west, size, (double)seconds / 5.0);
+                    Terrain.NoiseTerrain(north, west, size, (double)seconds / 5.0);
                     RegenerateTerrain(true, (int)north, (int)west);
                     break;
                 case 5:
                     // revert
-                    Terrain.revert(north, west, size, (double)seconds / 5.0);
+                    Terrain.RevertTerrain(north, west, size, (double)seconds / 5.0);
                     RegenerateTerrain(true, (int)north, (int)west);
                     break;
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index acd7f3f..64676f0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -239,10 +239,10 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     lock (m_syncRoot)
                     {
-                        phyScene.SetTerrain(Terrain.getHeights1D());
+                        phyScene.SetTerrain(Terrain.GetHeights1D());
                     }
 
-                    storageManager.DataStore.StoreTerrain(Terrain.getHeights2DD());
+                    storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
 
                     ForEachScenePresence(delegate(ScenePresence presence)
                                              {
@@ -295,14 +295,14 @@ namespace OpenSim.Region.Environment.Scenes
         {
             try
             {
-                Terrain.hills();
+                Terrain.HillsGenerator();
 
                 lock (m_syncRoot)
                 {
-                    phyScene.SetTerrain(Terrain.getHeights1D());
+                    phyScene.SetTerrain(Terrain.GetHeights1D());
                 }
 
-                storageManager.DataStore.StoreTerrain(Terrain.getHeights2DD());
+                storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
 
                 ForEachScenePresence(delegate(ScenePresence presence)
                                          {
@@ -328,12 +328,12 @@ namespace OpenSim.Region.Environment.Scenes
         {
             try
             {
-                Terrain.setHeights2D(newMap);
+                Terrain.SetHeights2D(newMap);
                 lock (m_syncRoot)
                 {
-                    phyScene.SetTerrain(Terrain.getHeights1D());
+                    phyScene.SetTerrain(Terrain.GetHeights1D());
                 }
-                storageManager.DataStore.StoreTerrain(Terrain.getHeights2DD());
+                storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
 
                 ForEachScenePresence(delegate(ScenePresence presence)
                                          {
@@ -395,28 +395,28 @@ namespace OpenSim.Region.Environment.Scenes
                     if (string.IsNullOrEmpty(m_regInfo.estateSettings.terrainFile))
                     {
                         Console.WriteLine("No default terrain, procedurally generating...");
-                        Terrain.hills();
+                        Terrain.HillsGenerator();
 
-                        storageManager.DataStore.StoreTerrain(Terrain.getHeights2DD());
+                        storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
                     }
                     else
                     {
                         try
                         {
-                            Terrain.loadFromFileF32(m_regInfo.estateSettings.terrainFile);
+                            Terrain.LoadFromFileF32(m_regInfo.estateSettings.terrainFile);
                             Terrain *= m_regInfo.estateSettings.terrainMultiplier;
                         }
                         catch
                         {
                             Console.WriteLine("Unable to load default terrain, procedurally generating instead...");
-                            Terrain.hills();
+                            Terrain.HillsGenerator();
                         }
-                        storageManager.DataStore.StoreTerrain(Terrain.getHeights2DD());
+                        storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
                     }
                 }
                 else
                 {
-                    Terrain.setHeights2D(map);
+                    Terrain.SetHeights2D(map);
                 }
 
                 CreateTerrainTexture();
@@ -433,7 +433,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void CreateTerrainTexture()
         {
             //create a texture asset of the terrain 
-            byte[] data = Terrain.exportJpegImage("defaultstripe.png");
+            byte[] data = Terrain.ExportJpegImage("defaultstripe.png");
             m_regInfo.estateSettings.terrainImageID = LLUUID.Random();
             AssetBase asset = new AssetBase();
             asset.FullID = m_regInfo.estateSettings.terrainImageID;
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index f3db9e2..c91c654 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="RemoteClient">Client to send to</param>
         public virtual void SendLayerData(IClientAPI RemoteClient)
         {
-            RemoteClient.SendLayerData(Terrain.getHeights1D());
+            RemoteClient.SendLayerData(Terrain.GetHeights1D());
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="RemoteClient">The client to send to</param>
         public virtual void SendLayerData(int px, int py, IClientAPI RemoteClient)
         {
-            RemoteClient.SendLayerData(px, py, Terrain.getHeights1D());
+            RemoteClient.SendLayerData(px, py, Terrain.GetHeights1D());
         }
 
         #endregion