voronoi and disk banners, and FBM

Author: tayloraswift

poisson.png

@@ -10,7 +10,7 @@ import NoiseTests
 
 banners(width: 700, ratio: 5)
 
-/*
+
 var pixbuf:[UInt8]
 let png_properties:PNGProperties = PNGProperties(width: viewer_size, height: viewer_size, bit_depth: 8, color: .grayscale, interlaced: false)!
 
@@ -112,4 +112,3 @@ t0 = clock()
 pixbuf = SS3D.sample_area_saturated_to_u8(width: viewer_size, height: viewer_size, offset: 127.5)
 print(clock() - t0)
 try png_encode(path: "super_simplex3D.png", raw_data: pixbuf, properties: png_properties)
-*/

tests/LinuxMain.swift

@@ -21,13 +21,13 @@ func write_rgb_png(path:String, width:Int, height:Int, pixbuf:[UInt8])
 }
 
 func color_noise_png(r_noise:Noise, g_noise:Noise, b_noise:Noise,
-    width:Int, height:Int, value_offset:Double, invert:Bool = false, path:String)
+    width:Int, height:Int, value_offset:(r:Double, g:Double, b:Double), invert:Bool = false, path:String)
 {
     var pixbuf:[UInt8] = []
         pixbuf.reserveCapacity(3 * width * height)
-    for (r, (g, b)) in zip(r_noise.sample_area_saturated_to_u8(width: width, height: height, offset: value_offset),
-                       zip(g_noise.sample_area_saturated_to_u8(width: width, height: height, offset: value_offset),
-                           b_noise.sample_area_saturated_to_u8(width: width, height: height, offset: value_offset)))
+    for (r, (g, b)) in zip(r_noise.sample_area_saturated_to_u8(width: width, height: height, offset: value_offset.r),
+                       zip(g_noise.sample_area_saturated_to_u8(width: width, height: height, offset: value_offset.g),
+                           b_noise.sample_area_saturated_to_u8(width: width, height: height, offset: value_offset.b)))
     {
         if invert
         {
@@ -53,7 +53,7 @@ func banner_simplex2d(width:Int, height:Int, seed:Int)
                     b_noise: SimplexNoise2D(amplitude: 0.5*255, frequency: 0.00375, seed: seed + 2),
                     width: width,
                     height: height,
-                    value_offset: 0.65*255,
+                    value_offset: (0.65*255, 0.65*255, 0.65*255),
                     path: "tests/banner_simplex2d.png")
 }
 
@@ -64,7 +64,7 @@ func banner_supersimplex2d(width:Int, height:Int, seed:Int)
                     b_noise: SuperSimplexNoise2D(amplitude: 0.5*255, frequency: 0.0025, seed: seed + 2),
                     width: width,
                     height: height,
-                    value_offset: 0.65*255,
+                    value_offset: (0.65*255, 0.65*255, 0.65*255),
                     path: "tests/banner_supersimplex2d.png")
 }
 
@@ -75,7 +75,7 @@ func banner_supersimplex3d(width:Int, height:Int, seed:Int)
                     b_noise: SuperSimplexNoise3D(amplitude: 0.5*255, frequency: 0.0025, seed: seed + 2),
                     width: width,
                     height: height,
-                    value_offset: 0.65*255,
+                    value_offset: (0.65*255, 0.65*255, 0.65*255),
                     path: "tests/banner_supersimplex3d.png")
 }
 
@@ -86,7 +86,7 @@ func banner_cell2d(width:Int, height:Int, seed:Int)
                     b_noise: CellNoise2D(amplitude: 3*255, frequency: 0.0075, seed: seed + 2),
                     width: width,
                     height: height,
-                    value_offset: 0,
+                    value_offset: (0, 0, 0),
                     invert: true,
                     path: "tests/banner_cell2d.png")
 }
@@ -98,11 +98,23 @@ func banner_cell3d(width:Int, height:Int, seed:Int)
                     b_noise: CellNoise3D(amplitude: 3*255, frequency: 0.0075, seed: seed + 2),
                     width: width,
                     height: height,
-                    value_offset: 0,
+                    value_offset: (0, 0, 0),
                     invert: true,
                     path: "tests/banner_cell3d.png")
 }
 
