d6
/
uxn-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed variables in line drawing

This commit is contained in:
Devine Lu Linvega 2024-06-04 17:08:28 -08:00
parent 2084fe4025
commit 32fa540223
1 changed files with 11 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
gui/notepad/src/notepad.tal
View File

@ -122,17 +122,13 @@
( | handle states ) ( | handle states )
[ LIT &last $1 ] .Mouse/state DEI DUP #02 LTH ?{ POP #02 } [ LIT &last $1 ] .Mouse/state DEI DUP #02 LTH ?{ POP #02 }
DUP ,&last STR DUP ,&last STR
( ) SWPk #00 NEQ #0001 NEQ2 ?{ file-save } ( ) SWPk #00 NEQ #0001 NEQ2 ?{ file-save }
DUP2 #0001 NEQ2 ?{ DUP2 #0001 NEQ2 ?{
( | down mouse1 ) ( | down mouse1 )
.Mouse/x DEI2 DUP2 ,&x1 STR2 .Mouse/x DEI2 DUP2 ,&x1 STR2
.Mouse/y DEI2 #0012 SUB2 DUP2 ,&y1 STR2 .Mouse/y DEI2 #0012 SUB2 DUP2 ,&y1 STR2
#01 <set-pixel> #01 <set-pixel>
<draw-sketch> } <draw-sketch> }
DUP #01 NEQ ?{ DUP #01 NEQ ?{
( release/drag mouse1 ) ( release/drag mouse1 )
( from* ) [ LIT2 &x1 $2 ] [ LIT2 &y1 $2 ] ( from* ) [ LIT2 &x1 $2 ] [ LIT2 &y1 $2 ]
@ -140,7 +136,6 @@
.Mouse/y DEI2 #0012 SUB2 DUP2 ,&y1 STR2 .Mouse/y DEI2 #0012 SUB2 DUP2 ,&y1 STR2
( paint ) #01 <paint-line> ( paint ) #01 <paint-line>
<draw-sketch> } <draw-sketch> }
DUP #02 NEQ ?{ DUP #02 NEQ ?{
( | release/drag mouse2 ) ( | release/drag mouse2 )
.Mouse/x DEI2 .Mouse/y DEI2 #0012 SUB2 <eraser> .Mouse/x DEI2 .Mouse/y DEI2 #0012 SUB2 <eraser>
@ -249,71 +244,27 @@
POP2 POP2 POP2r INC2 GTH2k ?&>v POP2 POP2 POP2r INC2 GTH2k ?&>v
POP2 POP2 JMP2r POP2 POP2 JMP2r
@<paint-line2> ( ax* ay* bx* by* color -- )
( pixel ) POP
ROT2 ( by ay )
( dy = -abs[by - ay] ) SUB2k abs2 #0000 SWP2 SUB2 ,&dy STR2
SWP2 ( ay by )
( sy = ay < by ? 1 : -1 ) LTS2k STH #0001 #ffff STHr [ JMP SWP2 POP2 ] ,&sy STR2
POP2 ( ay ) STH2 ( | ay )
( ax bx )
( sx = ax < bx ? 1 : -1 ) LTS2k STH #0001 #ffff STHr [ JMP SWP2 POP2 ] ,&sx STR2
SWP2 ( bx ax )
SUB2k abs2 ,&dx STR2
POP2 ( ax ) STH2 ( | ax )
SWP2r
( err = dx + dy )
,&dx LDR2 ,&dy LDR2 ADD2
( POP2 POP2r POP2r JMP2r )
( rst: ax bx )
( wst: err )
&>loop ( -- )
( draw ) OVR2r STH2r STH2kr [ LIT &color 01 ] <set-pixel>
( rst: e* e2* ) DUP2 #10 SFT2
( e2 >= dy ) [ LIT2 &dy $2 ] LTS2k ?{
( e += dy ) ADD2 #0000
( ax += sx ) SWP2r [ LIT2r &sx $2 ] ADD2r SWP2
} POP2
( e2 <= dx ) [ LIT2 &dx $2 ] GTS2k ?{
( e += dx ) ADD2 #0000
( ay += sy ) [ LIT2r &sy $2 ] ADD2r
} POP2
( remove e2 ) POP2
DUP2 [ LIT2 &by $2 ] NEQ2 ?&>loop
OVR2 [ LIT2 &bx $2 ] NEQ2 ?&>loop
( end )
JMP2r
@<paint-line> ( x1* y1* x2* y2* color -- ) @<paint-line> ( x1* y1* x2* y2* color -- )
,&color STR ,&color STR
,&y STR2
,&x STR2
,&y2 STR2 ,&y2 STR2
,&x2 STR2 ,&x2 STR2
,&x LDR2 ,&x2 LDR2 SUB2 abs2 ,&dx STR2 ,&y1 STR2
#0000 ,&y LDR2 ,&y2 LDR2 SUB2 abs2 SUB2 ,&dy STR2 ,&x1 STR2
#ffff [ LIT2 00 _&x2 ] LDR2 ,&x LDR2 lts2 DUP2 ADD2 ADD2 ,&sx STR2 ,&x2 LDR2 ,&x1 LDR2 SUB2 abs2 ,&dx STR2
#ffff [ LIT2 00 _&y2 ] LDR2 ,&y LDR2 lts2 DUP2 ADD2 ADD2 ,&sy STR2 #0000 ,&y2 LDR2 ,&y1 LDR2 SUB2 abs2 SUB2 ,&dy STR2
#ffff [ LIT2 00 _&x1 ] LDR2 ,&x2 LDR2 lts2 DUP2 ADD2 ADD2 ,&sx STR2
#ffff [ LIT2 00 _&y1 ] LDR2 ,&y2 LDR2 lts2 DUP2 ADD2 ADD2 ,&sy STR2
[ LIT2 &dx $2 ] [ LIT2 &dy $2 ] ADD2 STH2 [ LIT2 &dx $2 ] [ LIT2 &dy $2 ] ADD2 STH2
&>while ( -- ) &>while ( -- )
( draw ) ,&x2 LDR2 ,&y2 LDR2 [ LIT &color $1 ] <set-pixel> ( draw ) ,&x1 LDR2 ,&y1 LDR2 [ LIT &color $1 ] <set-pixel>
( x ) [ LIT2 &x2 $2 ] [ LIT2 &x $2 ] EQU2 ( x ) [ LIT2 &x1 $2 ] [ LIT2 &x2 $2 ] EQU2
( y ) [ LIT2 &y2 $2 ] [ LIT2 &y $2 ] EQU2 AND ?&end ( y ) [ LIT2 &y1 $2 ] [ LIT2 &y2 $2 ] EQU2 AND ?&end
STH2kr DUP2 ADD2 DUP2 ,&dy LDR2 lts2 ?{ STH2kr DUP2 ADD2 DUP2 ,&dy LDR2 lts2 ?{
STH2r ,&dy LDR2 ADD2 STH2 STH2r ,&dy LDR2 ADD2 STH2
,&x2 LDR2 [ LIT2 &sx $2 ] ADD2 ,&x2 STR2 } ,&x1 LDR2 [ LIT2 &sx $2 ] ADD2 ,&x1 STR2 }
,&dx LDR2 gts2 ?&>while ,&dx LDR2 gts2 ?&>while
STH2r ,&dx LDR2 ADD2 STH2 STH2r ,&dx LDR2 ADD2 STH2
,&y2 LDR2 [ LIT2 &sy $2 ] ADD2 ,&y2 STR2 ,&y1 LDR2 [ LIT2 &sy $2 ] ADD2 ,&y1 STR2
!&>while !&>while
&end POP2r JMP2r &end POP2r JMP2r