diff --git a/examples/curlywas/sprites.cwa b/examples/curlywas/sprites.cwa new file mode 100644 index 0000000..4515026 --- /dev/null +++ b/examples/curlywas/sprites.cwa @@ -0,0 +1,21 @@ +include "../include/microw8-api.cwa" + +const SPRITE = 0x20000; + +export fn upd() { + cls(0); + let t = time(); + let i: i32; + loop spriteLoop { + let inline x = sin(t * -1.3 + i as f32 / 8_f) * 180_f + 160_f; + let inline y = sin(t * 1.7 + i as f32 / 9_f) * 140_f + 120_f; + blitSprite(SPRITE, 16, x as i32, y as i32, 0x100); + branch_if (i +:= 1) < 200: spriteLoop; + } +} + +start fn start() { + printChar('OO'); + circle(8_f, 8_f, 6_f, 75); + grabSprite(SPRITE, 16, 0, 0, 0); +} diff --git a/examples/include/microw8-api.cwa b/examples/include/microw8-api.cwa index c537642..60c9478 100644 --- a/examples/include/microw8-api.cwa +++ b/examples/include/microw8-api.cwa @@ -35,6 +35,8 @@ import "env.circle_outline" fn circle_outline(f32, f32, f32, i32); import "env.exp" fn exp(f32) -> f32; import "env.playNote" fn playNote(i32, i32); import "env.sndGes" fn sndGes(i32) -> f32; +import "env.blitSprite" fn blitSprite(i32, i32, i32, i32, i32); +import "env.grabSprite" fn grabSprite(i32, i32, i32, i32, i32); const TIME_MS = 0x40; const GAMEPAD = 0x44; diff --git a/examples/include/microw8-api.wat b/examples/include/microw8-api.wat index 04bd403..e006e59 100644 --- a/examples/include/microw8-api.wat +++ b/examples/include/microw8-api.wat @@ -35,6 +35,8 @@ (import "env" "exp" (func $exp (param f32) (result f32))) (import "env" "playNote" (func $playNote (param i32) (param i32))) (import "env" "sndGes" (func $sndGes (param i32) (result f32))) +(import "env" "blitSprite" (func $blitSprite (param i32) (param i32) (param i32) (param i32) (param i32))) +(import "env" "grabSprite" (func $grabSprite (param i32) (param i32) (param i32) (param i32) (param i32))) ;; to use defines, include this file with a preprocessor ;; like gpp (https://logological.org/gpp). diff --git a/platform/bin/loader.wasm b/platform/bin/loader.wasm index 83425e2..0055ae6 100644 Binary files a/platform/bin/loader.wasm and b/platform/bin/loader.wasm differ diff --git a/platform/bin/platform.uw8 b/platform/bin/platform.uw8 index 2425d51..d19e1a9 100644 Binary files a/platform/bin/platform.uw8 and b/platform/bin/platform.uw8 differ diff --git a/platform/src/platform.cwa b/platform/src/platform.cwa index c6e37fd..db1e2f9 100644 --- a/platform/src/platform.cwa +++ b/platform/src/platform.cwa @@ -352,6 +352,60 @@ export fn line(x1: f32, y1: f32, x2: f32, y2: f32, col: i32) { setPixel(i32.trunc_sat_f32_s(x1 + f * dx), i32.trunc_sat_f32_s(y1 + f * dy), col); } +export fn blitSprite(sprite: i32, size: i32, x: i32, y: i32, control: i32) { + let width = size & 65535; + let height = select(size >> 16, size >> 16, width); + let trans = (control & 511) - 256; + let flip_x = 1 - ((control >> 8) & 2); + let flip_y = 1 - ((control >> 9) & 2); + if flip_x < 0 { + sprite += width - 1; + } + if flip_y < 0 { + sprite += (height - 1) * width; + } + + let ly = 0; + loop yloop { + let lx = 0; + loop xloop { + let col = (sprite + lx * flip_x + ly * flip_y * height)?0; + if col != trans { + setPixel(x + lx, y + ly, col); + } + branch_if (lx +:= 1) < width: xloop; + } + branch_if (ly +:= 1) < height: yloop; + } +} + +export fn grabSprite(sprite: i32, size: i32, x: i32, y: i32, control: i32) { + let width = size & 65535; + let height = select(size >> 16, size >> 16, width); + let trans = (control & 511) - 256; + let flip_x = 1 - ((control >> 8) & 2); + let flip_y = 1 - ((control >> 9) & 2); + if flip_x < 0 { + sprite += width - 1; + } + if flip_y < 0 { + sprite += (height - 1) * width; + } + + let ly = 0; + loop yloop { + let lx = 0; + loop xloop { + let col = getPixel(x + lx, y + ly); + if col != trans { + (sprite + lx * flip_x + ly * flip_y * height)?0 = col; + } + branch_if (lx +:= 1) < width: xloop; + } + branch_if (ly +:= 1) < height: yloop; + } +} + ////////// // TEXT // ////////// diff --git a/uw8-tool/src/base_module.rs b/uw8-tool/src/base_module.rs index 9b86735..afcf077 100644 --- a/uw8-tool/src/base_module.rs +++ b/uw8-tool/src/base_module.rs @@ -169,6 +169,21 @@ impl BaseModule { add_function(&mut functions, &type_map, "playNote", &[I32, I32], None); add_function(&mut functions, &type_map, "sndGes", &[I32], Some(F32)); + add_function( + &mut functions, + &type_map, + "blitSprite", + &[I32, I32, I32, I32, I32], + None, + ); + add_function( + &mut functions, + &type_map, + "grabSprite", + &[I32, I32, I32, I32, I32], + None, + ); + for i in functions.len()..64 { add_function( &mut functions,