* Optimized usings

* Shortened type references
* Removed redundant 'this' qualifier

7 files changed, 90 insertions, 102 deletions

diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs
index 3a9b7f7..65badd1 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Fracture.cs
@@ -27,8 +27,6 @@
 */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace libTerrain
 {
@@ -60,19 +58,19 @@ namespace libTerrain
             }
             if (val < 512)
             {
-                ret[0] = (val % 256);
+                ret[0] = (val%256);
                 ret[1] = 255;
                 return ret;
             }
             if (val < 768)
             {
                 ret[0] = 255;
-                ret[1] = 255 - (val % 256);
+                ret[1] = 255 - (val%256);
                 return ret;
             }
             if (val < 1024)
             {
-                ret[0] = 255 - (val % 256);
+                ret[0] = 255 - (val%256);
                 ret[1] = 255;
                 return ret;
             }
@@ -100,7 +98,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)
                         {
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Gradient.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Gradient.cs
index 8a1b048..b6e2491 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Gradient.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Gradient.cs
@@ -26,15 +26,10 @@
 * 
 */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace libTerrain
 {
     partial class Channel
     {
-
         public void GradientCube()
         {
             SetDiff();
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/HillPlanter.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/HillPlanter.cs
index 7cea800..6806748 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/HillPlanter.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/HillPlanter.cs
@@ -27,8 +27,6 @@
 */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace libTerrain
 {
@@ -44,7 +42,8 @@ namespace libTerrain
         /// <param name="island">Whether to bias hills towards the center of the map</param>
         /// <param name="additive">Whether to add hills together or to pick the largest value</param>
         /// <param name="noisy">Generates hill-shaped noise instead of consistent hills</param>
-        public void HillsSpheres(int number, double scale_min, double scale_range, bool island, bool additive, bool noisy)
+        public void HillsSpheres(int number, double scale_min, double scale_range, bool island, bool additive,
+                                 bool noisy)
         {
             SetDiff();
 
@@ -55,20 +54,20 @@ namespace libTerrain
 
             for (i = 0; i < number; i++)
             {
-                double rx = Math.Min(255.0, random.NextDouble() * w);
-                double ry = Math.Min(255.0, random.NextDouble() * h);
+                double rx = Math.Min(255.0, random.NextDouble()*w);
+                double ry = Math.Min(255.0, random.NextDouble()*h);
                 double rand = random.NextDouble();
 
                 if (island)
                 {
                     // Move everything towards the center
-                    rx -= w / 2;
+                    rx -= w/2;
                     rx /= 2;
-                    rx += w / 2;
+                    rx += w/2;
 
-                    ry -= h / 2;
+                    ry -= h/2;
                     ry /= 2;
-                    ry += h / 2;
+                    ry += h/2;
                 }
 
                 for (x = 0; x < w; x++)
@@ -78,9 +77,9 @@ namespace libTerrain
                         if (noisy)
                             rand = random.NextDouble();
 
-                        double z = (scale_min + (scale_range * rand));
+                        double z = (scale_min + (scale_range*rand));
                         z *= z;
-                        z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+                        z -= ((x - rx)*(x - rx)) + ((y - ry)*(y - ry));
 
                         if (z < 0)
                             z = 0;
@@ -121,20 +120,20 @@ namespace libTerrain
 
             for (i = 0; i < number; i++)
             {
-                double rx = Math.Min(255.0, random.NextDouble() * w);
-                double ry = Math.Min(255.0, random.NextDouble() * h);
+                double rx = Math.Min(255.0, random.NextDouble()*w);
+                double ry = Math.Min(255.0, random.NextDouble()*h);
                 double rand = random.NextDouble();
 
                 if (island)
                 {
                     // Move everything towards the center
-                    rx -= w / 2;
+                    rx -= w/2;
                     rx /= 2;
-                    rx += w / 2;
+                    rx += w/2;
 
-                    ry -= h / 2;
+                    ry -= h/2;
                     ry /= 2;
-                    ry += h / 2;
+                    ry += h/2;
                 }
 
                 for (x = 0; x < w; x++)
@@ -144,8 +143,8 @@ namespace libTerrain
                         if (noisy)
                             rand = random.NextDouble();
 
-                        double z = (scale_min + (scale_range * rand));
-                        z -= Math.Sqrt(((x - rx) * (x - rx)) + ((y - ry) * (y - ry)));
+                        double z = (scale_min + (scale_range*rand));
+                        z -= Math.Sqrt(((x - rx)*(x - rx)) + ((y - ry)*(y - ry)));
 
                         if (z < 0)
                             z = 0;
@@ -176,20 +175,20 @@ namespace libTerrain
 
             for (i = 0; i < number; i++)
             {
-                double rx = Math.Min(255.0, random.NextDouble() * w);
-                double ry = Math.Min(255.0, random.NextDouble() * h);
+                double rx = Math.Min(255.0, random.NextDouble()*w);
+                double ry = Math.Min(255.0, random.NextDouble()*h);
                 double rand = random.NextDouble();
 
                 if (island)
                 {
                     // Move everything towards the center
-                    rx -= w / 2;
+                    rx -= w/2;
                     rx /= 2;
-                    rx += w / 2;
+                    rx += w/2;
 
-                    ry -= h / 2;
+                    ry -= h/2;
                     ry /= 2;
-                    ry += h / 2;
+                    ry += h/2;
                 }
 
                 for (x = 0; x < w; x++)
@@ -199,8 +198,8 @@ namespace libTerrain
                         if (noisy)
                             rand = random.NextDouble();
 
-                        double z = (scale_min + (scale_range * rand));
-                        z -= Math.Abs(x-rx) + Math.Abs(y-ry);
+                        double z = (scale_min + (scale_range*rand));
+                        z -= Math.Abs(x - rx) + Math.Abs(y - ry);
                         //z -= Math.Sqrt(((x - rx) * (x - rx)) + ((y - ry) * (y - ry)));
 
                         if (z < 0)
@@ -221,7 +220,8 @@ namespace libTerrain
             Normalise();
         }
 
-        public void HillsSquared(int number, double scale_min, double scale_range, bool island, bool additive, bool noisy)
+        public void HillsSquared(int number, double scale_min, double scale_range, bool island, bool additive,
+                                 bool noisy)
         {
             SetDiff();
 
@@ -232,20 +232,20 @@ namespace libTerrain
 
             for (i = 0; i < number; i++)
             {
-                double rx = Math.Min(255.0, random.NextDouble() * w);
-                double ry = Math.Min(255.0, random.NextDouble() * h);
+                double rx = Math.Min(255.0, random.NextDouble()*w);
+                double ry = Math.Min(255.0, random.NextDouble()*h);
                 double rand = random.NextDouble();
 
                 if (island)
                 {
                     // Move everything towards the center
-                    rx -= w / 2;
+                    rx -= w/2;
                     rx /= 2;
-                    rx += w / 2;
+                    rx += w/2;
 
-                    ry -= h / 2;
+                    ry -= h/2;
                     ry /= 2;
-                    ry += h / 2;
+                    ry += h/2;
                 }
 
                 for (x = 0; x < w; x++)
@@ -255,11 +255,11 @@ namespace libTerrain
                         if (noisy)
                             rand = random.NextDouble();
 
-                        double z = (scale_min + (scale_range * rand));
-                        z *= z * z * z;
+                        double z = (scale_min + (scale_range*rand));
+                        z *= z*z*z;
                         double dx = Math.Abs(x - rx);
                         double dy = Math.Abs(y - ry);
-                        z -= (dx * dx * dx * dx) + (dy * dy * dy * dy);
+                        z -= (dx*dx*dx*dx) + (dy*dy*dy*dy);
 
                         if (z < 0)
                             z = 0;
@@ -278,6 +278,5 @@ namespace libTerrain
 
             Normalise();
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Noise.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Noise.cs
index 43ae37a..5d39cd5 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Noise.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Noise.cs
@@ -27,8 +27,6 @@
 */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace libTerrain
 {
@@ -53,4 +51,4 @@ namespace libTerrain
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Spiral.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Spiral.cs
index d7e0dcd..10eaf71 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Spiral.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Spiral.cs
@@ -28,7 +28,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace libTerrain
 {
@@ -36,10 +35,10 @@ namespace libTerrain
     {
         private double[] CoordinatesToPolar(int x, int y)
         {
-            double theta = Math.Atan2(x - (w / 2), y - (h / 2));
-            double rx = (double)x - ((double)w / 2);
-            double ry = (double)y - ((double)h / 2);
-            double r = Math.Sqrt((rx * rx) + (ry * ry));
+            double theta = Math.Atan2(x - (w/2), y - (h/2));
+            double rx = (double) x - ((double) w/2);
+            double ry = (double) y - ((double) h/2);
+            double r = Math.Sqrt((rx*rx) + (ry*ry));
 
             double[] coords = new double[2];
             coords[0] = r;
@@ -47,15 +46,16 @@ namespace libTerrain
             return coords;
         }
 
-        public int[] PolarToCoordinates(double r, double theta) {
+        public int[] PolarToCoordinates(double r, double theta)
+        {
             double nx;
             double ny;
 
-            nx = (double)r * Math.Cos(theta);
-            ny = (double)r * Math.Sin(theta);
+            nx = (double) r*Math.Cos(theta);
+            ny = (double) r*Math.Sin(theta);
 
-            nx += w / 2;
-            ny += h / 2;
+            nx += w/2;
+            ny += h/2;
 
             if (nx >= w)
                 nx = w - 1;
@@ -70,8 +70,8 @@ namespace libTerrain
                 ny = 0;
 
             int[] coords = new int[2];
-            coords[0] = (int)nx;
-            coords[1] = (int)ny;
+            coords[0] = (int) nx;
+            coords[1] = (int) ny;
             return coords;
         }
 
@@ -79,19 +79,19 @@ namespace libTerrain
         {
             SetDiff();
 
-            Channel n = this.Copy();
+            Channel n = Copy();
 
             int x, y;
             for (x = 0; x < w; x++)
             {
                 for (y = 0; y < h; y++)
                 {
-                    double[] coords = CoordinatesToPolar(x,y);
+                    double[] coords = CoordinatesToPolar(x, y);
 
-                    coords[0] += w / 2.0;
-                    coords[1] += h / 2.0;
+                    coords[0] += w/2.0;
+                    coords[1] += h/2.0;
 
-                    map[x, y] = n.map[(int)coords[0] % n.w, (int)coords[1] % n.h];
+                    map[x, y] = n.map[(int) coords[0]%n.w, (int) coords[1]%n.h];
                 }
             }
         }
@@ -108,12 +108,13 @@ namespace libTerrain
                 r += incRadius;
                 theta += incAngle;
 
-                int[] coords = PolarToCoordinates(r,theta);
+                int[] coords = PolarToCoordinates(r, theta);
                 Raise(coords[0], coords[1], 20, 1);
             }
         }
 
-        public void SpiralCells(int steps, double incAngle, double incRadius, double offsetRadius, double offsetAngle, double[] c)
+        public void SpiralCells(int steps, double incAngle, double incRadius, double offsetRadius, double offsetAngle,
+                                double[] c)
         {
             SetDiff();
 
@@ -128,7 +129,7 @@ namespace libTerrain
                 theta += incAngle;
 
                 int[] coords = PolarToCoordinates(r, theta);
-                points.Add(new Point2D(coords[0],coords[1]));
+                points.Add(new Point2D(coords[0], coords[1]));
             }
 
             VoronoiDiagram(points, c);
@@ -145,9 +146,9 @@ namespace libTerrain
                 for (y = 0; y < h; y++)
                 {
                     z++;
-                    double dx = Math.Abs((w / 2) - x);
-                    double dy = Math.Abs((h / 2) - y);
-                    map[x, y] += Math.Sin(dx / wid) + Math.Cos(dy / hig);
+                    double dx = Math.Abs((w/2) - x);
+                    double dy = Math.Abs((h/2) - y);
+                    map[x, y] += Math.Sin(dx/wid) + Math.Cos(dy/hig);
                 }
             }
             Normalise();
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs
index e2f9560..0159b87 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs
@@ -28,7 +28,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace libTerrain
 {
@@ -57,8 +56,8 @@ namespace libTerrain
                 {
                     for (i = 0; i < pointsPerBlock; i++)
                     {
-                        double pX = x + (generator.NextDouble() * (double)blockSize);
-                        double pY = y + (generator.NextDouble() * (double)blockSize);
+                        double pX = x + (generator.NextDouble()*(double) blockSize);
+                        double pY = y + (generator.NextDouble()*(double) blockSize);
 
                         points.Add(new Point2D(pX, pY));
                     }
@@ -75,10 +74,10 @@ namespace libTerrain
                     for (i = 0; i < points.Count; i++)
                     {
                         double dx, dy;
-                        dx = Math.Abs((double)x - points[i].x);
-                        dy = Math.Abs((double)y - points[i].y);
+                        dx = Math.Abs((double) x - points[i].x);
+                        dy = Math.Abs((double) y - points[i].y);
 
-                        distances[i] = (dx * dx + dy * dy);
+                        distances[i] = (dx*dx + dy*dy);
                     }
 
                     Array.Sort(distances);
@@ -92,7 +91,7 @@ namespace libTerrain
                         if (i >= points.Count)
                             break;
 
-                        f += c[i] * distances[i];
+                        f += c[i]*distances[i];
                     }
 
                     map[x, y] = f;
@@ -119,10 +118,10 @@ namespace libTerrain
                     for (i = 0; i < points.Count; i++)
                     {
                         double dx, dy;
-                        dx = Math.Abs((double)x - points[i].x);
-                        dy = Math.Abs((double)y - points[i].y);
+                        dx = Math.Abs((double) x - points[i].x);
+                        dy = Math.Abs((double) y - points[i].y);
 
-                        distances[i] = (dx * dx + dy * dy);
+                        distances[i] = (dx*dx + dy*dy);
                     }
 
                     Array.Sort(distances);
@@ -136,7 +135,7 @@ namespace libTerrain
                         if (i >= points.Count)
                             break;
 
-                        f += c[i] * distances[i];
+                        f += c[i]*distances[i];
                     }
 
                     map[x, y] = f;
@@ -162,8 +161,8 @@ namespace libTerrain
                 {
                     for (i = 0; i < pointsPerBlock; i++)
                     {
-                        double pX = x + (generator.NextDouble() * (double)blockSize);
-                        double pY = y + (generator.NextDouble() * (double)blockSize);
+                        double pX = x + (generator.NextDouble()*(double) blockSize);
+                        double pY = y + (generator.NextDouble()*(double) blockSize);
 
                         points.Add(new Point2D(pX, pY));
                     }
@@ -180,10 +179,10 @@ namespace libTerrain
                     for (i = 0; i < points.Count; i++)
                     {
                         double dx, dy;
-                        dx = Math.Abs((double)x - points[i].x);
-                        dy = Math.Abs((double)y - points[i].y);
+                        dx = Math.Abs((double) x - points[i].x);
+                        dy = Math.Abs((double) y - points[i].y);
 
-                        distances[i] = (dx * dx + dy * dy);
+                        distances[i] = (dx*dx + dy*dy);
                     }
 
                     //Array.Sort(distances);
@@ -191,7 +190,7 @@ namespace libTerrain
                     double f = 0.0;
 
                     double min = double.MaxValue;
-                    for (int j = 0; j < distances.Length;j++ )
+                    for (int j = 0; j < distances.Length; j++)
                     {
                         if (distances[j] < min)
                         {
@@ -211,4 +210,4 @@ namespace libTerrain
             Normalise();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Worms.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Worms.cs
index 788134d..deb2e0e 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Worms.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Worms.cs
@@ -27,8 +27,6 @@
 */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace libTerrain
 {
@@ -54,18 +52,18 @@ namespace libTerrain
                 double rx, ry;
                 if (centerspawn)
                 {
-                    rx = w / 2.0;
-                    ry = h / 2.0;
+                    rx = w/2.0;
+                    ry = h/2.0;
                 }
                 else
                 {
-                    rx = random.NextDouble() * (w - 1);
-                    ry = random.NextDouble() * (h - 1);
+                    rx = random.NextDouble()*(w - 1);
+                    ry = random.NextDouble()*(h - 1);
                 }
                 for (j = 0; j < rounds; j++)
                 {
-                    rx += (random.NextDouble() * movement) - (movement / 2.0);
-                    ry += (random.NextDouble() * movement) - (movement / 2.0);
+                    rx += (random.NextDouble()*movement) - (movement/2.0);
+                    ry += (random.NextDouble()*movement) - (movement/2.0);
                     Raise(rx, ry, size, 1.0);
                 }
             }