use a better algorithm to generate uniform/normal noise

diff --git a/extra/noise/noise.factor b/extra/noise/noise.factor
index 032090cae3f47604aefce9465ac7bb62025a4006..5d32ed4502b18c6d1b2c6a65dfe2935a516324ea 100644 (file)
--- a/extra/noise/noise.factor
+++ b/extra/noise/noise.factor
@@ -4,32 +4,13 @@ math.libm math.matrices.simd math.vectors math.vectors.conversion math.vectors.s
 memoize random random.mersenne-twister sequences sequences.private specialized-arrays
 typed ;
 QUALIFIED-WITH: alien.c-types c
-SIMDS: c:float c:int c:short c:uchar ;
+SIMDS: c:float c:int c:short c:ushort c:uchar ;
 SPECIALIZED-ARRAYS: c:float c:uchar float-4 uchar-16 ;
 IN: noise
 
 : with-seed ( seed quot -- )
     [ <mersenne-twister> ] dip with-random ; inline
 
-: random-int-4 ( -- v )
-    16 random-bytes underlying>> int-4 boa ; inline
-
-: (random-float-4) ( -- v )
-    random-int-4 int-4 float-4 vconvert ; inline
-
-! XXX redundant add
-: uniform-random-float-4 ( min max -- n )
-    (random-float-4) (random-float-4)
-    2.0 31 ^ v+n 2.0 32 ^ v*n v+
-    [ over - 2.0 -64 ^ * ] dip n*v n+v ; inline
-
-: normal-random-float-4 ( mean sigma -- n )
-    0.0 1.0 uniform-random-float-4
-    0.0 1.0 uniform-random-float-4
-    [ 2 pi * v*n [ fcos ] map ]
-    [ 1.0 swap n-v [ flog ] map -2.0 v*n vsqrt ]
-    bi* v* n*v n+v ; inline
-
 : float-map>byte-map ( floats: float-array scale: float bias: float -- bytes: byte-array )
     '[
         [ _ 255.0 * v*n _ 255.0 * v+n float-4 int-4 vconvert ] 4 napply 
@@ -37,32 +18,34 @@ IN: noise
         short-8 uchar-16 vconvert
     ] data-map( float-4[4] -- uchar-16 ) ; inline
 
-TYPED:: float-map>image ( floats: float-array dim scale: float bias: float -- image: image )
+TYPED: byte-map>image ( bytes: byte-array dim -- image: image )
     image new
-        dim >>dim
-        floats scale bias float-map>byte-map >>bitmap
+        swap >>dim
+        swap >>bitmap
         L >>component-order
         ubyte-components >>component-type ;
 
-TYPED: uniform-noise-map ( seed: integer dim -- map: float-array )
-    '[
-        _ product 4 / [ 0.0 1.0 uniform-random-float-4 ]
-        float-4-array{ } replicate-as
-        byte-array>float-array
-    ] with-seed ;
+:: float-map>image ( floats: float-array dim scale: float bias: float -- image: image )
+    floats scale bias float-map>byte-map dim byte-map>image ; inline
 
 : uniform-noise-image ( seed dim -- image )
-    [ uniform-noise-map ] [ 1.0 0.0 float-map>image ] bi ; inline
+    [ '[ _ product random-bytes >byte-array ] with-seed ]
+    [ byte-map>image ] bi ; inline
+
+CONSTANT: normal-noise-pow 2
+CONSTANT: normal-noise-count 4
 
-TYPED: normal-noise-map ( seed: integer sigma: float dim -- map: float-array )
-    swap '[
-        _ product 4 / [ 0.5 _ normal-random-float-4 ]
-        float-4-array{ } replicate-as
-        byte-array>float-array
-    ] with-seed ;
+TYPED: normal-noise-map ( seed: integer dim -- bytes )
+    '[ _ product normal-noise-count * random-bytes >byte-array ] with-seed
+    [
+        [ ushort-8{ 0 0 0 0 0 0 0 0 } ushort-8{ 0 0 0 0 0 0 0 0 } ] normal-noise-count ndip
+        [ uchar-16 ushort-8 vconvert [ v+ ] bi-curry@ bi* ] normal-noise-count napply
+        [ normal-noise-pow vrshift ] bi@
+        ushort-8 uchar-16 vconvert
+    ] data-map( uchar-16[normal-noise-count] -- uchar-16 ) ; inline
 
-: normal-noise-image ( seed sigma dim -- image )
-    [ normal-noise-map ] [ 1.0 0.0 float-map>image ] bi ; inline
+: normal-noise-image ( seed dim -- image )
+    [ normal-noise-map ] [ byte-map>image ] bi ; inline
 
 ERROR: invalid-perlin-noise-table table ;
 
@@ -73,7 +56,7 @@ ERROR: invalid-perlin-noise-table table ;
     dup { [ byte-array? ] [ length 512 >= ] } 1&&
     [ invalid-perlin-noise-table ] unless ;
 
-! XXX doesn't work for NaNs or very large floats
+! XXX doesn't work for NaNs or floats > 2^31
 : floor-vector ( v -- v' )
     [ float-4 int-4 vconvert int-4 float-4 vconvert ]
     [ [ v> -1.0 float-4-with vand ] curry keep v+ ] bi ; inline

diff --git a/extra/terrain/generation/generation.factor b/extra/terrain/generation/generation.factor
index d1b6dededac6d3ef3cebde77b643496ac48c014a..e41d1078713676728212abb25cff47e4bb858e46 100644 (file)
--- a/extra/terrain/generation/generation.factor
+++ b/extra/terrain/generation/generation.factor
@@ -32,7 +32,7 @@ TUPLE: terrain
     terrain-segment-size-vector v* translation-matrix4 m4. 
     terrain-segment-size perlin-noise-image bitmap>> ; inline
 : tiny-noise-segment ( terrain at -- bytes )
-    [ tiny-noise-seed>> ] dip seed-at 0.1
+    [ tiny-noise-seed>> ] dip seed-at
     terrain-segment-size normal-noise-image bitmap>> ; inline
 : padding ( terrain at -- padding )
     2drop terrain-segment-size product 255 <repetition> >byte-array ; inline