Merge branch 'release/1.2'

ricardojmendez · Jul 13, 2014 · fdb2ab5 · fdb2ab5
2 parents 179e192 + daf084c
commit fdb2ab5
Show file tree

Hide file tree

Showing 32 changed files with 71 additions and 190 deletions.
diff --git a/Generator/Billow.cs b/Generator/Billow.cs
@@ -1,11 +1,7 @@
 namespace LibNoise.Unity.Generator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
-    //using Microsoft.Xna.Framework;
+
     using UnityEngine;
 
     /// <summary>

diff --git a/Generator/Checker.cs b/Generator/Checker.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Generator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that outputs a checkerboard pattern. [GENERATOR]
     /// </summary>

diff --git a/Generator/Const.cs b/Generator/Const.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Generator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that outputs a constant value. [GENERATOR]
     /// </summary>

diff --git a/Generator/Cylinders.cs b/Generator/Cylinders.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Generator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that outputs concentric cylinders. [GENERATOR]
     /// </summary>

diff --git a/Generator/Perlin.cs b/Generator/Perlin.cs
@@ -1,12 +1,8 @@
 namespace LibNoise.Unity.Generator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
-    //using Microsoft.Xna.Framework;
-    using UnityEngine;
+
+	using UnityEngine;
 
     /// <summary>
     /// Provides a noise module that outputs a three-dimensional perlin noise. [GENERATOR]

diff --git a/Generator/RidgedMultifractal.cs b/Generator/RidgedMultifractal.cs
@@ -1,12 +1,8 @@
 namespace LibNoise.Unity.Generator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
-    //using Microsoft.Xna.Framework;
-    using UnityEngine;
+
+	using UnityEngine;
 
     /// <summary>
     /// Provides a noise module that outputs 3-dimensional ridged-multifractal noise. [GENERATOR]
@@ -156,8 +152,7 @@ public override double GetValue(double x, double y, double z)
                 signal *= signal;
                 signal *= weight;
                 weight = signal * gain;
-                if (weight > 1.0) { weight = 1.0; }
-                if (weight < 0.0) { weight = 0.0; }
+				weight = Mathf.Clamp01((float)weight);
                 value += (signal * this.m_weights[i]);
                 x *= this.m_lacunarity;
                 y *= this.m_lacunarity;

diff --git a/Generator/Spheres.cs b/Generator/Spheres.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Generator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that outputs concentric spheres. [GENERATOR]
     /// </summary>

diff --git a/Generator/Voronoi.cs b/Generator/Voronoi.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Generator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that outputs Voronoi cells. [GENERATOR]
     /// </summary>

diff --git a/ModuleBase.cs b/ModuleBase.cs
@@ -1,12 +1,8 @@
 namespace LibNoise.Unity
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
-    //using Microsoft.Xna.Framework;
-    using UnityEngine;
+
+	using UnityEngine;
 
     #region Enumerations
 
@@ -119,7 +115,7 @@ public int SourceModuleCount
         /// <returns>The resulting output value.</returns>
         public double GetValue(Vector3 coordinate)
         {
-            return this.GetValue((double)coordinate.x, (double)coordinate.y, (double)coordinate.z);
+            return this.GetValue(coordinate.x, coordinate.y, coordinate.z);
         }
 
         /// <summary>
@@ -129,7 +125,7 @@ public double GetValue(Vector3 coordinate)
         /// <returns>The resulting output value.</returns>
         public double GetValue(ref Vector3 coordinate)
         {
-            return this.GetValue((double)coordinate.x, (double)coordinate.y, (double)coordinate.z);
+            return this.GetValue(coordinate.x, coordinate.y, coordinate.z);
         }
 
         #endregion
@@ -138,7 +134,7 @@ public double GetValue(ref Vector3 coordinate)
 
         [System.Xml.Serialization.XmlIgnore]
         #if !XBOX360 && !ZUNE
-            [NonSerialized]
+        [NonSerialized]
         #endif
         private bool m_disposed = false;
 

diff --git a/Noise2D.cs b/Noise2D.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     using UnityEngine;
 
     /// <summary>
@@ -95,7 +92,6 @@ public Noise2D(int width, int height, ModuleBase generator)
             this.m_ucHeight = height + m_ucBorder * 2;
             this.m_ucData = new float[width + m_ucBorder * 2, height + m_ucBorder * 2];
         }
-
         #endregion
 
         #region Indexers
@@ -119,7 +115,7 @@ public Noise2D(int width, int height, ModuleBase generator)
                     }
                     if (y < 0 && y >= this.m_height)
                     {
-                        throw new ArgumentOutOfRangeException("Inavlid y position");
+                        throw new ArgumentOutOfRangeException("Invalid y position");
                     }
                     return this.m_data[x, y];
                 }
@@ -131,7 +127,7 @@ public Noise2D(int width, int height, ModuleBase generator)
                     }
                     if (y < 0 && y >= this.m_ucHeight)
                     {
-                        throw new ArgumentOutOfRangeException("Inavlid y position");
+                        throw new ArgumentOutOfRangeException("Invalid y position");
                     }
                     return this.m_ucData[x, y];
                 }
