separate noise2d and noise2d_u8 functions

Author: tayloraswift

Package.swift

@@ -15,7 +15,8 @@ let package = Package(
     targets: [
         .target(
             name: "Noise",
-            dependencies: ["MaxPNG"]),
+            dependencies: ["MaxPNG"], 
+            path: "Sources/noise"), 
         .testTarget(
             name: "NoiseTests",
             dependencies: ["Noise"]),

Sources/Noise/noise.swift renamed to Sources/noise/noise.swift

@@ -20,23 +20,24 @@ public
 extension Noise
 {
     public
-    func noise2d(width:Int, height:Int) -> [UInt8]
+    func noise2d(width:Int, height:Int) -> [Double]
     {
-        var pixbuf:[UInt8] = []
-            pixbuf.reserveCapacity(width * height)
-        var y:Double = 0
-        for _ in 0 ..< height
+        var samples:[Double] = []
+            samples.reserveCapacity(width * height)
+        for y in 0 ..< height
         {
-            var x:Double = 0
-            for _ in 0 ..< width
+            for x in 0 ..< width
             {
-                x += 1
-                let noise:Double = self.evaluate(x, y)
-                pixbuf.append(UInt8(max(0, min(255, noise + 127))))
+                samples.append(self.evaluate(Double(x), Double(y)))
             }
-            y += 1
         }
-        return pixbuf
+        return samples
+    }
+
+    public
+    func noise2d_u8(width:Int, height:Int) -> [UInt8]
+    {
+        return self.noise2d(width: width, height: height).map{ UInt8(max(0, min(255, $0 + 127.5))) }
     }
 }
 

Sources/Noise/opensimplex.swift renamed to Sources/noise/opensimplex.swift

@@ -39,19 +39,19 @@ try png_encode(path: "poisson.png", raw_data: pixbuf, properties: png_properties
 
 let S:fBm<Simplex2D> = fBm<Simplex2D>(amplitude: 1, frequency: 0.00083429273, octaves: 10)
 t0 = clock()
-pixbuf = S.noise2d(width: viewer_size, height: viewer_size)
+pixbuf = S.noise2d_u8(width: viewer_size, height: viewer_size)
 print(clock() - t0)
 try png_encode(path: "simplex.png", raw_data: pixbuf, properties: png_properties)
 
 
 let SS:fBm<SuperSimplex2D> = fBm<SuperSimplex2D>(amplitude: 1, frequency: 0.00083429273, octaves: 10)
 t0 = clock()
-pixbuf = SS.noise2d(width: viewer_size, height: viewer_size)
+pixbuf = SS.noise2d_u8(width: viewer_size, height: viewer_size)
 print(clock() - t0)
 try png_encode(path: "super_simplex.png", raw_data: pixbuf, properties: png_properties)
 
 let SS3D:fBm<SuperSimplex3D> = fBm<SuperSimplex3D>(amplitude: 1, frequency: 0.00083429273, octaves: 10)
 t0 = clock()
-pixbuf = SS3D.noise2d(width: viewer_size, height: viewer_size)
+pixbuf = SS3D.noise2d_u8(width: viewer_size, height: viewer_size)
 print(clock() - t0)
 try png_encode(path: "super_simplex3D.png", raw_data: pixbuf, properties: png_properties)