Skip to content

Commit 6ad629e

Browse files
committed
fix test, and adjust scaling factor for cell noise amplitudes:
1 parent e9723d4 commit 6ad629e

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

sources/noise/cell.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct CellNoise2D:Noise
99
public
1010
init(amplitude:Double, frequency:Double, seed:Int = 0)
1111
{
12-
self.amplitude = amplitude * 1/2.squareRoot()
12+
self.amplitude = amplitude * 1/2
1313
self.frequency = frequency
1414
self.permutation_table = PermutationTable(seed: seed)
1515
}
@@ -199,7 +199,7 @@ struct CellNoise3D:Noise
199199
public
200200
init(amplitude:Double, frequency:Double, seed:Int = 0)
201201
{
202-
self.amplitude = amplitude * 1/3.squareRoot()
202+
self.amplitude = amplitude * 1/3
203203
self.frequency = frequency
204204
self.permutation_table = PermutationTable(seed: seed)
205205
}

tests/LinuxMain.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,20 @@ try {
104104
try png_encode(path: "cells3D.png", raw_data: pixbuf_color, properties: png_color)
105105
}()
106106

107-
let S:fBm<SimplexNoise2D> = FBM<SimplexNoise2D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
107+
let S:FBM<SimplexNoise2D> = FBM<SimplexNoise2D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
108108
t0 = clock()
109109
pixbuf = S.sample_area_saturated_to_u8(width: viewer_size, height: viewer_size, offset: 127.5)
110110
print(clock() - t0)
111111
try png_encode(path: "simplex.png", raw_data: pixbuf, properties: png_properties)
112112

113113

114-
let SS:fBm<SuperSimplexNoise2D> = FBM<SuperSimplexNoise2D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
114+
let SS:FBM<SuperSimplexNoise2D> = FBM<SuperSimplexNoise2D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
115115
t0 = clock()
116116
pixbuf = SS.sample_area_saturated_to_u8(width: viewer_size, height: viewer_size, offset: 127.5)
117117
print(clock() - t0)
118118
try png_encode(path: "super_simplex.png", raw_data: pixbuf, properties: png_properties)
119119

120-
let SS3D:fBm<SuperSimplexNoise3D> = FBM<SuperSimplexNoise3D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
120+
let SS3D:FBM<SuperSimplexNoise3D> = FBM<SuperSimplexNoise3D>(amplitude: 0.5*127.5, frequency: 0.001, octaves: 10)
121121
t0 = clock()
122122
pixbuf = SS3D.sample_area_saturated_to_u8(width: viewer_size, height: viewer_size, offset: 127.5)
123123
print(clock() - t0)

voronoi.png

-7.52 KB
Loading

voronoi3D.png

-1.64 KB
Loading

0 commit comments

Comments
 (0)