@@ -158,7 +154,7 @@ public Noise2D(int width, int height, ModuleBase generator)
                     }
                     if (y < 0 && y >= this.m_ucHeight)
                     {
-                        throw new ArgumentOutOfRangeException("Inavlid y position");
+                        throw new ArgumentOutOfRangeException("Invalid y position");
                     }
                     this.m_ucData[x, y] = value;
                 }
@@ -265,19 +261,11 @@ public int Width
             return result;
         }
 
-        /// <summary>
-        /// Clears the noise map.
-        /// </summary>
-        public void Clear()
-        {
-            this.Clear(0.0f);
-        }
-
         /// <summary>
         /// Clears the noise map.
         /// </summary>
         /// <param name="value">The constant value to clear the noise map with.</param>
-        public void Clear(float value)
+        public void Clear(float value = 0f)
         {
             for (int x = 0; x < this.m_width; x++)
             {
@@ -299,18 +287,6 @@ private double GeneratePlanar(double x, double y)
             return this.m_generator.GetValue(x, 0.0, y);
         }
 
-        /// <summary>
-        /// Generates a planar projection of the noise map.
-        /// </summary>
-        /// <param name="left">The clip region to the left.</param>
-        /// <param name="right">The clip region to the right.</param>
-        /// <param name="top">The clip region to the top.</param>
-        /// <param name="bottom">The clip region to the bottom.</param>
-        public void GeneratePlanar(double left, double right, double top, double bottom)
-        {
-            this.GeneratePlanar(left, right, top, bottom, true);
-        }
-
         /// <summary>
         /// Generates a non-seamless planar projection of the noise map.
         /// </summary>
@@ -319,7 +295,7 @@ public void GeneratePlanar(double left, double right, double top, double bottom)
         /// <param name="top">The clip region to the top.</param>
         /// <param name="bottom">The clip region to the bottom.</param>
         /// <param name="isSeamless">Indicates whether the resulting noise map should be seamless.</param>
-        public void GeneratePlanar(double left, double right, double top, double bottom, bool isSeamless)
+        public void GeneratePlanar(double left, double right, double top, double bottom, bool isSeamless = true)
         {
             if (right <= left || bottom <= top)
             {
@@ -376,9 +352,9 @@ public void GeneratePlanar(double left, double right, double top, double bottom,
         /// <returns>The corresponding noise map value.</returns>
         private double GenerateCylindrical(double angle, double height)
         {
-            double x = Math.Cos(angle * Utils.DegToRad);
+            double x = Math.Cos(angle * Mathf.Deg2Rad);
             double y = height;
-            double z = Math.Sin(angle * Utils.DegToRad);
+            double z = Math.Sin(angle * Mathf.Deg2Rad);
             return this.m_generator.GetValue(x, y, z);
         }
 
@@ -429,9 +405,9 @@ public void GenerateCylindrical(double angleMin, double angleMax, double heightM
         /// <returns>The corresponding noise map value.</returns>
         private double GenerateSpherical(double lat, double lon)
         {
-            double r = Math.Cos(Utils.DegToRad * lat);
-            return this.m_generator.GetValue(r * Math.Cos(Utils.DegToRad * lon), Math.Sin(Utils.DegToRad * lat),
-                r * Math.Sin(Utils.DegToRad * lon));
+            double r = Math.Cos(Mathf.Deg2Rad * lat);
+            return this.m_generator.GetValue(r * Math.Cos(Mathf.Deg2Rad * lon), Math.Sin(Mathf.Deg2Rad * lat),
+                r * Math.Sin(Mathf.Deg2Rad * lon));
         }
 
         /// <summary>

diff --git a/Operator/Abs.cs b/Operator/Abs.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Operator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that outputs the absolute value of the output value from
     /// a source module. [OPERATOR]

diff --git a/Operator/Add.cs b/Operator/Add.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Operator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that outputs the sum of the two output values from two
     /// source modules. [OPERATOR]

diff --git a/Operator/Blend.cs b/Operator/Blend.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Operator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that outputs a weighted blend of the output values from
     /// two source modules given the output value supplied by a control module. [OPERATOR]

diff --git a/Operator/Cache.cs b/Operator/Cache.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Operator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that caches the last output value generated by a source
     /// module. [OPERATOR]

diff --git a/Operator/Clamp.cs b/Operator/Clamp.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Operator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that clamps the output value from a source module to a
     /// range of values. [OPERATOR]

diff --git a/Operator/Curve.cs b/Operator/Curve.cs
@@ -1,10 +1,8 @@
 namespace LibNoise.Unity.Operator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+	using System.Collections.Generic;
+
     using UnityEngine;
 
     /// <summary>

diff --git a/Operator/Displace.cs b/Operator/Displace.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Operator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that uses three source modules to displace each
     /// coordinate of the input value before returning the output value from

diff --git a/Operator/Exponent.cs b/Operator/Exponent.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Operator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that maps the output value from a source module onto an
     /// exponential curve. [OPERATOR]

diff --git a/Operator/Invert.cs b/Operator/Invert.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Operator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that inverts the output value from a source module. [OPERATOR]
     /// </summary>

diff --git a/Operator/Max.cs b/Operator/Max.cs
@@ -1,10 +1,7 @@
 namespace LibNoise.Unity.Operator
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
+
     /// <summary>
     /// Provides a noise module that outputs the larger of the two output values from two
     /// source modules. [OPERATOR]