rename several API members

Author: tayloraswift

sources/noise/noise.swift

@@ -2,7 +2,6 @@ public
 protocol Noise
 {
     init(amplitude:Double, frequency:Double, seed:Int)
-
     func evaluate(_ x:Double, _ y:Double)                         -> Double
     func evaluate(_ x:Double, _ y:Double, _ z:Double)             -> Double
     func evaluate(_ x:Double, _ y:Double, _ z:Double, _ w:Double) -> Double
@@ -12,17 +11,17 @@ public
 extension Noise
 {
     public
-    func sample_area(width:Int, height:Int) -> [(x:Double, y:Double, z:Double)]
+    func sample_area(width:Int, height:Int) -> [(Double, Double, Double)]
     {
-        var samples:[(x:Double, y:Double, z:Double)] = []
+        var samples:[(Double, Double, Double)] = []
             samples.reserveCapacity(width * height)
         for i in 0 ..< height
         {
             for j in 0 ..< width
             {
                 let x:Double = Double(i) + 0.5,
                     y:Double = Double(j) + 0.5
-                samples.append((x: x, y: y, z: self.evaluate(x, y)))
+                samples.append((x, y, self.evaluate(x, y)))
             }
         }
         return samples
@@ -150,7 +149,7 @@ enum Math
 }
 
 public
-struct fBm<Generator:Noise>:Noise
+struct FBM<Generator:Noise>:Noise
 {
     private
     let generators:[Generator]
@@ -212,7 +211,8 @@ struct fBm<Generator:Noise>:Noise
     }
 }
 
-struct RandomXORShift
+public
+struct RandomXorshift
 {
     private
     var state128:(UInt32, UInt32, UInt32, UInt32)
@@ -266,7 +266,7 @@ struct PermutationTable
     init(seed:Int)
     {
         var permutations:[UInt8] = [UInt8](0 ... 255),
-            rng:RandomXORShift = RandomXORShift(seed: seed)
+            rng:RandomXorshift = RandomXorshift(seed: seed)
         for i in 0 ..< 255 - 1
         {
             permutations.swapAt(i, Int(rng.generate()) & 255)

sources/noise/poisson.swift

@@ -1,11 +1,11 @@
 public
-struct PoissonSampler
+struct DiskSampler2D
 {
     private
     let candidate_ring:[Math.DoubleV2]
 
     private
-    var rng:RandomXORShift,
+    var rng:RandomXorshift,
         candidate_index:Int = 0
 
     private
@@ -20,14 +20,14 @@ struct PoissonSampler
     public
     init(seed:Int = 0)
     {
-        self.rng = RandomXORShift(seed: seed)
+        self.rng = RandomXorshift(seed: seed)
         let rand_scale:Double = 4 / Double(self.rng.max)
 
         var candidates_generated:Int = 0
         var candidate_ring:[Math.DoubleV2] = []
-            candidate_ring.reserveCapacity(PoissonSampler.candidate_table_bitmask + 1)
+            candidate_ring.reserveCapacity(DiskSampler2D.candidate_table_bitmask + 1)
 
-        while candidates_generated <= PoissonSampler.candidate_table_bitmask
+        while candidates_generated <= DiskSampler2D.candidate_table_bitmask
         {
             let x:Double  = Double(self.rng.generate()) * rand_scale - 1,
                 y:Double  = Double(self.rng.generate()) * rand_scale - 1,
@@ -72,15 +72,15 @@ struct PoissonSampler
             for _ in 0 ..< k
             {
                 let candidate:Math.DoubleV2 = Math.add(front, self.candidate_offset)
-                self.candidate_index = (self.candidate_index + 1) & PoissonSampler.candidate_table_bitmask
+                self.candidate_index = (self.candidate_index + 1) & DiskSampler2D.candidate_table_bitmask
 
                 guard 0 ..< normalized_width ~= candidate.x && 0 ..< normalized_height ~= candidate.y
                 else
                 {
                     continue
                 }
 
-                if PoissonSampler.attempt_insert(candidate: candidate, into_grid: &grid, grid_stride: grid_stride)
+                if DiskSampler2D.attempt_insert(candidate: candidate, into_grid: &grid, grid_stride: grid_stride)
                 {
                     points.append((candidate.x * radius, candidate.y * radius))
                     queue.append(candidate)

tests/LinuxMain.swift

@@ -27,7 +27,7 @@ let png_properties:PNGProperties = PNGProperties(width: viewer_size, height: vie
 
 var t0:Int
 
-var poisson = PoissonSampler(seed: 0)
+var poisson = DiskSampler2D(seed: 0)
 t0 = clock()
 pixbuf = [UInt8](repeating: 0, count: viewer_size * viewer_size)
 for point:(x:Double, y:Double) in poisson.generate(radius: 10, width: viewer_size, height: viewer_size)
@@ -104,20 +104,20 @@ try {
     try png_encode(path: "cells3D.png", raw_data: pixbuf_color, properties: png_color)
 }()
 
-let S:fBm<SimplexNoise2D> = fBm<SimplexNoise2D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
+let S:fBm<SimplexNoise2D> = FBM<SimplexNoise2D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
 t0 = clock()
 pixbuf = S.sample_area_saturated_to_u8(width: viewer_size, height: viewer_size, offset: 127.5)
 print(clock() - t0)
 try png_encode(path: "simplex.png", raw_data: pixbuf, properties: png_properties)
 
 
-let SS:fBm<SuperSimplexNoise2D> = fBm<SuperSimplexNoise2D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
+let SS:fBm<SuperSimplexNoise2D> = FBM<SuperSimplexNoise2D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
 t0 = clock()
 pixbuf = SS.sample_area_saturated_to_u8(width: viewer_size, height: viewer_size, offset: 127.5)
 print(clock() - t0)
 try png_encode(path: "super_simplex.png", raw_data: pixbuf, properties: png_properties)
 
-let SS3D:fBm<SuperSimplexNoise3D> = fBm<SuperSimplexNoise3D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
+let SS3D:fBm<SuperSimplexNoise3D> = FBM<SuperSimplexNoise3D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
 t0 = clock()
 pixbuf = SS3D.sample_area_saturated_to_u8(width: viewer_size, height: viewer_size, offset: 127.5)
 print(clock() - t0)