Fixed interface bug in Noodle
This commit is contained in:
neauoire
parent
f740ec3feb
commit
06e0835c94
2
build.sh
2
build.sh
|
|
@ -28,7 +28,7 @@ else
|
|||
fi
|
||||
|
||||
echo "Assembling.."
|
||||
./bin/assembler projects/software/nasu.usm bin/boot.rom
|
||||
./bin/assembler projects/software/noodle.usm bin/boot.rom
|
||||
|
||||
echo "Running.."
|
||||
if [ "${2}" = '--cli' ];
|
||||
|
|
|
|||
|
|
@ -12,9 +12,8 @@
|
|||
- Resize buttons
|
||||
- Limit size
|
||||
- Pixel cleanup brush
|
||||
- Drag canvas content
|
||||
BUGS
|
||||
- Zoom drawing with other tools
|
||||
- Display filename
|
||||
- Rename filename
|
||||
)
|
||||
|
||||
%RTN { JMP2r }
|
||||
|
|
@ -90,8 +89,8 @@
|
|||
|
||||
( setup panes )
|
||||
#0010 =toolpane.x1 #0010 =toolpane.y1
|
||||
#0010 =pattpane.x1 ~Screen.height #0018 SUB2 =pattpane.y1
|
||||
~Screen.width #0050 SUB2 =sizepane.x1 #0010 =sizepane.y1
|
||||
~Screen.width #0050 SUB2 =pattpane.x1 #0010 =pattpane.y1
|
||||
#0040 =sizepane.x1 #0010 =sizepane.y1
|
||||
|
||||
~toolpane.x1 #0028 ADD2 =toolpane.x2
|
||||
~toolpane.y1 #0008 ADD2 =toolpane.y2
|
||||
|
|
@ -606,7 +605,7 @@ RTN
|
|||
,tool_icn =Sprite.addr
|
||||
|
||||
$tools
|
||||
( draw ) #01 ~Sprite.x ~pattpane.x1 SUB2 8/ SWP POP ~brush.tool EQU #02 MUL ADD =Sprite.color
|
||||
( draw ) #01 ~Sprite.x ~toolpane.x1 SUB2 8/ SWP POP ~brush.tool EQU #02 MUL ADD =Sprite.color
|
||||
( incr ) ~Sprite.x 8+ =Sprite.x
|
||||
( incr ) ~Sprite.addr 8+ =Sprite.addr
|
||||
~Sprite.x ~toolpane.x2 LTH2 ^$tools JNZ
|
||||
|
|
@ -698,6 +697,10 @@ RTN
|
|||
,font_hex ~canvas.h #0f AND #08 MUL ADD2 =Sprite.addr
|
||||
( draw ) #02 =Sprite.color
|
||||
|
||||
( draw filename )
|
||||
#0008 =Sprite.x
|
||||
,filepath #01 ,draw-label JSR2
|
||||
|
||||
RTN
|
||||
|
||||
( Generics )
|
||||
|
|
@ -733,6 +736,19 @@ RTN
|
|||
|
||||
RTN
|
||||
|
||||
@draw-label ( addr )
|
||||
|
||||
=color
|
||||
$loop
|
||||
DUP2 PEK2 #00 SWP #0008 MUL2 ,font ADD2 =Sprite.addr
|
||||
( draw ) ~color =Sprite.color
|
||||
( incr ) #0001 ADD2
|
||||
( incr ) ~Sprite.x 8+ =Sprite.x
|
||||
( loop ) DUP2 PEK2 #00 NEQ ^$loop JNZ
|
||||
POP2
|
||||
|
||||
RTN
|
||||
|
||||
@size_icn
|
||||
[ 0000 0010 0000 0000 ]
|
||||
[ 0000 1038 1000 0000 ]
|
||||
|
|
@ -798,6 +814,42 @@ RTN
|
|||
007c 8280 f080 827c 007c 8280 f080 8080
|
||||
]
|
||||
|
||||
@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
|
||||
]
|
||||
|
||||
@ERROR BRK
|
||||
|
||||
@data [ ]
|
||||
|
|
|
|||
Loading…
Reference in New Issue