Browse code
Mini cleanup
neauoire authored on 25/04/2021 21:03:17
Showing 1 changed files
| ... | ... |
@@ -10,13 +10,10 @@ |
| 10 | 10 |
( devices ) |
| 11 | 11 |
|
| 12 | 12 |
|00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |
| 13 |
-|10 @Console [ &pad $8 &char $1 &byte $1 &short $2 &string $2 ] |
|
| 14 | 13 |
|20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] |
| 15 | 14 |
|30 @Audio [ &pad $8 &adsr $2 &length $2 &addr $2 &volume $1 &pitch $1 ] |
| 16 | 15 |
|40 @Controller [ &vector $2 &button $1 &key $1 ] |
| 17 | 16 |
|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] |
| 18 |
-|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] |
|
| 19 |
-|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] |
|
| 20 | 17 |
|
| 21 | 18 |
( variables ) |
| 22 | 19 |
|
| ... | ... |
@@ -25,17 +22,14 @@ |
| 25 | 22 |
@last $1 |
| 26 | 23 |
@octave $1 |
| 27 | 24 |
@addr $1 |
| 28 |
- |
|
| 29 |
-@pointer [ &x $2 &y $2 ] |
|
| 30 | 25 |
@color $1 |
| 31 |
- |
|
| 32 |
-@adsr-view [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ] |
|
| 33 |
-@wave-view [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ] |
|
| 26 |
+@pointer [ &x $2 &y $2 ] |
|
| 27 |
+@knob [ &x $2 &y $2 &value $1 ] |
|
| 28 |
+@center [ &x $2 &y $2 ] |
|
| 29 |
+@adsr-view [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ] |
|
| 30 |
+@wave-view [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ] |
|
| 34 | 31 |
@octave-view [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ] |
| 35 | 32 |
|
| 36 |
-@center [ &x $2 &y $2 ] |
|
| 37 |
-@knob [ &x $2 &y $2 &value $1 ] |
|
| 38 |
- |
|
| 39 | 33 |
( program ) |
| 40 | 34 |
|
| 41 | 35 |
|0100 ( -> ) |
| ... | ... |
@@ -55,13 +49,13 @@ |
| 55 | 49 |
|
| 56 | 50 |
( place octave ) |
| 57 | 51 |
.center/x PEK2 #0050 SUB2 .octave-view/x1 POK2 |
| 58 |
- .center/y PEK2 #0008 ADD2 .octave-view/y1 POK2 |
|
| 52 |
+ .center/y PEK2 8+ .octave-view/y1 POK2 |
|
| 59 | 53 |
.octave-view/x1 PEK2 #0048 ADD2 .octave-view/x2 POK2 |
| 60 | 54 |
.octave-view/y1 PEK2 #0018 ADD2 .octave-view/y2 POK2 |
| 61 | 55 |
|
| 62 | 56 |
( place adsr ) |
| 63 | 57 |
.center/x PEK2 .adsr-view/x1 POK2 |
| 64 |
- .center/y PEK2 #0008 ADD2 .adsr-view/y1 POK2 |
|
| 58 |
+ .center/y PEK2 8+ .adsr-view/y1 POK2 |
|
| 65 | 59 |
.adsr-view/x1 PEK2 #0058 ADD2 .adsr-view/x2 POK2 |
| 66 | 60 |
.adsr-view/y1 PEK2 #0018 ADD2 .adsr-view/y2 POK2 |
| 67 | 61 |
|
| ... | ... |
@@ -88,19 +82,15 @@ BRK |
| 88 | 82 |
@on-mouse ( -> ) |
| 89 | 83 |
|
| 90 | 84 |
;draw-cursor JSR2 |
| 91 |
- |
|
| 92 | 85 |
.Mouse/state DEI #00 NEQ ,&no-touch JNZ BRK &no-touch |
| 93 |
- |
|
| 94 | 86 |
( wave-view ) |
| 95 | 87 |
.Mouse/x DEI2 DUP2 .wave-view/x1 PEK2 GTH2 ROT ROT .wave-view/x2 PEK2 LTH2 #0101 EQU2 |
| 96 | 88 |
.Mouse/y DEI2 DUP2 .wave-view/y1 PEK2 GTH2 ROT ROT .wave-view/y2 PEK2 LTH2 #0101 EQU2 |
| 97 | 89 |
#0101 EQU2 ;on-touch-wave-view JNZ2 |
| 98 |
- |
|
| 99 | 90 |
( adsr-view ) |
| 100 | 91 |
.Mouse/x DEI2 DUP2 .adsr-view/x1 PEK2 GTH2 ROT ROT .adsr-view/x2 PEK2 LTH2 #0101 EQU2 |
| 101 | 92 |
.Mouse/y DEI2 DUP2 .adsr-view/y1 PEK2 GTH2 ROT ROT .adsr-view/y2 PEK2 LTH2 #0101 EQU2 |
| 102 | 93 |
#0101 EQU2 ;on-touch-adsr-view JNZ2 |
| 103 |
- |
|
| 104 | 94 |
( octave-view ) |
| 105 | 95 |
.Mouse/x DEI2 DUP2 .octave-view/x1 PEK2 GTH2 ROT ROT .octave-view/x2 PEK2 LTH2 #0101 EQU2 |
| 106 | 96 |
.Mouse/y DEI2 DUP2 .octave-view/y1 PEK2 GTH2 ROT ROT .octave-view/y2 PEK2 LTH2 #0101 EQU2 |
| ... | ... |
@@ -118,8 +108,8 @@ BRK |
| 118 | 108 |
|
| 119 | 109 |
@on-touch-octave-view ( -> ) |
| 120 | 110 |
|
| 121 |
- .Mouse/x DEI2 .octave-view/x1 PEK2 SUB2 #0008 DIV2 SWP POP #08 NEQ ,&no-mod JNZ |
|
| 122 |
- .Mouse/y DEI2 .octave-view/y1 PEK2 SUB2 #0008 DIV2 SWP POP |
|
| 111 |
+ .Mouse/x DEI2 .octave-view/x1 PEK2 SUB2 8/ SWP POP #08 NEQ ,&no-mod JNZ |
|
| 112 |
+ .Mouse/y DEI2 .octave-view/y1 PEK2 SUB2 8/ SWP POP |
|
| 123 | 113 |
DUP #00 NEQ ,&no-incr JNZ |
| 124 | 114 |
.octave PEK #01 ADD .octave POK &no-incr |
| 125 | 115 |
DUP #02 NEQ ,&no-decr JNZ |
| ... | ... |
@@ -130,7 +120,7 @@ BRK |
| 130 | 120 |
BRK |
| 131 | 121 |
&no-mod |
| 132 | 122 |
|
| 133 |
- .Mouse/x DEI2 .octave-view/x1 PEK2 SUB2 #0008 DIV2 DUP2 SWP POP .last POK ;notes ADD2 GET ;play JSR2 |
|
| 123 |
+ .Mouse/x DEI2 .octave-view/x1 PEK2 SUB2 8/ DUP2 SWP POP .last POK ;notes ADD2 GET ;play JSR2 |
|
| 134 | 124 |
|
| 135 | 125 |
( release ) #00 .Mouse/state DEO |
| 136 | 126 |
;draw-octave JSR2 |
| ... | ... |
@@ -176,7 +166,7 @@ BRK |
| 176 | 166 |
DUP #61 NEQ ,&no-c JNZ |
| 177 | 167 |
#00 .last POK ;notes GET ;play JSR2 &no-c |
| 178 | 168 |
DUP #73 NEQ ,&no-d JNZ |
| 179 |
- #01 .last POK ;notes #0001 ADD2 GET ;play JSR2 &no-d |
|
| 169 |
+ #01 .last POK ;notes ++ GET ;play JSR2 &no-d |
|
| 180 | 170 |
DUP #64 NEQ ,&no-e JNZ |
| 181 | 171 |
#02 .last POK ;notes #0002 ADD2 GET ;play JSR2 &no-e |
| 182 | 172 |
DUP #66 NEQ ,&no-f JNZ |
| ... | ... |
@@ -199,7 +189,7 @@ BRK |
| 199 | 189 |
DUP #06 SFT #01 AND #01 NEQ ,&no-left JNZ |
| 200 | 190 |
( move ) .Audio/addr DEI2 #0001 SUB2 .Audio/addr DEO2 &no-left |
| 201 | 191 |
DUP #07 SFT #01 AND #01 NEQ ,&no-right JNZ |
| 202 |
- ( move ) .Audio/addr DEI2 #0001 ADD2 .Audio/addr DEO2 &no-right |
|
| 192 |
+ ( move ) .Audio/addr DEI2 ++ .Audio/addr DEO2 &no-right |
|
| 203 | 193 |
POP |
| 204 | 194 |
|
| 205 | 195 |
;draw-octave JSR2 |
| ... | ... |
@@ -236,7 +226,7 @@ RTN |
| 236 | 226 |
.octave-view/x1 PEK2 .octave-view/y1 PEK2 |
| 237 | 227 |
|
| 238 | 228 |
OVR2 OVR2 ;keys-left-icns #21 .last PEK #00 EQU ADD ;draw-key JSR2 |
| 239 |
- OVR2 #0008 ADD2 OVR2 ;keys-middle-icns #21 .last PEK #01 EQU ADD ;draw-key JSR2 |
|
| 229 |
+ OVR2 8+ OVR2 ;keys-middle-icns #21 .last PEK #01 EQU ADD ;draw-key JSR2 |
|
| 240 | 230 |
OVR2 #0010 ADD2 OVR2 ;keys-right-icns #21 .last PEK #02 EQU ADD ;draw-key JSR2 |
| 241 | 231 |
OVR2 #0018 ADD2 OVR2 ;keys-left-icns #21 .last PEK #03 EQU ADD ;draw-key JSR2 |
| 242 | 232 |
OVR2 #0020 ADD2 OVR2 ;keys-middle-icns #21 .last PEK #04 EQU ADD ;draw-key JSR2 |
| ... | ... |
@@ -248,13 +238,13 @@ RTN |
| 248 | 238 |
.octave-view/y1 PEK2 .Screen/y DEO2 |
| 249 | 239 |
#21 .Screen/color DEO |
| 250 | 240 |
|
| 251 |
- ;arrow-icns #0008 ADD2 .Screen/addr DEO2 |
|
| 241 |
+ ;arrow-icns 8+ .Screen/addr DEO2 |
|
| 252 | 242 |
.octave-view/y1 PEK2 #0010 ADD2 .Screen/y DEO2 |
| 253 | 243 |
#21 .Screen/color DEO |
| 254 | 244 |
|
| 255 | 245 |
;font-hex .octave PEK #03 ADD #00 SWP #0008 MUL2 ADD2 .Screen/addr DEO2 |
| 256 | 246 |
.octave-view/x2 PEK2 #0008 SUB2 .Screen/x DEO2 |
| 257 |
- .octave-view/y1 PEK2 #0008 ADD2 .Screen/y DEO2 |
|
| 247 |
+ .octave-view/y1 PEK2 8+ .Screen/y DEO2 |
|
| 258 | 248 |
#23 .Screen/color DEO |
| 259 | 249 |
|
| 260 | 250 |
RTN |
| ... | ... |
@@ -297,7 +287,7 @@ RTN |
| 297 | 287 |
|
| 298 | 288 |
.wave-view/x1 PEK2 |
| 299 | 289 |
.wave-view/y1 PEK2 |
| 300 |
- .wave-view/x2 PEK2 #0001 ADD2 |
|
| 290 |
+ .wave-view/x2 PEK2 ++ |
|
| 301 | 291 |
.wave-view/y2 PEK2 |
| 302 | 292 |
#00 ;fill-rect JSR2 |
| 303 | 293 |
|
| ... | ... |
@@ -316,7 +306,7 @@ RTN |
| 316 | 306 |
OVR TOS .Audio/addr DEI2 ADD2 GET |
| 317 | 307 |
#02 DIV #40 ADD DUP #07 SFT #80 MUL SUB |
| 318 | 308 |
TOS #0004 DIV2 .wave-view/y1 PEK2 ADD2 .Screen/y DEO2 |
| 319 |
- .Screen/x DEI2 #0001 ADD2 .Screen/x DEO2 |
|
| 309 |
+ .Screen/x DEI2 ++ .Screen/x DEO2 |
|
| 320 | 310 |
( draw ) OVR .Audio/length DEI2 SWP POP GTH #02 MUL #01 ADD .Screen/color DEO |
| 321 | 311 |
( incr ) SWP #01 ADD SWP |
| 322 | 312 |
DUP2 LTH ,&loop JNZ |
| ... | ... |
@@ -339,7 +329,7 @@ RTN |
| 339 | 329 |
&loop |
| 340 | 330 |
OVR2 .Screen/y DEO2 |
| 341 | 331 |
( draw ) DUPr STHr .Screen/color DEO |
| 342 |
- ( incr ) SWP2 #0001 ADD2 SWP2 |
|
| 332 |
+ ( incr ) SWP2 ++ SWP2 |
|
| 343 | 333 |
OVR2 OVR2 LTH2 ,&loop JNZ |
| 344 | 334 |
POP2 POP2 |
| 345 | 335 |
POPr |