steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

noise: don't use math.private words

db4
Slava Pestov 2009-09-01 15:50:56 -05:00
parent b8aa894960
commit c9113c03cf
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
extra/noise/noise.factor
View File

@ -1,9 +1,8 @@
USING: accessors arrays byte-arrays combinators USING: accessors arrays byte-arrays combinators
combinators.short-circuit fry hints images kernel locals math combinators.short-circuit fry hints images kernel locals math
math.affine-transforms math.functions math.order math.affine-transforms math.functions math.order math.polynomials
math.polynomials math.private math.vectors random math.vectors random random.mersenne-twister sequences
random.mersenne-twister sequences sequences.private sequences.private sequences.product ;
sequences.product ;
IN: noise IN: noise
: <perlin-noise-table> ( -- table ) : <perlin-noise-table> ( -- table )
@ -35,25 +34,25 @@ HINTS: (fade) { float float float } ;
HINTS: grad { fixnum float float float } ; HINTS: grad { fixnum float float float } ;
: unit-cube ( point -- cube ) : unit-cube ( point -- cube )
[ floor >fixnum 256 rem ] map ; [ floor 256 rem ] map ;
:: hashes ( table x y z -- aaa baa aba bba aab bab abb bbb ) :: hashes ( table x y z -- aaa baa aba bba aab bab abb bbb )
x table nth-unsafe y fixnum+fast :> a x table nth-unsafe y + :> a
x 1 fixnum+fast table nth-unsafe y fixnum+fast :> b x 1 + table nth-unsafe y + :> b
a table nth-unsafe z fixnum+fast :> aa a table nth-unsafe z + :> aa
b table nth-unsafe z fixnum+fast :> ba b table nth-unsafe z + :> ba
a 1 fixnum+fast table nth-unsafe z fixnum+fast :> ab a 1 + table nth-unsafe z + :> ab
b 1 fixnum+fast table nth-unsafe z fixnum+fast :> bb b 1 + table nth-unsafe z + :> bb
aa table nth-unsafe aa table nth-unsafe
ba table nth-unsafe ba table nth-unsafe
ab table nth-unsafe ab table nth-unsafe
bb table nth-unsafe bb table nth-unsafe
aa 1 fixnum+fast table nth-unsafe aa 1 + table nth-unsafe
ba 1 fixnum+fast table nth-unsafe ba 1 + table nth-unsafe
ab 1 fixnum+fast table nth-unsafe ab 1 + table nth-unsafe
bb 1 fixnum+fast table nth-unsafe ; inline bb 1 + table nth-unsafe ; inline
HINTS: hashes { byte-array fixnum fixnum fixnum } ; HINTS: hashes { byte-array fixnum fixnum fixnum } ;