Optimized noodle
This commit is contained in:
parent
72f045cc63
commit
13fe5135c5
2
build.sh
2
build.sh
|
@ -28,7 +28,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Assembling.."
|
echo "Assembling.."
|
||||||
./bin/assembler projects/software/nasu.usm bin/boot.rom
|
./bin/assembler projects/software/noodle.usm bin/boot.rom
|
||||||
|
|
||||||
echo "Running.."
|
echo "Running.."
|
||||||
if [ "${2}" = '--cli' ];
|
if [ "${2}" = '--cli' ];
|
||||||
|
|
|
@ -111,7 +111,7 @@ BRK
|
||||||
,draw-cursor JSR2
|
,draw-cursor JSR2
|
||||||
|
|
||||||
( release drag )
|
( release drag )
|
||||||
~Mouse.state #00 EQU ~brush.drag #01 EQU #0101 NEQ2 ,$no-release JNZ2
|
~Mouse.state #00 EQU ~brush.drag #01 EQU #0101 NEQ2 ^$no-release JNZ
|
||||||
~origin.x1 #0002 SUB2 ~origin.y1 #0002 SUB2 ~origin.x2 #0002 ADD2 ~origin.y2 #0002 ADD2 #00 ,fill-rect JSR2
|
~origin.x1 #0002 SUB2 ~origin.y1 #0002 SUB2 ~origin.x2 #0002 ADD2 ~origin.y2 #0002 ADD2 #00 ,fill-rect JSR2
|
||||||
~canvas.x1 -- ~canvas.y1 -- ~canvas.x2 ~canvas.y2 #10 ,line-rect JSR2
|
~canvas.x1 -- ~canvas.y1 -- ~canvas.x2 ~canvas.y2 #10 ,line-rect JSR2
|
||||||
,draw-background JSR2
|
,draw-background JSR2
|
||||||
|
@ -126,18 +126,18 @@ BRK
|
||||||
~Mouse.state ~brush.last EQU ,$no-touch-change JNZ2
|
~Mouse.state ~brush.last EQU ,$no-touch-change JNZ2
|
||||||
~Mouse.x CLN2r ~canvas.x1 GTS2 STH2r ~canvas.x2 LTS2 #0101 NEQ2 ,$no-touch-change JNZ2
|
~Mouse.x CLN2r ~canvas.x1 GTS2 STH2r ~canvas.x2 LTS2 #0101 NEQ2 ,$no-touch-change JNZ2
|
||||||
~Mouse.y CLN2r ~canvas.y1 GTS2 STH2r ~canvas.y2 LTS2 #0101 NEQ2 ,$no-touch-change JNZ2
|
~Mouse.y CLN2r ~canvas.y1 GTS2 STH2r ~canvas.y2 LTS2 #0101 NEQ2 ,$no-touch-change JNZ2
|
||||||
~Mouse.state #00 EQU ,$no-touch-ondown JNZ2
|
~Mouse.state #00 EQU ^$no-touch-ondown JNZ
|
||||||
( on down )
|
( on down )
|
||||||
~Mouse.x =cursor.dx
|
~Mouse.x =cursor.dx
|
||||||
~Mouse.y =cursor.dy
|
~Mouse.y =cursor.dy
|
||||||
$no-touch-ondown
|
$no-touch-ondown
|
||||||
~Mouse.state #00 NEQ ,$no-touch-onup JNZ2
|
~Mouse.state #00 NEQ ^$no-touch-onup JNZ
|
||||||
( on up )
|
( on up )
|
||||||
~brush.tool #02 NEQ ,$no-touch-line JNZ2
|
~brush.tool #02 NEQ ^$no-touch-line JNZ
|
||||||
~cursor.dx ~canvas.x1 SUB2 ~cursor.dy ~canvas.y1 SUB2 ~Mouse.x ~canvas.x1 SUB2 ~Mouse.y ~canvas.y1 SUB2 ,paint-line JSR2
|
~cursor.dx ~canvas.x1 SUB2 ~cursor.dy ~canvas.y1 SUB2 ~Mouse.x ~canvas.x1 SUB2 ~Mouse.y ~canvas.y1 SUB2 ,paint-line JSR2
|
||||||
,$touch-end JMP2
|
,$touch-end JMP2
|
||||||
$no-touch-line
|
$no-touch-line
|
||||||
~brush.tool #03 NEQ ,$no-touch-rect JNZ2
|
~brush.tool #03 NEQ ^$no-touch-rect JNZ
|
||||||
~cursor.dx ~canvas.x1 SUB2 ~cursor.dy ~canvas.y1 SUB2 ~Mouse.x ~canvas.x1 SUB2 ~Mouse.y ~canvas.y1 SUB2 ,paint-rect JSR2
|
~cursor.dx ~canvas.x1 SUB2 ~cursor.dy ~canvas.y1 SUB2 ~Mouse.x ~canvas.x1 SUB2 ~Mouse.y ~canvas.y1 SUB2 ,paint-rect JSR2
|
||||||
,$touch-end JMP2
|
,$touch-end JMP2
|
||||||
$no-touch-rect
|
$no-touch-rect
|
||||||
|
@ -148,7 +148,7 @@ BRK
|
||||||
|
|
||||||
( drag )
|
( drag )
|
||||||
~Controller #02 NEQ ,$no-drag JNZ2
|
~Controller #02 NEQ ,$no-drag JNZ2
|
||||||
~brush.drag #00 NEQ ,$no-drag-start JNZ2
|
~brush.drag #00 NEQ ^$no-drag-start JNZ
|
||||||
~canvas.x1 =origin.x1
|
~canvas.x1 =origin.x1
|
||||||
~canvas.y1 =origin.y1
|
~canvas.y1 =origin.y1
|
||||||
~canvas.x2 =origin.x2
|
~canvas.x2 =origin.x2
|
||||||
|
@ -165,8 +165,8 @@ BRK
|
||||||
$no-drag
|
$no-drag
|
||||||
|
|
||||||
( in sizepane )
|
( in sizepane )
|
||||||
~Mouse.x CLN2r ~sizepane.x1 GTH2 STH2r ~sizepane.x2 LTH2 #0101 NEQ2 ,$no-touch-sizepane JNZ2
|
~Mouse.x CLN2r ~sizepane.x1 GTH2 STH2r ~sizepane.x2 LTH2 #0101 NEQ2 ^$no-touch-sizepane JNZ
|
||||||
~Mouse.y CLN2r ~sizepane.y1 GTH2 STH2r ~sizepane.y2 LTH2 #0101 NEQ2 ,$no-touch-sizepane JNZ2
|
~Mouse.y CLN2r ~sizepane.y1 GTH2 STH2r ~sizepane.y2 LTH2 #0101 NEQ2 ^$no-touch-sizepane JNZ
|
||||||
( release ) #00 =Mouse.state
|
( release ) #00 =Mouse.state
|
||||||
#01 =brush.tool
|
#01 =brush.tool
|
||||||
~Mouse.x ~sizepane.x1 SUB2 8/ SWP POP =brush.size
|
~Mouse.x ~sizepane.x1 SUB2 8/ SWP POP =brush.size
|
||||||
|
@ -176,8 +176,8 @@ BRK
|
||||||
$no-touch-sizepane
|
$no-touch-sizepane
|
||||||
|
|
||||||
( in pattpane )
|
( in pattpane )
|
||||||
~Mouse.x CLN2r ~pattpane.x1 GTH2 STH2r ~pattpane.x2 LTH2 #0101 NEQ2 ,$no-touch-pattpane JNZ2
|
~Mouse.x CLN2r ~pattpane.x1 GTH2 STH2r ~pattpane.x2 LTH2 #0101 NEQ2 ^$no-touch-pattpane JNZ
|
||||||
~Mouse.y CLN2r ~pattpane.y1 GTH2 STH2r ~pattpane.y2 LTH2 #0101 NEQ2 ,$no-touch-pattpane JNZ2
|
~Mouse.y CLN2r ~pattpane.y1 GTH2 STH2r ~pattpane.y2 LTH2 #0101 NEQ2 ^$no-touch-pattpane JNZ
|
||||||
( release ) #00 =Mouse.state
|
( release ) #00 =Mouse.state
|
||||||
~Mouse.x ~pattpane.x1 SUB2 8/ SWP POP =brush.patt
|
~Mouse.x ~pattpane.x1 SUB2 8/ SWP POP =brush.patt
|
||||||
( draw ) ,draw-pattpane JSR2
|
( draw ) ,draw-pattpane JSR2
|
||||||
|
@ -185,8 +185,8 @@ BRK
|
||||||
$no-touch-pattpane
|
$no-touch-pattpane
|
||||||
|
|
||||||
( in toolpane )
|
( in toolpane )
|
||||||
~Mouse.x CLN2r ~toolpane.x1 GTH2 STH2r ~toolpane.x2 LTH2 #0101 NEQ2 ,$no-touch-toolpane JNZ2
|
~Mouse.x CLN2r ~toolpane.x1 GTH2 STH2r ~toolpane.x2 LTH2 #0101 NEQ2 ^$no-touch-toolpane JNZ
|
||||||
~Mouse.y CLN2r ~toolpane.y1 GTH2 STH2r ~toolpane.y2 LTH2 #0101 NEQ2 ,$no-touch-toolpane JNZ2
|
~Mouse.y CLN2r ~toolpane.y1 GTH2 STH2r ~toolpane.y2 LTH2 #0101 NEQ2 ^$no-touch-toolpane JNZ
|
||||||
( release ) #00 =Mouse.state
|
( release ) #00 =Mouse.state
|
||||||
~Mouse.x ~toolpane.x1 SUB2 8/ SWP POP =brush.tool
|
~Mouse.x ~toolpane.x1 SUB2 8/ SWP POP =brush.tool
|
||||||
( draw ) ,draw-toolpane JSR2
|
( draw ) ,draw-toolpane JSR2
|
||||||
|
@ -200,17 +200,17 @@ BRK
|
||||||
( set cursor operation )
|
( set cursor operation )
|
||||||
,add-pixel ~Mouse.state #01 EQU ,$no-oper JNZ2 POP2 ,remove-pixel $no-oper =brush.oper
|
,add-pixel ~Mouse.state #01 EQU ,$no-oper JNZ2 POP2 ,remove-pixel $no-oper =brush.oper
|
||||||
|
|
||||||
~brush.tool #00 NEQ ,$no-touch-pen JNZ2
|
~brush.tool #00 NEQ ^$no-touch-pen JNZ
|
||||||
~cursor.x0 ~canvas.x1 SUB2 ~cursor.y0 ~canvas.y1 SUB2 ~Mouse.x ~canvas.x1 SUB2 ~Mouse.y ~canvas.y1 SUB2 ,paint-line JSR2
|
~cursor.x0 ~canvas.x1 SUB2 ~cursor.y0 ~canvas.y1 SUB2 ~Mouse.x ~canvas.x1 SUB2 ~Mouse.y ~canvas.y1 SUB2 ,paint-line JSR2
|
||||||
,$touch-end JMP2
|
,$touch-end JMP2
|
||||||
$no-touch-pen
|
$no-touch-pen
|
||||||
|
|
||||||
~brush.tool #01 NEQ ,$no-touch-brush JNZ2
|
~brush.tool #01 NEQ ^$no-touch-brush JNZ
|
||||||
~Mouse.x ~canvas.x1 SUB2 ~Mouse.y ~canvas.y1 SUB2 ,paint-brush JSR2
|
~Mouse.x ~canvas.x1 SUB2 ~Mouse.y ~canvas.y1 SUB2 ,paint-brush JSR2
|
||||||
,$touch-end JMP2
|
,$touch-end JMP2
|
||||||
$no-touch-brush
|
$no-touch-brush
|
||||||
|
|
||||||
~brush.tool #04 NEQ ,$no-touch-zoom JNZ2
|
~brush.tool #04 NEQ ^$no-touch-zoom JNZ
|
||||||
~zoom.active #00 EQU =zoom.active
|
~zoom.active #00 EQU =zoom.active
|
||||||
( release ) #00 =Mouse.state
|
( release ) #00 =Mouse.state
|
||||||
~Mouse.x ~canvas.x1 SUB2 ~canvas.w 2/ SUB2 =zoom.x
|
~Mouse.x ~canvas.x1 SUB2 ~canvas.w 2/ SUB2 =zoom.x
|
||||||
|
@ -222,14 +222,14 @@ BRK
|
||||||
$no-touch-canvas
|
$no-touch-canvas
|
||||||
|
|
||||||
( background interface )
|
( background interface )
|
||||||
~Mouse.y STEP8 ~Screen.height #0010 SUB2 NEQ2 ,$no-touch-background JNZ2
|
~Mouse.y STEP8 ~Screen.height #0010 SUB2 NEQ2 ^$no-touch-background JNZ
|
||||||
~Mouse.x ~Screen.width #0020 SUB2 SUB2 8/
|
~Mouse.x ~Screen.width #0020 SUB2 SUB2 8/
|
||||||
DUP2 #0001 NEQ2 ,$no-load-button JNZ2
|
DUP2 #0001 NEQ2 ^$no-load-button JNZ
|
||||||
,filepath ,load-file JSR2
|
,filepath ,load-file JSR2
|
||||||
,draw-canvas JSR2
|
,draw-canvas JSR2
|
||||||
( release ) #00 =Mouse.state
|
( release ) #00 =Mouse.state
|
||||||
$no-load-button
|
$no-load-button
|
||||||
DUP2 #0002 NEQ2 ,$no-save-button JNZ2
|
DUP2 #0002 NEQ2 ^$no-save-button JNZ
|
||||||
,filepath ,save-file JSR2
|
,filepath ,save-file JSR2
|
||||||
( release ) #00 =Mouse.state
|
( release ) #00 =Mouse.state
|
||||||
$no-save-button
|
$no-save-button
|
||||||
|
@ -242,34 +242,34 @@ BRK
|
||||||
$no-touch
|
$no-touch
|
||||||
|
|
||||||
~Controller.buttons #f0 AND
|
~Controller.buttons #f0 AND
|
||||||
DUP #04 SFT #01 AND #01 NEQ ,$no-up JNZ2
|
DUP #04 SFT #01 AND #01 NEQ ^$no-up JNZ
|
||||||
( move ) ~zoom.y -- =zoom.y $no-up
|
( move ) ~zoom.y -- =zoom.y $no-up
|
||||||
DUP #05 SFT #01 AND #01 NEQ ,$no-down JNZ2
|
DUP #05 SFT #01 AND #01 NEQ ^$no-down JNZ
|
||||||
( move ) ~zoom.y ++ =zoom.y $no-down
|
( move ) ~zoom.y ++ =zoom.y $no-down
|
||||||
DUP #06 SFT #01 AND #01 NEQ ,$no-left JNZ2
|
DUP #06 SFT #01 AND #01 NEQ ^$no-left JNZ
|
||||||
( move ) ~zoom.x -- =zoom.x $no-left
|
( move ) ~zoom.x -- =zoom.x $no-left
|
||||||
DUP #07 SFT #01 AND #01 NEQ ,$no-right JNZ2
|
DUP #07 SFT #01 AND #01 NEQ ^$no-right JNZ
|
||||||
( move ) ~zoom.x ++ =zoom.x $no-right
|
( move ) ~zoom.x ++ =zoom.x $no-right
|
||||||
#00 EQU #04 JNZ ,draw-canvas JSR2
|
#00 EQU #04 JNZ ,draw-canvas JSR2
|
||||||
|
|
||||||
~Keys #00 EQU ,$no-keys JNZ2
|
~Keys #00 EQU ,$no-keys JNZ2
|
||||||
~Keys
|
~Keys
|
||||||
DUP #20 NEQ ,$no-space JNZ2
|
DUP #20 NEQ ^$no-space JNZ
|
||||||
( toggle zoom ) ~zoom.active #00 EQU =zoom.active ,redraw JSR2 $no-space
|
( toggle zoom ) ~zoom.active #00 EQU =zoom.active ,redraw JSR2 $no-space
|
||||||
DUP #08 NEQ ,$no-backspace JNZ2
|
DUP #08 NEQ ^$no-backspace JNZ
|
||||||
( erase ) ,clear JSR2 $no-backspace
|
( erase ) ,clear JSR2 $no-backspace
|
||||||
DUP #71 NEQ ,$no-qkey JNZ2
|
DUP #71 NEQ ^$no-qkey JNZ
|
||||||
( tool0 ) #00 =brush.tool ,draw-toolpane JSR2 $no-qkey
|
( tool0 ) #00 =brush.tool ,draw-toolpane JSR2 $no-qkey
|
||||||
DUP #77 NEQ ,$no-wkey JNZ2
|
DUP #77 NEQ ^$no-wkey JNZ
|
||||||
( tool0 ) #01 =brush.tool ,draw-toolpane JSR2 $no-wkey
|
( tool0 ) #01 =brush.tool ,draw-toolpane JSR2 $no-wkey
|
||||||
DUP #65 NEQ ,$no-ekey JNZ2
|
DUP #65 NEQ ^$no-ekey JNZ
|
||||||
( tool0 ) #02 =brush.tool ,draw-toolpane JSR2 $no-ekey
|
( tool0 ) #02 =brush.tool ,draw-toolpane JSR2 $no-ekey
|
||||||
DUP #72 NEQ ,$no-rkey JNZ2
|
DUP #72 NEQ ^$no-rkey JNZ
|
||||||
( tool0 ) #03 =brush.tool ,draw-toolpane JSR2 $no-rkey
|
( tool0 ) #03 =brush.tool ,draw-toolpane JSR2 $no-rkey
|
||||||
DUP #74 NEQ ,$no-tkey JNZ2
|
DUP #74 NEQ ^$no-tkey JNZ
|
||||||
( tool0 ) #04 =brush.tool ,draw-toolpane JSR2 $no-tkey
|
( tool0 ) #04 =brush.tool ,draw-toolpane JSR2 $no-tkey
|
||||||
DUP
|
DUP
|
||||||
DUP #30 GTH SWP #39 LTH #0101 NEQ2 ,$no-numkey JNZ2
|
DUP #30 GTH SWP #39 LTH #0101 NEQ2 ^$no-numkey JNZ
|
||||||
( size ) ~Keys #31 SUB =brush.size ,draw-sizepane JSR2 $no-numkey
|
( size ) ~Keys #31 SUB =brush.size ,draw-sizepane JSR2 $no-numkey
|
||||||
POP
|
POP
|
||||||
( release ) #00 =Keys
|
( release ) #00 =Keys
|
||||||
|
@ -285,7 +285,7 @@ BRK
|
||||||
|
|
||||||
( from ) ,data
|
( from ) ,data
|
||||||
( to ) ~canvas.w ~canvas.h MUL2 #0008 MUL2 ,data ADD2
|
( to ) ~canvas.w ~canvas.h MUL2 #0008 MUL2 ,data ADD2
|
||||||
$loop NOP
|
$loop
|
||||||
OVR2 #00 ROT ROT POK2
|
OVR2 #00 ROT ROT POK2
|
||||||
( incr ) SWP2 #0001 ADD2 SWP2
|
( incr ) SWP2 #0001 ADD2 SWP2
|
||||||
OVR2 OVR2 LTH2 ^$loop JNZ
|
OVR2 OVR2 LTH2 ^$loop JNZ
|
||||||
|
@ -320,7 +320,7 @@ RTN
|
||||||
( load ) =line.y1 =line.x1 =line.y2 =line.x2
|
( load ) =line.y1 =line.x1 =line.y2 =line.x2
|
||||||
|
|
||||||
( trim if zoomed )
|
( trim if zoomed )
|
||||||
~zoom.active #01 NEQ ,$no-zoom JNZ2
|
~zoom.active #01 NEQ ^$no-zoom JNZ
|
||||||
~line.x1 8/ ~zoom.x ADD2 =line.x1
|
~line.x1 8/ ~zoom.x ADD2 =line.x1
|
||||||
~line.y1 8/ ~zoom.y ADD2 =line.y1
|
~line.y1 8/ ~zoom.y ADD2 =line.y1
|
||||||
~line.x2 8/ ~zoom.x ADD2 =line.x2
|
~line.x2 8/ ~zoom.x ADD2 =line.x2
|
||||||
|
@ -334,18 +334,17 @@ RTN
|
||||||
~line.dx ~line.dy ADD2 =line.e1
|
~line.dx ~line.dy ADD2 =line.e1
|
||||||
$loop
|
$loop
|
||||||
( paint ) ~line.x2 ~line.y2 ~brush.oper JSR2
|
( paint ) ~line.x2 ~line.y2 ~brush.oper JSR2
|
||||||
~line.x2 ~line.x1 EQU2 ~line.y2 ~line.y1 EQU2 #0101 EQU2 ,$end JNZ2
|
~line.x2 ~line.x1 EQU2 ~line.y2 ~line.y1 EQU2 #0101 EQU2 ^$end JNZ
|
||||||
~line.e1 #0002 MUL2 =line.e2
|
~line.e1 #0002 MUL2 =line.e2
|
||||||
~line.e2 ~line.dy LTS2 ,$skipy JNZ2
|
~line.e2 ~line.dy LTS2 ^$skipy JNZ
|
||||||
~line.e1 ~line.dy ADD2 =line.e1
|
~line.e1 ~line.dy ADD2 =line.e1
|
||||||
~line.x2 ~line.sx ADD2 =line.x2
|
~line.x2 ~line.sx ADD2 =line.x2
|
||||||
$skipy
|
$skipy
|
||||||
~line.e2 ~line.dx GTS2 ,$skipx JNZ2
|
~line.e2 ~line.dx GTS2 ^$skipx JNZ
|
||||||
~line.e1 ~line.dx ADD2 =line.e1
|
~line.e1 ~line.dx ADD2 =line.e1
|
||||||
~line.y2 ~line.sy ADD2 =line.y2
|
~line.y2 ~line.sy ADD2 =line.y2
|
||||||
$skipx
|
$skipx
|
||||||
,$loop JMP2
|
,$loop JMP2
|
||||||
|
|
||||||
$end
|
$end
|
||||||
|
|
||||||
,draw-canvas JSR2
|
,draw-canvas JSR2
|
||||||
|
@ -360,7 +359,7 @@ RTN
|
||||||
( load ) =rect.y2 =rect.x2 =rect.y1 =rect.x1
|
( load ) =rect.y2 =rect.x2 =rect.y1 =rect.x1
|
||||||
|
|
||||||
( trim if zoomed )
|
( trim if zoomed )
|
||||||
~zoom.active #01 NEQ ,$no-zoom JNZ2
|
~zoom.active #01 NEQ ^$no-zoom JNZ
|
||||||
~rect.x1 8/ ~zoom.x ADD2 =rect.x1
|
~rect.x1 8/ ~zoom.x ADD2 =rect.x1
|
||||||
~rect.y1 8/ ~zoom.y ADD2 =rect.y1
|
~rect.y1 8/ ~zoom.y ADD2 =rect.y1
|
||||||
~rect.x2 8/ ~zoom.x ADD2 #0001 ADD2 =rect.x2
|
~rect.x2 8/ ~zoom.x ADD2 #0001 ADD2 =rect.x2
|
||||||
|
@ -374,13 +373,12 @@ RTN
|
||||||
~rect.x1 =pt2.x
|
~rect.x1 =pt2.x
|
||||||
$hor
|
$hor
|
||||||
~pt2.x SWP POP =px.x ~pt2.y SWP POP =px.y
|
~pt2.x SWP POP =px.x ~pt2.y SWP POP =px.y
|
||||||
,patternize JSR2 #00 EQU ,$no-pixel JNZ2
|
,patternize JSR2 #00 EQU ^$no-pixel JNZ
|
||||||
( draw ) ~pt2.x ~pt2.y ~brush.oper JSR2
|
( draw ) ~pt2.x ~pt2.y ~brush.oper JSR2 $no-pixel
|
||||||
$no-pixel
|
|
||||||
( incr ) ~pt2.x ++ =pt2.x
|
( incr ) ~pt2.x ++ =pt2.x
|
||||||
~pt2.x ~rect.x2 LTS2 ,$hor JNZ2
|
~pt2.x ~rect.x2 LTS2 ^$hor JNZ
|
||||||
~pt2.y ++ =pt2.y
|
~pt2.y ++ =pt2.y
|
||||||
~pt2.y ~rect.y2 LTS2 ,$ver JNZ2
|
~pt2.y ~rect.y2 LTS2 ^$ver JNZ
|
||||||
|
|
||||||
,draw-canvas JSR2
|
,draw-canvas JSR2
|
||||||
,draw-toolpane JSR2
|
,draw-toolpane JSR2
|
||||||
|
@ -394,7 +392,7 @@ RTN
|
||||||
#0003 SUB2 =pt0.y #0003 SUB2 =pt0.x ( cursor offset )
|
#0003 SUB2 =pt0.y #0003 SUB2 =pt0.x ( cursor offset )
|
||||||
|
|
||||||
( trim if zoomed )
|
( trim if zoomed )
|
||||||
~zoom.active #01 NEQ ,$no-zoom JNZ2
|
~zoom.active #01 NEQ ^$no-zoom JNZ
|
||||||
~pt0.x 8/ ~zoom.x ADD2 #0003 SUB2 =pt0.x
|
~pt0.x 8/ ~zoom.x ADD2 #0003 SUB2 =pt0.x
|
||||||
~pt0.y 8/ ~zoom.y ADD2 #0003 SUB2 =pt0.y
|
~pt0.y 8/ ~zoom.y ADD2 #0003 SUB2 =pt0.y
|
||||||
$no-zoom
|
$no-zoom
|
||||||
|
@ -405,14 +403,13 @@ RTN
|
||||||
$hor
|
$hor
|
||||||
( addr ) ,size_icn #00 ~brush.size 8* ADD2
|
( addr ) ,size_icn #00 ~brush.size 8* ADD2
|
||||||
( byte ) #00 ~px.y ADD2 PEK2 #07 ~px.x SUB SFT #01 AND
|
( byte ) #00 ~px.y ADD2 PEK2 #07 ~px.x SUB SFT #01 AND
|
||||||
#00 EQU ,$no-pixel JNZ2
|
#00 EQU ^$no-pixel JNZ
|
||||||
,patternize JSR2 #00 EQU ,$no-pixel JNZ2
|
,patternize JSR2 #00 EQU ^$no-pixel JNZ
|
||||||
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 ~brush.oper JSR2
|
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 ~brush.oper JSR2 $no-pixel
|
||||||
$no-pixel
|
|
||||||
( incr ) ~px.x #01 ADD =px.x
|
( incr ) ~px.x #01 ADD =px.x
|
||||||
~px.x #08 LTH ,$hor JNZ2
|
~px.x #08 LTH ^$hor JNZ
|
||||||
( incr ) ~px.y #01 ADD =px.y
|
( incr ) ~px.y #01 ADD =px.y
|
||||||
~px.y #08 LTH ,$ver JNZ2
|
~px.y #08 LTH ^$ver JNZ
|
||||||
|
|
||||||
,draw-canvas JSR2
|
,draw-canvas JSR2
|
||||||
,draw-toolpane JSR2
|
,draw-toolpane JSR2
|
||||||
|
@ -423,44 +420,44 @@ RTN
|
||||||
|
|
||||||
@patternize
|
@patternize
|
||||||
|
|
||||||
~brush.patt #00 NEQ ,$noplain JNZ2
|
~brush.patt #00 NEQ ^$noplain JNZ
|
||||||
#01 RTN
|
#01 RTN
|
||||||
$noplain
|
$noplain
|
||||||
|
|
||||||
~brush.patt #01 NEQ ,$notone1 JNZ2
|
~brush.patt #01 NEQ ^$notone1 JNZ
|
||||||
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 ADD2 #0001 AND2 #0000 EQU2
|
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 ADD2 #0001 AND2 #0000 EQU2
|
||||||
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 SUB2 #0001 AND2 #0000 EQU2
|
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 SUB2 #0001 AND2 #0000 EQU2
|
||||||
#0101 EQU2
|
#0101 EQU2
|
||||||
RTN
|
RTN
|
||||||
$notone1
|
$notone1
|
||||||
|
|
||||||
~brush.patt #02 NEQ ,$notone2 JNZ2
|
~brush.patt #02 NEQ ^$notone2 JNZ
|
||||||
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 ADD2 #0003 AND2 #0000 EQU2
|
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 ADD2 #0003 AND2 #0000 EQU2
|
||||||
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 SUB2 #0003 AND2 #0000 EQU2
|
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 SUB2 #0003 AND2 #0000 EQU2
|
||||||
#0101 EQU2
|
#0101 EQU2
|
||||||
RTN
|
RTN
|
||||||
$notone2
|
$notone2
|
||||||
|
|
||||||
~brush.patt #03 NEQ ,$notone3 JNZ2
|
~brush.patt #03 NEQ ^$notone3 JNZ
|
||||||
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 ADD2 #0005 AND2 #0000 EQU2
|
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 ADD2 #0005 AND2 #0000 EQU2
|
||||||
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 SUB2 #0005 AND2 #0000 EQU2
|
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 SUB2 #0005 AND2 #0000 EQU2
|
||||||
#0101 EQU2
|
#0101 EQU2
|
||||||
RTN
|
RTN
|
||||||
$notone3
|
$notone3
|
||||||
|
|
||||||
~brush.patt #04 NEQ ,$notone4 JNZ2
|
~brush.patt #04 NEQ ^$notone4 JNZ
|
||||||
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 ADD2 #0003 AND2 #0000 EQU2 RTN
|
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 ADD2 #0003 AND2 #0000 EQU2 RTN
|
||||||
$notone4
|
$notone4
|
||||||
|
|
||||||
~brush.patt #05 NEQ ,$notone5 JNZ2
|
~brush.patt #05 NEQ ^$notone5 JNZ
|
||||||
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 SUB2 #0003 AND2 #0000 EQU2 RTN
|
~pt0.x #00 ~px.x ADD2 ~pt0.y #00 ~px.y ADD2 SUB2 #0003 AND2 #0000 EQU2 RTN
|
||||||
$notone5
|
$notone5
|
||||||
|
|
||||||
~brush.patt #06 NEQ ,$notone6 JNZ2
|
~brush.patt #06 NEQ ^$notone6 JNZ
|
||||||
~pt0.x #00 ~px.x ADD2 #0001 AND2 SWP POP RTN
|
~pt0.x #00 ~px.x ADD2 #0001 AND2 SWP POP RTN
|
||||||
$notone6
|
$notone6
|
||||||
|
|
||||||
~brush.patt #07 NEQ ,$notone7 JNZ2
|
~brush.patt #07 NEQ ^$notone7 JNZ
|
||||||
~pt0.y #00 ~px.y ADD2 #0001 AND2 SWP POP RTN
|
~pt0.y #00 ~px.y ADD2 #0001 AND2 SWP POP RTN
|
||||||
$notone7
|
$notone7
|
||||||
|
|
||||||
|
@ -522,9 +519,9 @@ RTN
|
||||||
( draw ) #09 =Sprite.color
|
( draw ) #09 =Sprite.color
|
||||||
( incr ) ~Sprite.x 8+ =Sprite.x
|
( incr ) ~Sprite.x 8+ =Sprite.x
|
||||||
( incr ) ~Sprite.addr 8+ =Sprite.addr
|
( incr ) ~Sprite.addr 8+ =Sprite.addr
|
||||||
~Sprite.x ~canvas.x2 NEQ2 ,$hor JNZ2
|
~Sprite.x ~canvas.x2 NEQ2 ^$hor JNZ
|
||||||
( incr ) ~Sprite.y 8+ =Sprite.y
|
( incr ) ~Sprite.y 8+ =Sprite.y
|
||||||
~Sprite.y ~canvas.y2 NEQ2 ,$ver JNZ2
|
~Sprite.y ~canvas.y2 NEQ2 ^$ver JNZ
|
||||||
|
|
||||||
RTN
|
RTN
|
||||||
|
|
||||||
|
@ -541,10 +538,10 @@ RTN
|
||||||
( draw ) #09 =Sprite.color
|
( draw ) #09 =Sprite.color
|
||||||
( incr ) ~Sprite.x 8+ =Sprite.x
|
( incr ) ~Sprite.x 8+ =Sprite.x
|
||||||
( incr ) ~pt1.x ++ =pt1.x
|
( incr ) ~pt1.x ++ =pt1.x
|
||||||
~Sprite.x ~canvas.x2 NEQ2 ,$hor JNZ2
|
~Sprite.x ~canvas.x2 NEQ2 ^$hor JNZ
|
||||||
( incr ) ~Sprite.y 8+ =Sprite.y
|
( incr ) ~Sprite.y 8+ =Sprite.y
|
||||||
( incr ) ~pt1.y ++ =pt1.y
|
( incr ) ~pt1.y ++ =pt1.y
|
||||||
~Sprite.y ~canvas.y2 NEQ2 ,$ver JNZ2
|
~Sprite.y ~canvas.y2 NEQ2 ^$ver JNZ
|
||||||
|
|
||||||
RTN
|
RTN
|
||||||
|
|
||||||
|
@ -582,12 +579,12 @@ RTN
|
||||||
~Mouse.x CLN2r ~sizepane.x1 GTH2 STH2r ~sizepane.x2 LTH2 #0101 EQU2 ~Mouse.y CLN2r ~sizepane.y1 GTH2 STH2r ~sizepane.y2 LTH2 #0101 EQU2 #0101 EQU2 ,$outside-canvas JNZ2
|
~Mouse.x CLN2r ~sizepane.x1 GTH2 STH2r ~sizepane.x2 LTH2 #0101 EQU2 ~Mouse.y CLN2r ~sizepane.y1 GTH2 STH2r ~sizepane.y2 LTH2 #0101 EQU2 #0101 EQU2 ,$outside-canvas JNZ2
|
||||||
~Mouse.x CLN2r ~pattpane.x1 GTH2 STH2r ~pattpane.x2 LTH2 #0101 EQU2 ~Mouse.y CLN2r ~pattpane.y1 GTH2 STH2r ~pattpane.y2 LTH2 #0101 EQU2 #0101 EQU2 ,$outside-canvas JNZ2
|
~Mouse.x CLN2r ~pattpane.x1 GTH2 STH2r ~pattpane.x2 LTH2 #0101 EQU2 ~Mouse.y CLN2r ~pattpane.y1 GTH2 STH2r ~pattpane.y2 LTH2 #0101 EQU2 #0101 EQU2 ,$outside-canvas JNZ2
|
||||||
( do not draw size when holding alt )
|
( do not draw size when holding alt )
|
||||||
~Controller #02 EQU ,$outside-canvas JNZ2
|
~Controller #02 EQU ^$outside-canvas JNZ
|
||||||
~cursor.x #0003 SUB2 =Sprite.x
|
~cursor.x #0003 SUB2 =Sprite.x
|
||||||
~cursor.y #0003 SUB2 =Sprite.y
|
~cursor.y #0003 SUB2 =Sprite.y
|
||||||
,brush_view #00 ~brush.size 8* ADD2 =Sprite.addr
|
,brush_view #00 ~brush.size 8* ADD2 =Sprite.addr
|
||||||
#11 ~Mouse.state #02 MUL ADD =Sprite.color
|
#11 ~Mouse.state #02 MUL ADD =Sprite.color
|
||||||
~Mouse.state #00 EQU ,$outside-canvas JNZ2
|
~Mouse.state #00 EQU ^$outside-canvas JNZ
|
||||||
RTN
|
RTN
|
||||||
$outside-canvas
|
$outside-canvas
|
||||||
|
|
||||||
|
@ -611,9 +608,9 @@ RTN
|
||||||
( draw ) #01 ~Sprite.x ~pattpane.x1 SUB2 8/ SWP POP ~brush.tool EQU #02 MUL ADD =Sprite.color
|
( draw ) #01 ~Sprite.x ~pattpane.x1 SUB2 8/ SWP POP ~brush.tool EQU #02 MUL ADD =Sprite.color
|
||||||
( incr ) ~Sprite.x 8+ =Sprite.x
|
( incr ) ~Sprite.x 8+ =Sprite.x
|
||||||
( incr ) ~Sprite.addr 8+ =Sprite.addr
|
( incr ) ~Sprite.addr 8+ =Sprite.addr
|
||||||
~Sprite.x ~toolpane.x2 LTH2 ,$tools JNZ2
|
~Sprite.x ~toolpane.x2 LTH2 ^$tools JNZ
|
||||||
|
|
||||||
~zoom.active #01 NEQ ,$no-zoom JNZ2
|
~zoom.active #01 NEQ ^$no-zoom JNZ
|
||||||
~Sprite.x #0008 SUB2 =Sprite.x
|
~Sprite.x #0008 SUB2 =Sprite.x
|
||||||
,tool_icn #0028 ADD2 =Sprite.addr
|
,tool_icn #0028 ADD2 =Sprite.addr
|
||||||
#01 #04 ~brush.tool EQU #02 MUL ADD =Sprite.color
|
#01 #04 ~brush.tool EQU #02 MUL ADD =Sprite.color
|
||||||
|
@ -634,7 +631,7 @@ RTN
|
||||||
( draw ) #01 ~Sprite.x ~pattpane.x1 SUB2 8/ SWP POP ~brush.patt EQU #02 MUL ADD =Sprite.color
|
( draw ) #01 ~Sprite.x ~pattpane.x1 SUB2 8/ SWP POP ~brush.patt EQU #02 MUL ADD =Sprite.color
|
||||||
( incr ) ~Sprite.x 8+ =Sprite.x
|
( incr ) ~Sprite.x 8+ =Sprite.x
|
||||||
( incr ) ~Sprite.addr 8+ =Sprite.addr
|
( incr ) ~Sprite.addr 8+ =Sprite.addr
|
||||||
~Sprite.x ~pattpane.x2 LTH2 ,$patterns JNZ2
|
~Sprite.x ~pattpane.x2 LTH2 ^$patterns JNZ
|
||||||
|
|
||||||
RTN
|
RTN
|
||||||
|
|
||||||
|
@ -651,7 +648,7 @@ RTN
|
||||||
( draw ) #01 ~Sprite.x ~sizepane.x1 SUB2 8/ SWP POP ~brush.size EQU #02 MUL ADD =Sprite.color
|
( draw ) #01 ~Sprite.x ~sizepane.x1 SUB2 8/ SWP POP ~brush.size EQU #02 MUL ADD =Sprite.color
|
||||||
( incr ) ~Sprite.x 8+ =Sprite.x
|
( incr ) ~Sprite.x 8+ =Sprite.x
|
||||||
( incr ) ~Sprite.addr 8+ =Sprite.addr
|
( incr ) ~Sprite.addr 8+ =Sprite.addr
|
||||||
~Sprite.x ~sizepane.x2 LTH2 ,$patterns JNZ2
|
~Sprite.x ~sizepane.x2 LTH2 ^$patterns JNZ
|
||||||
|
|
||||||
RTN
|
RTN
|
||||||
|
|
||||||
|
@ -711,13 +708,13 @@ RTN
|
||||||
( incr ) ~Screen.x ++ =Screen.x
|
( incr ) ~Screen.x ++ =Screen.x
|
||||||
( draw ) ~rect.y1 =Screen.y ~color =Screen.color
|
( draw ) ~rect.y1 =Screen.y ~color =Screen.color
|
||||||
( draw ) ~rect.y2 =Screen.y ~color =Screen.color
|
( draw ) ~rect.y2 =Screen.y ~color =Screen.color
|
||||||
~Screen.x ~rect.x2 NEQ2 ,$hor JNZ2
|
~Screen.x ~rect.x2 NEQ2 ^$hor JNZ
|
||||||
~rect.y1 =Screen.y
|
~rect.y1 =Screen.y
|
||||||
$ver
|
$ver
|
||||||
( draw ) ~rect.x1 =Screen.x ~color =Screen.color
|
( draw ) ~rect.x1 =Screen.x ~color =Screen.color
|
||||||
( draw ) ~rect.x2 =Screen.x ~color =Screen.color
|
( draw ) ~rect.x2 =Screen.x ~color =Screen.color
|
||||||
( incr ) ~Screen.y ++ =Screen.y
|
( incr ) ~Screen.y ++ =Screen.y
|
||||||
~Screen.y ~rect.y2 ++ NEQ2 ,$ver JNZ2
|
~Screen.y ~rect.y2 ++ NEQ2 ^$ver JNZ
|
||||||
|
|
||||||
RTN
|
RTN
|
||||||
|
|
||||||
|
@ -729,9 +726,9 @@ RTN
|
||||||
$hor
|
$hor
|
||||||
( draw ) ~color =Screen.color
|
( draw ) ~color =Screen.color
|
||||||
( incr ) ~Screen.x ++ =Screen.x
|
( incr ) ~Screen.x ++ =Screen.x
|
||||||
~Screen.x ~rect.x2 NEQ2 ,$hor JNZ2
|
~Screen.x ~rect.x2 NEQ2 ^$hor JNZ
|
||||||
( incr ) ~Screen.y ++ =Screen.y
|
( incr ) ~Screen.y ++ =Screen.y
|
||||||
~Screen.y ~rect.y2 NEQ2 ,$ver JNZ2
|
~Screen.y ~rect.y2 NEQ2 ^$ver JNZ
|
||||||
|
|
||||||
RTN
|
RTN
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue