Terrain:

* Attempted fix for lag/pause when doing lots of updates.
* Some naming fixes to libTerrain.
* Refactored terrain bitmap generation into a common call for both world map and export.

General:
* Switched some calls to Console.WriteLine to use MainLog.Warn/Verbose/Notice.

4 files changed, 13 insertions, 11 deletions

diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs
index 8e894ab..45bb06b 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs
@@ -115,7 +115,7 @@ namespace libTerrain
                     if (z < 0)
                         z = 0;
 
-                    Set(x, y, Tools.linearInterpolate(map[x, y], height, z));
+                    Set(x, y, Tools.LinearInterpolate(map[x, y], height, z));
                 }
             }
         }
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs
index 3e88aa9..3a9b7f7 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs
@@ -100,7 +100,7 @@ namespace libTerrain
                 {
                     for (int y = 0; y < h; y++)
                     {
-                        double miny = Tools.linearInterpolate(a[1], b[1], (double)x / (double)w);
+                        double miny = Tools.LinearInterpolate(a[1], b[1], (double)x / (double)w);
 
                         if (v >= 0.5)
                         {
@@ -108,14 +108,14 @@ namespace libTerrain
                             {
                                 if (y > miny)
                                 {
-                                    map[x, y] += Tools.linearInterpolate(scalemin, scalemax, z);
+                                    map[x, y] += Tools.LinearInterpolate(scalemin, scalemax, z);
                                 }
                             }
                             else
                             {
                                 if (y < miny)
                                 {
-                                    map[x, y] += Tools.linearInterpolate(scalemin, scalemax, z);
+                                    map[x, y] += Tools.LinearInterpolate(scalemin, scalemax, z);
                                 }
                             }
                         }
@@ -125,14 +125,14 @@ namespace libTerrain
                             {
                                 if (x > miny)
                                 {
-                                    map[x, y] += Tools.linearInterpolate(scalemin, scalemax, z);
+                                    map[x, y] += Tools.LinearInterpolate(scalemin, scalemax, z);
                                 }
                             }
                             else
                             {
                                 if (x < miny)
                                 {
-                                    map[x, y] += Tools.linearInterpolate(scalemin, scalemax, z);
+                                    map[x, y] += Tools.LinearInterpolate(scalemin, scalemax, z);
                                 }
                             }
                         }
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs
index 0930a36..0155791 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Grid.cs
@@ -341,7 +341,7 @@ namespace libTerrain
             {
                 for (y = 0; y < h; y++)
                 {
-                    Set(x, y, Tools.linearInterpolate(map[x, y], other.map[x, y], amount));
+                    Set(x, y, Tools.LinearInterpolate(map[x, y], other.map[x, y], amount));
                 }
             }
             return this;
@@ -354,7 +354,7 @@ namespace libTerrain
             {
                 for (y = 0; y < h; y++)
                 {
-                    Set(x, y, Tools.linearInterpolate(map[x, y], other.map[x, y], amount.map[x, y]));
+                    Set(x, y, Tools.LinearInterpolate(map[x, y], other.map[x, y], amount.map[x, y]));
                 }
             }
             return this;
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Tools.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Tools.cs
index 60dbf62..13338a2 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Tools.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Tools/Tools.cs
@@ -37,17 +37,19 @@ namespace libTerrain
 {
     class Tools
     {
-        public static double linearInterpolate(double a, double b, double amount)
+        public static double LinearInterpolate(double a, double b, double amount)
         {
             return a + ((b - a) * amount);
         }
-        public static double exponentialInterpolate(double a, double b, double amount)
+
+        public static double ExponentialInterpolate(double a, double b, double amount)
         {
             a = Math.Pow(a, amount);
             b = Math.Pow(b - a, 1.0 - amount);
             return a+b;
         }
-            public static int powerOf2Log2(int n) {
+
+            public static int PowerOf2Log2(int n) {
                     for (int i = 0; i < 31; i++) {
                             if ((n & 1) == 1) {
                                     return i;