self-displacement initializer for DistortedNoise

Author: tayloraswift

sources/noise/compounds.swift

@@ -34,7 +34,7 @@ struct FBM<Source>:Noise where Source:Noise
         self.generators = []
     }
 
-    @available(*, unavailable, message: "use init(source:octaves:persistence:lacunarity:) instead")
+    @available(*, unavailable, message: "use init(_:octaves:persistence:lacunarity:) instead")
     public
     init(amplitude:Double, frequency:Double, octaves:Int, persistence:Double = 0.75, lacunarity:Double = 2, seed:Int = 0)
     {
@@ -43,7 +43,7 @@ struct FBM<Source>:Noise where Source:Noise
 
     // UNDOCUMENTED, default was changed from 0.75 to 0.5
     public
-    init(source:Source, octaves:Int, persistence:Double = 0.5, lacunarity:Double = 2)
+    init(_ source:Source, octaves:Int, persistence:Double = 0.5, lacunarity:Double = 2)
     {
         // calculate maximum range
         let range_inverse:Double
@@ -109,6 +109,7 @@ struct FBM<Source>:Noise where Source:Noise
 }
 
 // UNDOCUMENTED
+public
 struct DistortedNoise<Source, Displacement>:Noise where Source:Noise, Displacement:Noise
 {
     private
@@ -141,14 +142,6 @@ struct DistortedNoise<Source, Displacement>:Noise where Source:Noise, Displaceme
         self.displacement = displacement
     }
 
-    /*
-    init(source:Source, strength:Double)
-    {
-        self.source       = source
-        self.displacement = source.amplitude_scaled(by: strength)
-    }
-    */
-
     public
     func evaluate(_ x: Double, _ y: Double) -> Double
     {
@@ -176,3 +169,13 @@ struct DistortedNoise<Source, Displacement>:Noise where Source:Noise, Displaceme
         return self.source.evaluate(x + dx, y + dy, z + dz, w + dw)
     }
 }
+
+extension DistortedNoise where Source == Displacement
+{
+    public
+    init(_ source:Source, strength:Double)
+    {
+        self.source       = source
+        self.displacement = source.amplitude_scaled(by: strength)
+    }
+}

sources/noise/gradient.swift

@@ -1,7 +1,7 @@
 fileprivate
 enum Const
 {
-    fileprivate static
+    static
     let SQUISH_2D :Double = 0.5 * (1 / 3.squareRoot() - 1),
         STRETCH_2D:Double = 0.5 * (3.squareRoot() - 1)
 }

tests/banner_FBM.png

@@ -44,7 +44,7 @@ do
     print(clock() - t0)
     try png_encode(path: "tests/cell3d.png", raw_data: pixbuf, properties: png_properties)
 
-    let P:FBM<ClassicNoise3D> = FBM<ClassicNoise3D>(source: ClassicNoise3D(amplitude: 255, frequency: 0.001), octaves: 10, persistence: 0.62)
+    let P:FBM<ClassicNoise3D> = FBM<ClassicNoise3D>(ClassicNoise3D(amplitude: 255, frequency: 0.001), octaves: 10, persistence: 0.62)
     t0 = clock()
     for (i, (x, y)) in Domain2D(samples_x: viewer_size, samples_y: viewer_size).enumerated()
     {
@@ -54,7 +54,7 @@ do
     try png_encode(path: "tests/classic3d.png", raw_data: pixbuf, properties: png_properties)
 
 
-    let SS:FBM<GradientNoise2D> = FBM<GradientNoise2D>(source: GradientNoise2D(amplitude: 180, frequency: 0.001), octaves: 10, persistence: 0.62)
+    let SS:FBM<GradientNoise2D> = FBM<GradientNoise2D>(GradientNoise2D(amplitude: 180, frequency: 0.001), octaves: 10, persistence: 0.62)
     t0 = clock()
     for (i, (x, y)) in Domain2D(samples_x: viewer_size, samples_y: viewer_size).enumerated()
     {
@@ -63,7 +63,7 @@ do
     print(clock() - t0)
     try png_encode(path: "tests/gradient2d.png", raw_data: pixbuf, properties: png_properties)
 
-    let SS3D:FBM<GradientNoise3D> = FBM<GradientNoise3D>(source: GradientNoise3D(amplitude: 180, frequency: 0.001), octaves: 10, persistence: 0.62)
+    let SS3D:FBM<GradientNoise3D> = FBM<GradientNoise3D>(GradientNoise3D(amplitude: 180, frequency: 0.001), octaves: 10, persistence: 0.62)
     t0 = clock()
     for (i, (x, y)) in Domain2D(samples_x: viewer_size, samples_y: viewer_size).enumerated()
     {

tests/noise/main.swift

@@ -138,9 +138,9 @@ func banner_cell3d(width:Int, height:Int, seed:Int)
 
 func banner_FBM(width:Int, height:Int, seed:Int)
 {
-    color_noise_png(r_noise: FBM<CellNoise3D>    (source: CellNoise3D(amplitude: 9*255, frequency: 0.01, seed: seed + 2), octaves: 7, persistence: 0.75),
-                    g_noise: FBM<GradientNoise3D>(source: GradientNoise3D(amplitude: 280, frequency: 0.005, seed: seed + 1), octaves: 7, persistence: 0.75),
-                    b_noise: FBM<GradientNoise2D>(source: GradientNoise2D(amplitude: 280, frequency: 0.005), octaves: 7, persistence: 0.75),
+    color_noise_png(r_noise: FBM<CellNoise3D>    (CellNoise3D(amplitude: 10*255, frequency: 0.01, seed: seed + 2), octaves: 7, persistence: 0.75),
+                    g_noise: FBM<GradientNoise3D>(GradientNoise3D(amplitude: 300, frequency: 0.005, seed: seed + 3), octaves: 7, persistence: 0.75),
+                    b_noise: FBM<GradientNoise2D>(GradientNoise2D(amplitude: 300, frequency: 0.005), octaves: 7, persistence: 0.75),
                     width: width,
                     height: height,
                     value_offset: (0, 150, 150),