+func banner_FBM(width:Int, height:Int, seed:Int)
+{
+    color_noise_png(r_noise: FBM<CellNoise3D>     (amplitude: 2.7*255, frequency: 0.01, octaves: 7, seed: seed + 2),
+                    g_noise: FBM<SuperSimplexNoise3D>(amplitude: 255/3, frequency: 0.005, octaves: 7, seed: seed + 1),
+                    b_noise: FBM<SimplexNoise2D>        (amplitude: 255/3, frequency: 0.03, octaves: 7, seed: seed),
+                    width: width,
+                    height: height,
+                    value_offset: (0, 150, 150),
+                    invert: false,
+                    path: "tests/banner_FBM.png")
+}
+
 func circle_at(cx:Double, cy:Double, r:Double, width:Int, height:Int, _ f:(Int, Int, Double) -> ())
 {
     // get bounding box
@@ -130,29 +142,92 @@ func banner_disk2d(width:Int, height:Int, seed:Int)
     var pixbuf:[UInt8] = [UInt8](repeating: 255, count: 3 * width * height)
 
     let points = poisson.generate(radius: 20, width: width, height: height, k: 80)
-    for point:(x:Double, y:Double) in points
+
+    @inline(__always)
+    func _dots(_ points:[(x:Double, y:Double)], color: (r:UInt8, g:UInt8, b:UInt8))
     {
-        circle_at(cx: point.x, cy: point.y, r: 5, width: width, height: height,
+        for point:(x:Double, y:Double) in points
         {
-            (x:Int, y:Int, v:Double) in
-
-            let base_addr:Int = 3 * (y * width + x)
-            pixbuf[base_addr + 1] = pixbuf[base_addr + 1] &- UInt8(255 * v)
-        })
+            circle_at(cx: point.x, cy: point.y, r: 10, width: width, height: height,
+            {
+                (x:Int, y:Int, v:Double) in
+
+                let base_addr:Int = 3 * (y * width + x)
+                pixbuf[base_addr    ] = UInt8(clamping: Int(pixbuf[base_addr    ]) - Int(Double(color.r) * v))
+                pixbuf[base_addr + 1] = UInt8(clamping: Int(pixbuf[base_addr + 1]) - Int(Double(color.g) * v))
+                pixbuf[base_addr + 2] = UInt8(clamping: Int(pixbuf[base_addr + 2]) - Int(Double(color.b) * v))
+            })
+        }
     }
 
+    _dots(poisson.generate(radius: 35, width: width, height: height, k: 80, seed: (10, 10)), color: (0, 210, 70))
+    _dots(poisson.generate(radius: 25, width: width, height: height, k: 80, seed: (45, 15)), color: (0, 10, 235))
+    _dots(poisson.generate(radius: 30, width: width, height: height, k: 80, seed: (15, 45)), color: (225, 20, 0))
+
     write_rgb_png(path: "tests/banner_disk2d.png", width: width, height: height, pixbuf: pixbuf)
 }
 
+func banner_voronoi2d(width:Int, height:Int, seed:Int)
+{
+    let voronoi        = CellNoise2D(amplitude: 255, frequency: 0.025, seed: seed)
+    var pixbuf:[UInt8] = [UInt8](repeating: 0, count: 3 * width * height)
+
+    let r:PermutationTable   = PermutationTable(seed: seed),
+        g:PermutationTable   = PermutationTable(seed: seed + 1),
+        b:PermutationTable   = PermutationTable(seed: seed + 2)
+
+    var base_addr:Int = 0
+    for y in 0 ..< height
+    {
+        for x in 0 ..< width
+        {
+            @inline(__always)
+            func _supersample(_ x:Double, _ y:Double) -> (r:UInt8, g:UInt8, b:UInt8)
+            {
+                let (point, _):((Int, Int), Double) = voronoi.closest_point(Double(x), Double(y))
+                let r:UInt8 = r.hash(point.0, point.1),
+                    g:UInt8 = g.hash(point.0, point.1),
+                    b:UInt8 = b.hash(point.0, point.1),
+                    peak:UInt8 = max(r, max(g, b)),
+                    saturate:Double = Double(UInt8.max) / Double(peak)
+                return (UInt8(Double(r) * saturate), UInt8(Double(g) * saturate), UInt8(Double(b) * saturate))
+            }
+
+            var r:Int = 0,
+                g:Int = 0,
+                b:Int = 0
+            let supersamples:[(Double, Double)] = [(0, 0), (0, 0.4), (0.4, 0), (-0.4, 0), (0, -0.4),
+                                                   (-0.25, -0.25), (0.25, 0.25), (-0.25, 0.25), (0.25, -0.25)]
+            for (dx, dy) in supersamples
+            {
+                let contribution:(r:UInt8, g:UInt8, b:UInt8) = _supersample(Double(x) + dx, Double(y) + dy)
+                r += Int(contribution.r)
+                g += Int(contribution.g)
+                b += Int(contribution.b)
+            }
+            pixbuf[base_addr    ] = UInt8(r / supersamples.count)
+            pixbuf[base_addr + 1] = UInt8(g / supersamples.count)
+            pixbuf[base_addr + 2] = UInt8(b / supersamples.count)
+
+            base_addr += 3
+        }
+    }
+
+    write_rgb_png(path: "tests/banner_voronoi2d.png", width: width, height: height, pixbuf: pixbuf)
+}
+
 public
 func banners(width:Int, ratio:Double)
 {
     let height:Int = Int(Double(width) / ratio)
-    banner_simplex2d(width: width, height: height, seed: 5)
+    banner_simplex2d     (width: width, height: height, seed: 5)
     banner_supersimplex2d(width: width, height: height, seed: 8)
     banner_supersimplex3d(width: width, height: height, seed: 0)
-    banner_cell2d(width: width, height: height, seed: 0)
-    banner_cell3d(width: width, height: height, seed: 0)
+    banner_cell2d        (width: width, height: height, seed: 0)
+    banner_cell3d        (width: width, height: height, seed: 0)
+    banner_voronoi2d     (width: width, height: height, seed: 3)
+
+    banner_FBM           (width: width, height: height, seed: 0)
 
-    banner_disk2d(width: width, height: height, seed: 0)
+    banner_disk2d        (width: width, height: height, seed: 0)
 }