Some final tweaks to the examples

I promise
This commit is contained in:
dcodeIO
2018-04-20 18:56:51 +02:00
parent 4eade0f319
commit bde13b12cf
15 changed files with 2068 additions and 1487 deletions

View File

@ -13,30 +13,31 @@ export function computeLine(y: u32, width: u32, height: u32, limit: u32): void {
let real = (x - translateX) * scale;
// Iterate until either the escape radius or iteration limit is exceeded
let ix = 0.0, iy = 0.0, ixsq: f64, iysq: f64;
let ix = 0.0, iy = 0.0, ixSq: f64, iySq: f64;
let iteration: u32 = 0;
while ((ixsq = ix * ix) + (iysq = iy * iy) <= 4.0) {
let ix_new = ixsq - iysq + real;
while ((ixSq = ix * ix) + (iySq = iy * iy) <= 4.0) {
let ixNew = ixSq - iySq + real;
iy = 2.0 * ix * iy + imaginary;
ix = ix_new;
ix = ixNew;
if (iteration >= limit) break;
++iteration;
}
// Do a few extra iterations to reduce error margin
for (let i = 0; i < 5 && iteration < limit; ++i, ++iteration) {
let ix_new = ix * ix - iy * iy + real;
// Do a few extra iterations for quick escapes to reduce error margin
for (let minIterations = min(8, limit); iteration < minIterations; ++iteration) {
let ixNew = ix * ix - iy * iy + real;
iy = 2.0 * ix * iy + imaginary;
ix = ix_new;
ix = ixNew;
}
// Renormalize, see: http://linas.org/art-gallery/escape/escape.html
let frac: f64 = JSMath.log(JSMath.log(sqrt(ix * ix + iy * iy))) / JSMath.LN2;
store<u16>((y * width + x) << 1,
isFinite(frac)
? <u32>((NUM_COLORS - 1) * clamp((iteration + 1 - frac) / limit, 0.0, 1.0))
: (NUM_COLORS - 1) * iteration / limit
);
// Iteration count is a discrete value in the range [0, limit] here, but we'd like it to be
// normalized in the range [0, 2047] so it maps to the gradient computed in JS.
// see also: http://linas.org/art-gallery/escape/escape.html
let frac = Math.log(Math.log(Math.sqrt(ix * ix + iy * iy))) / Math.LN2;
let icol = isFinite(frac)
? <u32>((NUM_COLORS - 1) * clamp((iteration + 1 - frac) / limit, 0.0, 1.0))
: NUM_COLORS - 1;
store<u16>((y * width + x) << 1, icol);
}
}

View File

@ -1,25 +1,24 @@
(module
(type $iiiiv (func (param i32 i32 i32 i32)))
(type $FF (func (param f64) (result f64)))
(import "JSMath" "sqrt" (func $~lib/math/JSMath.sqrt (param f64) (result f64)))
(import "JSMath" "log" (func $~lib/math/JSMath.log (param f64) (result f64)))
(import "JSMath" "LN2" (global $~lib/math/JSMath.LN2 f64))
(import "env" "memory" (memory $0 1))
(export "computeLine" (func $assembly/index/computeLine))
(export "memory" (memory $0))
(func $assembly/index/computeLine (; 1 ;) (type $iiiiv) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
(func $assembly/index/computeLine (; 2 ;) (type $iiiiv) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
(local $4 f64)
(local $5 f64)
(local $6 i32)
(local $7 f64)
(local $8 i32)
(local $9 i32)
(local $8 f64)
(local $9 f64)
(local $10 f64)
(local $11 f64)
(local $12 f64)
(local $13 f64)
(local $14 f64)
;;@ assembly/index.ts:8:2
(set_local $12
(set_local $11
;;@ assembly/index.ts:8:19
(f64.div
(f64.convert_u/i32
@ -30,7 +29,7 @@
)
)
;;@ assembly/index.ts:11:2
(set_local $10
(set_local $9
;;@ assembly/index.ts:11:18
(f64.mul
(f64.sub
@ -48,7 +47,7 @@
)
)
;;@ assembly/index.ts:10:2
(tee_local $13
(tee_local $12
;;@ assembly/index.ts:10:14
(f64.div
(f64.const 10)
@ -75,29 +74,34 @@
)
)
)
;;@ assembly/index.ts:12:7
(set_local $2
;;@ assembly/index.ts:12:20
(i32.const 0)
)
(loop $continue|0
(if
;;@ assembly/index.ts:12:23
(i32.lt_u
(get_local $8)
(get_local $2)
;;@ assembly/index.ts:12:27
(get_local $1)
)
(block
;;@ assembly/index.ts:13:4
(set_local $11
(set_local $10
;;@ assembly/index.ts:13:15
(f64.mul
(f64.sub
(f64.convert_u/i32
;;@ assembly/index.ts:13:16
(get_local $8)
(get_local $2)
)
;;@ assembly/index.ts:13:20
(get_local $12)
(get_local $11)
)
;;@ assembly/index.ts:13:34
(get_local $13)
(get_local $12)
)
)
(set_local $4
@ -120,7 +124,7 @@
;;@ assembly/index.ts:18:11
(f64.le
(f64.add
(tee_local $14
(tee_local $8
;;@ assembly/index.ts:18:19
(f64.mul
(get_local $4)
@ -156,20 +160,20 @@
(get_local $5)
)
;;@ assembly/index.ts:20:27
(get_local $10)
(get_local $9)
)
)
;;@ assembly/index.ts:21:6
(set_local $4
;;@ assembly/index.ts:19:19
;;@ assembly/index.ts:19:18
(f64.add
(f64.sub
(get_local $14)
;;@ assembly/index.ts:19:26
(get_local $8)
;;@ assembly/index.ts:19:25
(get_local $7)
)
;;@ assembly/index.ts:19:33
(get_local $11)
;;@ assembly/index.ts:19:32
(get_local $10)
)
)
;;@ assembly/index.ts:22:30
@ -195,52 +199,47 @@
)
)
;;@ assembly/index.ts:27:9
(set_local $9
;;@ assembly/index.ts:27:17
(i32.const 0)
(set_local $8
;;@ assembly/index.ts:27:29
(f64.min
;;@ assembly/index.ts:27:33
(f64.const 8)
;;@ assembly/index.ts:27:36
(f64.convert_u/i32
(get_local $3)
)
)
)
(loop $continue|2
(if
;;@ assembly/index.ts:27:20
(i32.and
(if (result i32)
(tee_local $2
(i32.lt_s
(get_local $9)
;;@ assembly/index.ts:27:24
(i32.const 5)
)
)
;;@ assembly/index.ts:27:29
(i32.lt_u
(get_local $6)
;;@ assembly/index.ts:27:41
(get_local $3)
)
(get_local $2)
;;@ assembly/index.ts:27:44
(f64.lt
(f64.convert_u/i32
(get_local $6)
)
(i32.const 1)
;;@ assembly/index.ts:27:56
(get_local $8)
)
(block
;;@ assembly/index.ts:28:6
(set_local $7
;;@ assembly/index.ts:28:19
;;@ assembly/index.ts:28:18
(f64.add
(f64.sub
(f64.mul
(get_local $4)
;;@ assembly/index.ts:28:24
;;@ assembly/index.ts:28:23
(get_local $4)
)
;;@ assembly/index.ts:28:29
;;@ assembly/index.ts:28:28
(f64.mul
(get_local $5)
;;@ assembly/index.ts:28:34
;;@ assembly/index.ts:28:33
(get_local $5)
)
)
;;@ assembly/index.ts:28:39
(get_local $11)
;;@ assembly/index.ts:28:38
(get_local $10)
)
)
;;@ assembly/index.ts:29:6
@ -257,7 +256,7 @@
(get_local $5)
)
;;@ assembly/index.ts:29:27
(get_local $10)
(get_local $9)
)
)
;;@ assembly/index.ts:30:6
@ -265,18 +264,10 @@
;;@ assembly/index.ts:30:11
(get_local $7)
)
;;@ assembly/index.ts:27:48
(set_local $9
(i32.add
;;@ assembly/index.ts:27:50
(get_local $9)
(i32.const 1)
)
)
;;@ assembly/index.ts:27:53
;;@ assembly/index.ts:27:71
(set_local $6
(i32.add
;;@ assembly/index.ts:27:55
;;@ assembly/index.ts:27:73
(get_local $6)
(i32.const 1)
)
@ -285,88 +276,88 @@
)
)
)
;;@ assembly/index.ts:35:4
;;@ assembly/index.ts:40:4
(i32.store16
;;@ assembly/index.ts:35:15
;;@ assembly/index.ts:40:15
(i32.shl
(i32.add
;;@ assembly/index.ts:35:16
;;@ assembly/index.ts:40:16
(i32.mul
(get_local $0)
;;@ assembly/index.ts:35:20
;;@ assembly/index.ts:40:20
(get_local $1)
)
;;@ assembly/index.ts:35:28
(get_local $8)
;;@ assembly/index.ts:40:28
(get_local $2)
)
;;@ assembly/index.ts:35:34
;;@ assembly/index.ts:40:34
(i32.const 1)
)
;;@ assembly/index.ts:36:6
;;@ assembly/index.ts:37:15
(if (result i32)
(f64.eq
(f64.sub
(tee_local $4
;;@ assembly/index.ts:34:4
(tee_local $7
;;@ assembly/index.ts:34:20
(tee_local $7
;;@ assembly/index.ts:36:4
(tee_local $8
;;@ assembly/index.ts:36:15
(f64.div
;;@ assembly/index.ts:34:27
;;@ assembly/index.ts:36:20
(call $~lib/math/JSMath.log
;;@ assembly/index.ts:34:38
;;@ assembly/index.ts:36:29
(call $~lib/math/JSMath.log
;;@ assembly/index.ts:34:42
(f64.sqrt
;;@ assembly/index.ts:34:47
;;@ assembly/index.ts:36:38
(call $~lib/math/JSMath.sqrt
;;@ assembly/index.ts:36:43
(f64.add
(f64.mul
(get_local $4)
;;@ assembly/index.ts:34:52
;;@ assembly/index.ts:36:48
(get_local $4)
)
;;@ assembly/index.ts:34:57
;;@ assembly/index.ts:36:53
(f64.mul
(get_local $5)
;;@ assembly/index.ts:34:62
;;@ assembly/index.ts:36:58
(get_local $5)
)
)
)
)
)
;;@ assembly/index.ts:34:70
;;@ assembly/index.ts:36:66
(get_global $~lib/math/JSMath.LN2)
)
)
)
(get_local $4)
(get_local $7)
)
(f64.const 0)
)
;;@ assembly/index.ts:37:10
;;@ assembly/index.ts:38:8
(i32.trunc_u/f64
;;@ assembly/index.ts:37:16
;;@ assembly/index.ts:38:14
(f64.mul
(f64.const 2047)
(f64.min
(f64.max
(tee_local $7
;;@ assembly/index.ts:37:41
;;@ assembly/index.ts:38:39
(f64.div
(f64.sub
(f64.convert_u/i32
;;@ assembly/index.ts:37:42
;;@ assembly/index.ts:38:40
(i32.add
(get_local $6)
;;@ assembly/index.ts:37:54
;;@ assembly/index.ts:38:52
(i32.const 1)
)
)
;;@ assembly/index.ts:37:58
(get_local $7)
;;@ assembly/index.ts:38:56
(get_local $8)
)
(f64.convert_u/i32
;;@ assembly/index.ts:37:66
;;@ assembly/index.ts:38:64
(get_local $3)
)
)
@ -377,24 +368,15 @@
)
)
)
;;@ assembly/index.ts:38:10
(i32.div_s
(i32.mul
;;@ assembly/index.ts:38:29
(get_local $6)
;;@ assembly/index.ts:38:11
(i32.const 2047)
)
;;@ assembly/index.ts:38:41
(get_local $3)
)
;;@ assembly/index.ts:39:8
(i32.const 2047)
)
)
;;@ assembly/index.ts:12:34
(set_local $8
(set_local $2
(i32.add
;;@ assembly/index.ts:12:36
(get_local $8)
(get_local $2)
(i32.const 1)
)
)

View File

@ -3,6 +3,7 @@
(type $FF (func (param f64) (result f64)))
(type $Fi (func (param f64) (result i32)))
(type $FFFF (func (param f64 f64 f64) (result f64)))
(import "JSMath" "sqrt" (func $~lib/math/JSMath.sqrt (param f64) (result f64)))
(import "JSMath" "log" (func $~lib/math/JSMath.log (param f64) (result f64)))
(import "JSMath" "LN2" (global $~lib/math/JSMath.LN2 f64))
(import "env" "memory" (memory $0 1))
@ -10,7 +11,7 @@
(global $HEAP_BASE i32 (i32.const 4))
(export "computeLine" (func $assembly/index/computeLine))
(export "memory" (memory $0))
(func $isFinite<f64> (; 1 ;) (type $Fi) (param $0 f64) (result i32)
(func $isFinite<f64> (; 2 ;) (type $Fi) (param $0 f64) (result i32)
;;@ ~lib/builtins.ts:20:26
(return
;;@ ~lib/builtins.ts:20:9
@ -25,24 +26,24 @@
)
)
)
(func $assembly/index/clamp<f64> (; 2 ;) (type $FFFF) (param $0 f64) (param $1 f64) (param $2 f64) (result f64)
;;@ assembly/index.ts:46:43
(func $assembly/index/clamp<f64> (; 3 ;) (type $FFFF) (param $0 f64) (param $1 f64) (param $2 f64) (result f64)
;;@ assembly/index.ts:47:43
(return
;;@ assembly/index.ts:46:9
;;@ assembly/index.ts:47:9
(f64.min
;;@ assembly/index.ts:46:13
;;@ assembly/index.ts:47:13
(f64.max
;;@ assembly/index.ts:46:17
;;@ assembly/index.ts:47:17
(get_local $0)
;;@ assembly/index.ts:46:24
;;@ assembly/index.ts:47:24
(get_local $1)
)
;;@ assembly/index.ts:46:35
;;@ assembly/index.ts:47:35
(get_local $2)
)
)
)
(func $assembly/index/computeLine (; 3 ;) (type $iiiiv) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
(func $assembly/index/computeLine (; 4 ;) (type $iiiiv) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
(local $4 f64)
(local $5 f64)
(local $6 f64)
@ -55,7 +56,7 @@
(local $13 f64)
(local $14 i32)
(local $15 f64)
(local $16 i32)
(local $16 f64)
(local $17 i32)
;;@ assembly/index.ts:8:2
(set_local $4
@ -202,14 +203,14 @@
(block
;;@ assembly/index.ts:19:6
(set_local $15
;;@ assembly/index.ts:19:19
;;@ assembly/index.ts:19:18
(f64.add
(f64.sub
(get_local $12)
;;@ assembly/index.ts:19:26
;;@ assembly/index.ts:19:25
(get_local $13)
)
;;@ assembly/index.ts:19:33
;;@ assembly/index.ts:19:32
(get_local $9)
)
)
@ -263,52 +264,47 @@
;;@ assembly/index.ts:27:4
(block $break|2
;;@ assembly/index.ts:27:9
(set_local $16
;;@ assembly/index.ts:27:17
(i32.const 0)
(set_local $15
;;@ assembly/index.ts:27:29
(f64.min
;;@ assembly/index.ts:27:33
(f64.const 8)
;;@ assembly/index.ts:27:36
(f64.convert_u/i32
(get_local $3)
)
)
)
(loop $continue|2
(if
;;@ assembly/index.ts:27:20
(i32.and
(if (result i32)
(tee_local $17
(i32.lt_s
(get_local $16)
;;@ assembly/index.ts:27:24
(i32.const 5)
)
)
;;@ assembly/index.ts:27:29
(i32.lt_u
(get_local $14)
;;@ assembly/index.ts:27:41
(get_local $3)
)
(get_local $17)
;;@ assembly/index.ts:27:44
(f64.lt
(f64.convert_u/i32
(get_local $14)
)
(i32.const 1)
;;@ assembly/index.ts:27:56
(get_local $15)
)
(block
(block
;;@ assembly/index.ts:28:6
(set_local $15
;;@ assembly/index.ts:28:19
(set_local $16
;;@ assembly/index.ts:28:18
(f64.add
(f64.sub
(f64.mul
(get_local $10)
;;@ assembly/index.ts:28:24
;;@ assembly/index.ts:28:23
(get_local $10)
)
;;@ assembly/index.ts:28:29
;;@ assembly/index.ts:28:28
(f64.mul
(get_local $11)
;;@ assembly/index.ts:28:34
;;@ assembly/index.ts:28:33
(get_local $11)
)
)
;;@ assembly/index.ts:28:39
;;@ assembly/index.ts:28:38
(get_local $9)
)
)
@ -332,25 +328,15 @@
;;@ assembly/index.ts:30:6
(set_local $10
;;@ assembly/index.ts:30:11
(get_local $15)
(get_local $16)
)
)
;;@ assembly/index.ts:27:48
(block
(set_local $16
(i32.add
;;@ assembly/index.ts:27:50
(get_local $16)
(i32.const 1)
)
)
;;@ assembly/index.ts:27:53
(set_local $14
(i32.add
;;@ assembly/index.ts:27:55
(get_local $14)
(i32.const 1)
)
;;@ assembly/index.ts:27:71
(set_local $14
(i32.add
;;@ assembly/index.ts:27:73
(get_local $14)
(i32.const 1)
)
)
(br $continue|2)
@ -358,117 +344,113 @@
)
)
)
;;@ assembly/index.ts:34:4
;;@ assembly/index.ts:36:4
(set_local $15
;;@ assembly/index.ts:34:20
;;@ assembly/index.ts:36:15
(f64.div
;;@ assembly/index.ts:34:27
;;@ assembly/index.ts:36:20
(call $~lib/math/JSMath.log
;;@ assembly/index.ts:34:38
;;@ assembly/index.ts:36:29
(call $~lib/math/JSMath.log
;;@ assembly/index.ts:34:42
(f64.sqrt
;;@ assembly/index.ts:34:47
;;@ assembly/index.ts:36:38
(call $~lib/math/JSMath.sqrt
;;@ assembly/index.ts:36:43
(f64.add
(f64.mul
(get_local $10)
;;@ assembly/index.ts:34:52
;;@ assembly/index.ts:36:48
(get_local $10)
)
;;@ assembly/index.ts:34:57
;;@ assembly/index.ts:36:53
(f64.mul
(get_local $11)
;;@ assembly/index.ts:34:62
;;@ assembly/index.ts:36:58
(get_local $11)
)
)
)
)
)
;;@ assembly/index.ts:34:70
;;@ assembly/index.ts:36:66
(get_global $~lib/math/JSMath.LN2)
)
)
;;@ assembly/index.ts:35:4
(i32.store16
;;@ assembly/index.ts:35:15
(i32.shl
(i32.add
;;@ assembly/index.ts:35:16
(i32.mul
(get_local $0)
;;@ assembly/index.ts:35:20
(get_local $1)
)
;;@ assembly/index.ts:35:28
(get_local $8)
)
;;@ assembly/index.ts:35:34
(i32.const 1)
)
;;@ assembly/index.ts:36:6
;;@ assembly/index.ts:37:4
(set_local $17
;;@ assembly/index.ts:37:15
(if (result i32)
(call $isFinite<f64>
;;@ assembly/index.ts:36:15
;;@ assembly/index.ts:37:24
(get_local $15)
)
;;@ assembly/index.ts:37:10
;;@ assembly/index.ts:38:8
(i32.trunc_u/f64
;;@ assembly/index.ts:37:16
;;@ assembly/index.ts:38:14
(f64.mul
(f64.convert_s/i32
(i32.sub
;;@ assembly/index.ts:37:17
;;@ assembly/index.ts:38:15
(i32.const 2048)
;;@ assembly/index.ts:37:30
;;@ assembly/index.ts:38:28
(i32.const 1)
)
)
;;@ assembly/index.ts:37:35
;;@ assembly/index.ts:38:33
(call $assembly/index/clamp<f64>
;;@ assembly/index.ts:37:41
;;@ assembly/index.ts:38:39
(f64.div
(f64.sub
(f64.convert_u/i32
;;@ assembly/index.ts:37:42
;;@ assembly/index.ts:38:40
(i32.add
(get_local $14)
;;@ assembly/index.ts:37:54
;;@ assembly/index.ts:38:52
(i32.const 1)
)
)
;;@ assembly/index.ts:37:58
;;@ assembly/index.ts:38:56
(get_local $15)
)
(f64.convert_u/i32
;;@ assembly/index.ts:37:66
;;@ assembly/index.ts:38:64
(get_local $3)
)
)
;;@ assembly/index.ts:37:73
;;@ assembly/index.ts:38:71
(f64.const 0)
;;@ assembly/index.ts:37:78
;;@ assembly/index.ts:38:76
(f64.const 1)
)
)
)
;;@ assembly/index.ts:38:10
(i32.div_s
(i32.mul
(i32.sub
;;@ assembly/index.ts:38:11
(i32.const 2048)
;;@ assembly/index.ts:38:24
(i32.const 1)
)
;;@ assembly/index.ts:38:29
(get_local $14)
)
;;@ assembly/index.ts:38:41
(get_local $3)
;;@ assembly/index.ts:39:8
(i32.sub
(i32.const 2048)
;;@ assembly/index.ts:39:21
(i32.const 1)
)
)
)
;;@ assembly/index.ts:40:4
(i32.store16
;;@ assembly/index.ts:40:15
(i32.shl
(i32.add
;;@ assembly/index.ts:40:16
(i32.mul
(get_local $0)
;;@ assembly/index.ts:40:20
(get_local $1)
)
;;@ assembly/index.ts:40:28
(get_local $8)
)
;;@ assembly/index.ts:40:34
(i32.const 1)
)
;;@ assembly/index.ts:40:37
(get_local $17)
)
)
;;@ assembly/index.ts:12:34
(set_local $8

View File

@ -3,8 +3,8 @@
"version": "1.0.0",
"private": true,
"scripts": {
"asbuild:untouched": "asc assembly/index.ts -b build/untouched.wasm -t build/untouched.wat --importMemory --sourceMap --validate --measure",
"asbuild:optimized": "asc assembly/index.ts -b build/optimized.wasm -t build/optimized.wat -O3 --importMemory --sourceMap --validate --noDebug --measure",
"asbuild:untouched": "asc assembly/index.ts -b build/untouched.wasm -t build/untouched.wat --use Math=JSMath --importMemory --sourceMap --validate --measure",
"asbuild:optimized": "asc assembly/index.ts -b build/optimized.wasm -t build/optimized.wat --use Math=JSMath -O3 --importMemory --sourceMap --validate --noDebug --measure",
"asbuild": "npm run asbuild:untouched && npm run asbuild:optimized",
"server": "http-server . -o -c-1"
},