commit c10ec5915e305f989b92038490eaa1ec0dcadd7d
parent bb5fa6a70c46516940a3ede78e889dda03428772
Author: neauoire <aliceffekt@gmail.com>
Date: Sat, 27 Feb 2021 11:39:12 -0800
Ported the shapes example
Diffstat:
8 files changed, 136 insertions(+), 203 deletions(-)
diff --git a/build.sh b/build.sh
@@ -20,5 +20,5 @@ cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werr
# cc uxn.c emulator.c -std=c89 -Os -DNDEBUG -g0 -s -Wall -Wno-unknown-pragmas -L/usr/local/lib -lSDL2 -o bin/emulator
# run
-./bin/assembler examples/gui.picture.usm bin/boot.rom
+./bin/assembler examples/dev.mouse.usm bin/boot.rom
./bin/emulator bin/boot.rom
diff --git a/emulator.c b/emulator.c
@@ -197,10 +197,10 @@ drawdebugger(Uint32 *dst, Uxn *u)
void
redraw(Uint32 *dst, Uxn *u)
{
- int x, y;
+ Uint16 x, y;
for(y = 0; y < VER; ++y)
for(x = 0; x < HOR; ++x) {
- int key = (y * HOR + x) * 16;
+ Uint16 key = (y * HOR + x) * 16;
drawchr(dst, (x + PAD) * 8, (y + PAD) * 8, &screen.bg[key], 0);
drawchr(dst, (x + PAD) * 8, (y + PAD) * 8, &screen.fg[key], 1);
}
diff --git a/examples/blank.usm b/examples/blank.usm
@@ -6,6 +6,11 @@
&Controller { buttons 1 }
&Mouse { x 2 y 2 state 1 chord 1 }
+&Label2d { x 2 y 2 color 1 addr 2 }
+&Picture2d { x 2 y 2 width 2 height 2 color 1 addr 2 }
+&Rect2d { x1 2 y1 2 x2 2 y2 2 }
+&Point2d { x 2 y 2 }
+
|0100 @RESET BRK
|c000 @FRAME BRK
|d000 @ERROR BRK
diff --git a/examples/gui.label.usm b/examples/gui.label.usm
@@ -1,84 +0,0 @@
-( desktop )
-
-:dev/w fff9 ( const write port )
-
-;x1 2 ;y1 2
-
-;x 2 ;y 2 ;color 1
-
-|0100 @RESET
-
- #02 =dev/w
-
- #01 =color
- ,text #0020 #0030 ,draw-label JSR
- #02 =color
- ,text #0022 #0038 ,draw-label JSR
- #03 =color
- ,text #0024 #0040 ,draw-label JSR
- #04 =color
- ,text #0026 #0048 ,draw-label JSR
- #06 =color
- ,text #0028 #0050 ,draw-label JSR
- #07 =color
- ,text #002a #0058 ,draw-label JSR
- #08 =color
- ,text #002c #0060 ,draw-label JSR
- #09 =color
- ,text #002e #0068 ,draw-label JSR
-
-BRK
-
-@text [ Hello World ] <1 .00 ( add characters to memory )
-
-@draw-label ( x1 y1 text )
- =y1 =x1
- @draw-label-loop
- ( draw ) ~x1 ~y1 IOW2 IOW2 DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 IOW2 ~color IOW
- ( incr ) #0001 ADD2
- ( incr ) ~x1 #0008 ADD2 =x1
- DUP2 LDR #00 NEQ ,draw-label-loop ROT JMP? POP2
- POP2
-RTS
-
-@font ( spectrum-zx font )
-[
- 0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
- 0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
- 007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
- 0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
- 0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
- 003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
- 0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
- 0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
- 0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
- 0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
- 0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
- 0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
- 003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
- 0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
- 003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
- 0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
- 003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
- 0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
- 0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
- 0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
- 007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
- 00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
- 0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
- 0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
- 0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
- 0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
- 0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
- 0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
- 0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
- 0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
- 0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
- 0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
-]
-
-|c000 @FRAME
-|d000 @ERROR
-
-|FFF0 [ f3f0 f30b f30a ] ( palette )
-|FFFA .RESET .FRAME .ERROR
-\ No newline at end of file
diff --git a/examples/gui.shapes.usm b/examples/gui.shapes.usm
@@ -1,59 +1,153 @@
( draw routines )
-&Screen { width 2 height 2 pad 4 y 2 x 2 color 1 red 1 green 1 blue 1 }
+&Screen { width 2 height 2 pad 4 x 2 y 2 color 1 }
+&Sprite { pad 8 x 2 y 2 addr 2 color 1 }
+
+&Label2d { x 2 y 2 color 1 addr 2 }
+&Picture2d { x 2 y 2 width 2 height 2 color 1 addr 2 }
+&Rect2d { x1 2 y1 2 x2 2 y2 2 }
+&Point2d { x 2 y 2 }
+
+;label Label2d
+;pict Picture2d
+;rect Rect2d
;color 1 ;x1 2 ;x2 2 ;y1 2 ;y2 2
|0100 @RESET
+
+ #0010 #0020 #0040 #0060 #01 ,fill-rect JSR
+ #0020 #0030 #0050 #0070 #02 ,fill-rect JSR
+ #0030 #0040 #0060 #0080 #03 ,fill-rect JSR
+ #0070 #0020 #00a0 #0060 #01 ,line-rect JSR
+ #0080 #0030 #00b0 #0070 #02 ,line-rect JSR
+ #0090 #0040 #00c0 #0080 #03 ,line-rect JSR
- #01 =color
- #0010 #0020 #0040 #0060 ,fill-rect JSR
- #02 =color
- #0020 #0030 #0050 #0070 ,fill-rect JSR
- #03 =color
- #0030 #0040 #0060 #0080 ,fill-rect JSR
-
- #01 =color
- #0070 #0020 #00a0 #0060 ,line-rect JSR
- #02 =color
- #0080 #0030 #00b0 #0070 ,line-rect JSR
- #03 =color
- #0090 #0040 #00c0 #0080 ,line-rect JSR
+ #0000 #0080 #0020 #0020 #01 ,pict_small ,draw-picture JSR
+ #0010 #0088 #0020 #0020 #02 ,pict_small ,draw-picture JSR
+ #0020 #0090 #0020 #0020 #03 ,pict_small ,draw-picture JSR
+ #0030 #0098 #0020 #0020 #04 ,pict_small ,draw-picture JSR
+
+ #0028 #0068 #01 ,text ,draw-label JSR
+ #0038 #0078 #02 ,text ,draw-label JSR
+ #0048 #0088 #03 ,text ,draw-label JSR
+ #0058 #0098 #04 ,text ,draw-label JSR
BRK
-@line-rect ( x1 y1 x2 y2 )
- =y2 =x2 ( stash x1 y1 ) DUP2 WSR2 =y1 DUP2 WSR2 =x1
+@line-rect ( x1 y1 x2 y2 color )
+
+ ( load ) =color =rect.y2 =rect.x2 DUP2 =dev/screen.y =rect.y1 DUP2 =dev/screen.x =rect.x1
@line-rect-hor
- ( draw ) ~x1 ~y1 =dev/screen.y =dev/screen.x ~color =dev/screen.color
- ( draw ) ~x1 ~y2 =dev/screen.y =dev/screen.x ~color =dev/screen.color
- ( incr ) ~x1 #0001 ADD2 DUP2 =x1
- ~x2 #0001 ADD2 LTH2 ,line-rect-hor ROT JMP? POP2
- ( restore x1 y1 ) RSW2 =x1 RSW2 =y1
+ ( draw ) ~rect.y1 =dev/screen.y ~color =dev/screen.color
+ ( draw ) ~rect.y2 =dev/screen.y ~color =dev/screen.color
+ ( incr ) ~dev/screen.x #0001 ADD2 =dev/screen.x
+ ,line-rect-hor ~dev/screen.x ~rect.x2 LTH2 JMP? POP2
+ ~rect.y1 =dev/screen.y
@line-rect-ver
- ( incr ) ~y1 #0001 ADD2 DUP2 =y1
- ( draw ) ~x1 ~y1 =dev/screen.y =dev/screen.x ~color =dev/screen.color
- ( draw ) ~x2 ~y1 =dev/screen.y =dev/screen.x ~color =dev/screen.color
- ~y2 #0001 SUB2 LTH2 ,line-rect-ver ROT JMP? POP2
+ ( draw ) ~rect.x1 =dev/screen.x ~color =dev/screen.color
+ ( draw ) ~rect.x2 =dev/screen.x ~color =dev/screen.color
+ ( incr ) ~dev/screen.y #0001 ADD2 =dev/screen.y
+ ,line-rect-ver ~dev/screen.y ~rect.y2 LTH2 JMP? POP2
+
RTS
-@fill-rect ( x1 y1 x2 y2 )
- =y2 =x2 ( stash x1 y1 ) =y1 DUP2 WSR2 =x1
+@fill-rect ( x1 y1 x2 y2 color )
+
+ ( load ) =color =rect.y2 =rect.x2 DUP2 =dev/screen.y =rect.y1 DUP2 =dev/screen.x =rect.x1
@fill-rect-ver
- RSW2 DUP2 =x1 WSR2
+ ~rect.x1 =dev/screen.x
@fill-rect-hor
- ( draw ) ~x1 ~y1 =dev/screen.y =dev/screen.x ~color =dev/screen.color
- ( incr ) ~x1 #0001 ADD2 DUP2 =x1
- ~x2 LTH2 ,fill-rect-hor ROT JMP? POP2
- ~y1 #0001 ADD2 DUP2 =y1
- ~y2 LTH2 ,fill-rect-ver ROT JMP? POP2
- RSW2 POP2
+ ( draw ) ~color =dev/screen.color
+ ( incr ) ~dev/screen.x #0001 ADD2 =dev/screen.x
+ ,fill-rect-hor ~dev/screen.x ~rect.x2 LTH2 JMP? POP2
+ ( incr ) ~dev/screen.y #0001 ADD2 =dev/screen.y
+ ,fill-rect-ver ~dev/screen.y ~rect.y2 LTH2 JMP? POP2
+
+RTS
+
+@draw-picture ( x y width height color addr )
+
+ ( load ) DUP2 =dev/sprite.addr =pict.addr =pict.color =pict.height =pict.width DUP2 =dev/sprite.y =pict.y =pict.x
+ @draw-picture-ver
+ ~pict.x =dev/sprite.x
+ @draw-picture-hor
+ ( draw ) ~pict.color =dev/sprite.color
+ ( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x
+ ( incr ) ~dev/sprite.addr #0008 ADD2 =dev/sprite.addr
+ ,draw-picture-hor ~dev/sprite.x ~pict.width ~pict.x ADD2 LTH2 JMP? POP2
+ ( incr ) ~dev/sprite.y #0008 ADD2 =dev/sprite.y
+ ,draw-picture-ver ~dev/sprite.y ~pict.height ~pict.y ADD2 LTH2 JMP? POP2
+
+RTS
+
+@draw-label ( x y color addr )
+
+ ( load ) =label.addr =label.color =dev/sprite.y =dev/sprite.x ~label.addr
+ @draw-label-loop
+ ( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =dev/sprite.addr ~label.color =dev/sprite.color
+ ( incr ) #0001 ADD2
+ ( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x
+ DUP2 LDR #00 NEQ ,draw-label-loop ROT JMP? POP2
+ POP2
+
RTS
+@pict_small [
+
+ ff80 8080 8080 8088 ffff fffc f8f9 f1f4
+ ffff 0010 c721 2120 ffff 3f0f 0717 c343
+ 8888 8080 8080 8080 f0f1 f2f5 f2f1 f0f4
+ 1208 804c 9212 4c00 7303 0343 1b1b fbfb
+ 8080 8f83 8383 8393 f0f3 f1f0 e4c0 80ff
+ 00c7 c7c6 4606 00ff c3d3 c307 870f 3fff
+ 8f83 8383 8383 83ff fff7 fdff c0e2 f1ff
+ 7fef bfff 07af 5fff ffff ffff ffff ffff
+]
+
+@font ( spectrum-zx font )
+[
+ 0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
+ 0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
+ 007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
+ 0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
+ 0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
+ 003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
+ 0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
+ 0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
+ 0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
+ 0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
+ 0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
+ 0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
+ 003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
+ 0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
+ 003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
+ 0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
+ 003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
+ 0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
+ 0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
+ 0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
+ 007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
+ 00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
+ 0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
+ 0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
+ 0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
+ 0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
+ 0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
+ 0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
+ 0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
+ 0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
+ 0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
+ 0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
+]
+
+@text [ Label Text ] <1 .00 ( add characters to memory )
+
|c000 @FRAME BRK
|d000 @ERROR BRK
|FF10 ;dev/screen Screen
+|FF20 ;dev/sprite Sprite
|FFF0 [ 0f0f 0fff 0ff0 ] ( palette )
|FFFA .RESET .FRAME .ERROR ( vectors )
\ No newline at end of file
diff --git a/examples/gui.hover.usm b/examples/old.hover.usm
diff --git a/examples/old.line.usm b/examples/old.line.usm
@@ -1,81 +0,0 @@
-( draw routines )
-
-:dev/r fff8 ( std read port )
-:dev/w fff9 ( std write port )
-
-;x_ 2 ;y_ 2 ;color 1
-;x0 2 ;y0 2 ;x1 2 ;y1 2 ;dx 2 ;dy 2 ;err1 2 ;err2 2
-
-|0100 @RESET
-
- ( set dev/write to screen )
- #01 =dev/w ( set dev/write to sprite )
-
- ( positive )
- #01 ,color STR
- +0030 ,x0 STR2 +0040 ,y0 STR2
- +0100 ,x1 STR2 +0060 ,y1 STR2
- ,line JSR
-
- #02 ,color STR
- +0020 ,x0 STR2 +0010 ,y0 STR2
- +0090 ,x1 STR2 +0070 ,y1 STR2
- ,line JSR
-
- #03 ,color STR
- +0010 ,x0 STR2 +0040 ,y0 STR2
- +0070 ,x1 STR2 +0060 ,y1 STR2
- ,line JSR
-
- ( draw control points )
- #02 ,color STR
- ,x0 LDR2 ,y0 LDR2 ,putpixel JSR
- ,x1 LDR2 ,y1 LDR2 ,putpixel JSR
-
- ,redraw JSR
-
-BRK
-
-@line
- ,x0 LDR2 ,x_ STR2 ,y0 LDR2 ,y_ STR2 ( start at x0,y0 )
- ,x1 LDR2 ,x0 LDR2 ,diff16sub JSR ,dx STR2 ( int dx = abs[x1 - x0] )
- ,y1 LDR2 ,y0 LDR2 ,diff16sub JSR -0001 MULS2 ,dy STR2 ( int dy = -abs[y1 - y0] )
- ,dx LDR2 ,dy LDR2 ADDS2 ,err1 STR2 ( int err1 = dx + dy, e2; )
- @lineloop
- ,x_ LDR2 ,y_ LDR2 ,putpixel JSR ( draw )
- @line-x
- ,err1 LDR2 +0002 MULS2 ,err2 STR2 ( e2 = 2 * err; )
- ,err2 LDR2 ,dy LDR2 LTHS2 ,line-y ROT JMP? POP2 ( e2 >= dy )
- ,err1 LDR2 ,dy LDR2 ADDS2 ,err1 STR2 ( err1 += dy; )
- ,x_ LDR2 +0001 ADDS2 ,x_ STR2 ( y0 += y0 < y1 ? 1 : -1; )
- @line-y
- ,err2 LDR2 ,dx LDR2 GTHS2 ,line-end ROT JMP? POP2 ( e2 <= dx )
- ,err1 LDR2 ,dx LDR2 ADDS2 ,err1 STR2 ( err1 += dx; )
- ,y_ LDR2 +0001 ADDS2 ,y_ STR2 ( y0 += y0 < y1 ? 1 : -1; )
- @line-end
- ,x_ LDR2 ,x1 LDR2 NEQS2 ,lineloop ROT JMP? POP2 ( loop )
- RTS
-
-@redraw
- #0000 IOW2
- #0000 IOW2
- #00 IOW
- #01 IOW
- RTS
-
-@putpixel
- IOW2 ( y short )
- IOW2 ( x short )
- ,color LDR IOW ( color byte )
- #00 IOW ( redraw byte )
- RTS
-
-@diff16
- OVR2 OVR2 GTH2 ,diff16sub ROT JMP? POP2
- SWP2 @diff16sub SUB2
-RTS
-
-|c000 @FRAME BRK
-|d000 @ERROR BRK
-|FFF0 [ f2ac 35bb 2b53 ] ( palette )
-|FFFA .RESET .FRAME .ERROR
diff --git a/examples/gui.paint.usm b/examples/old.paint.usm
