... | ... |
@@ -4,18 +4,18 @@ |
4 | 4 |
- When selecting a pad, should highlight note in octave |
5 | 5 |
) |
6 | 6 |
|
7 |
+%+ { ADD } %- { SUB } %* { MUL } %/ { DIV } |
|
8 |
+%< { LTH } %> { GTH } %= { EQU } %! { NEQ } |
|
9 |
+%++ { ADD2 } %-- { SUB2 } %** { MUL2 } %// { DIV2 } |
|
10 |
+%<< { LTH2 } %>> { GTH2 } %== { EQU2 } %!! { NEQ2 } |
|
11 |
+ |
|
12 |
+%TOB { SWP POP } %TOS { #00 SWP } |
|
7 | 13 |
|
8 | 14 |
%RTN { JMP2r } |
9 |
-%8+ { #0008 ADD2 } |
|
10 |
-%8/ { #0008 DIV2 } |
|
11 |
-%2/ { #0002 DIV2 } |
|
12 |
-%2* { #0002 MUL2 } |
|
13 |
-%8* { #0008 MUL2 } |
|
14 |
-%++ { #0001 ADD2 } |
|
15 |
-%TOS { #00 SWP } |
|
16 |
-%MOD { DUP2 DIV MUL SUB } |
|
17 |
-%LTS2 { #8000 ADD2 SWP2 #8000 ADD2 GTH2 } |
|
18 |
-%GTS2 { #8000 ADD2 SWP2 #8000 ADD2 LTH2 } |
|
15 |
+ |
|
16 |
+%MOD { DUP2 / * - } |
|
17 |
+%LTS2 { #8000 ++ SWP2 #8000 ++ >> } |
|
18 |
+%GTS2 { #8000 ++ SWP2 #8000 ++ << } |
|
19 | 19 |
|
20 | 20 |
%PAD-WIDTH { #0030 } |
21 | 21 |
%PAD-HEIGHT { #0020 } |
... | ... |
@@ -40,8 +40,8 @@ |
40 | 40 |
|0000 |
41 | 41 |
|
42 | 42 |
@piano [ &last $1 &octave $1 ] |
43 |
+@pads [ &last $1 ] |
|
43 | 44 |
|
44 |
-@last $1 |
|
45 | 45 |
@color $1 |
46 | 46 |
@center [ &x $2 &y $2 ] |
47 | 47 |
@pointer [ &x $2 &y $2 ] |
... | ... |
@@ -67,77 +67,93 @@ |
67 | 67 |
|
68 | 68 |
( vectors ) |
69 | 69 |
;on-control .Controller/vector DEO2 |
70 |
- ;on-mouse .Mouse/vector DEO2 |
|
71 |
- ;on-frame .Screen/vector DEO2 |
|
72 |
- ;on-midi .Midi/vector DEO2 |
|
73 |
- |
|
74 |
- ( store location/length ) |
|
75 |
- #dd .Audio0/volume DEO #023c .Audio0/adsr DEO2 |
|
76 |
- #ce .Audio1/volume DEO #1334 .Audio1/adsr DEO2 |
|
77 |
- #ec .Audio2/volume DEO #0414 .Audio2/adsr DEO2 |
|
78 |
- #ee .Audio3/volume DEO #022c .Audio3/adsr DEO2 |
|
70 |
+ ;on-mouse .Mouse/vector DEO2 |
|
71 |
+ ;on-frame .Screen/vector DEO2 |
|
72 |
+ ;on-midi .Midi/vector DEO2 |
|
79 | 73 |
|
74 |
+ ( channel defaults ) |
|
75 |
+ #dd .Audio0/volume DEO |
|
76 |
+ #023c .Audio0/adsr DEO2 |
|
80 | 77 |
#0400 .Audio0/length DEO2 |
78 |
+ #ce .Audio1/volume DEO |
|
79 |
+ #1334 .Audio1/adsr DEO2 |
|
81 | 80 |
#0800 .Audio1/length DEO2 |
81 |
+ #ec .Audio2/volume DEO |
|
82 |
+ #0414 .Audio2/adsr DEO2 |
|
82 | 83 |
#0800 .Audio2/length DEO2 |
84 |
+ #ee .Audio3/volume DEO |
|
85 |
+ #022c .Audio3/adsr DEO2 |
|
83 | 86 |
#1000 .Audio3/length DEO2 |
84 | 87 |
|
88 |
+ ( defaults ) |
|
85 | 89 |
#01 .modes POK |
86 | 90 |
#01 .piano/octave POK |
87 | 91 |
|
88 | 92 |
;load-samples JSR2 |
89 | 93 |
|
90 | 94 |
( find center ) |
91 |
- .Screen/width DEI2 2/ .center/x POK2 |
|
92 |
- .Screen/height DEI2 2/ .center/y POK2 |
|
95 |
+ .Screen/width DEI2 #0002 // .center/x POK2 |
|
96 |
+ .Screen/height DEI2 #0002 // .center/y POK2 |
|
93 | 97 |
|
94 | 98 |
( place frame ) |
95 |
- .center/x PEK2 PAD-WIDTH #0003 MUL2 SUB2 #0010 SUB2 .frame/x1 POK2 |
|
96 |
- .center/y PEK2 #0050 SUB2 .frame/y1 POK2 |
|
97 |
- .center/x PEK2 PAD-WIDTH #0003 MUL2 ADD2 #0010 ADD2 .frame/x2 POK2 |
|
98 |
- .frame/y1 PEK2 PAD-HEIGHT #0004 MUL2 ADD2 #0028 ADD2 .frame/y2 POK2 |
|
99 |
+ .center/x PEK2 PAD-WIDTH #0003 ** -- #0010 -- .frame/x1 POK2 |
|
100 |
+ .center/y PEK2 #0050 -- .frame/y1 POK2 |
|
101 |
+ .center/x PEK2 PAD-WIDTH #0003 ** ++ #0010 ++ .frame/x2 POK2 |
|
102 |
+ .frame/y1 PEK2 PAD-HEIGHT #0004 ** ++ #0028 ++ .frame/y2 POK2 |
|
99 | 103 |
|
100 | 104 |
( place pad-view ) |
101 | 105 |
.frame/x1 PEK2 .pad-view/x1 POK2 |
102 | 106 |
.frame/y1 PEK2 .pad-view/y1 POK2 |
103 |
- .pad-view/x1 PEK2 #0004 PAD-WIDTH MUL2 ADD2 .pad-view/x2 POK2 |
|
104 |
- .pad-view/y1 PEK2 #0004 PAD-HEIGHT MUL2 ADD2 .pad-view/y2 POK2 |
|
107 |
+ .pad-view/x1 PEK2 #0004 PAD-WIDTH ** ++ .pad-view/x2 POK2 |
|
108 |
+ .pad-view/y1 PEK2 #0004 PAD-HEIGHT ** ++ .pad-view/y2 POK2 |
|
105 | 109 |
|
106 | 110 |
( place mix-view ) |
107 |
- .pad-view/x2 PEK2 #0006 ADD2 .mix-view/x1 POK2 |
|
111 |
+ .pad-view/x2 PEK2 #0006 ++ .mix-view/x1 POK2 |
|
108 | 112 |
.pad-view/y1 PEK2 .mix-view/y1 POK2 |
109 |
- .mix-view/x1 PEK2 #007a ADD2 .mix-view/x2 POK2 |
|
113 |
+ .mix-view/x1 PEK2 #007a ++ .mix-view/x2 POK2 |
|
110 | 114 |
.pad-view/y2 PEK2 .mix-view/y2 POK2 |
111 | 115 |
|
112 | 116 |
( place oct-view ) |
113 | 117 |
.frame/x1 PEK2 .oct-view/x1 POK2 |
114 |
- .mix-view/y2 PEK2 #0004 ADD2 .oct-view/y1 POK2 |
|
115 |
- .oct-view/x1 PEK2 #0050 ADD2 .oct-view/x2 POK2 |
|
116 |
- .oct-view/y1 PEK2 #0018 ADD2 .oct-view/y2 POK2 |
|
118 |
+ .mix-view/y2 PEK2 #0004 ++ .oct-view/y1 POK2 |
|
119 |
+ .oct-view/x1 PEK2 #0050 ++ .oct-view/x2 POK2 |
|
120 |
+ .oct-view/y1 PEK2 #0018 ++ .oct-view/y2 POK2 |
|
117 | 121 |
|
118 | 122 |
( place wav-view ) |
119 | 123 |
.oct-view/x2 PEK2 .wav-view/x1 POK2 |
120 |
- .mix-view/y2 PEK2 #0004 ADD2 .wav-view/y1 POK2 |
|
124 |
+ .mix-view/y2 PEK2 #0004 ++ .wav-view/y1 POK2 |
|
121 | 125 |
.frame/x2 PEK2 .wav-view/x2 POK2 |
122 |
- .wav-view/y1 PEK2 #0020 ADD2 .wav-view/y2 POK2 |
|
126 |
+ .wav-view/y1 PEK2 #0020 ++ .wav-view/y2 POK2 |
|
127 |
+ |
|
128 |
+ ( draw outlines ) |
|
129 |
+ .mix-view/x1 PEK2 #0004 -- |
|
130 |
+ .mix-view/y1 PEK2 #0000 -- |
|
131 |
+ .mix-view/x2 PEK2 #0002 -- |
|
132 |
+ .mix-view/y2 PEK2 #0002 -- |
|
133 |
+ #01 ;line-rect JSR2 |
|
134 |
+ .wav-view/x1 PEK2 #0000 -- |
|
135 |
+ .wav-view/y1 PEK2 #0002 -- |
|
136 |
+ .wav-view/x2 PEK2 #0002 -- |
|
137 |
+ .wav-view/y2 PEK2 #0002 ++ |
|
138 |
+ #01 ;line-rect JSR2 |
|
139 |
+ |
|
140 |
+ ( initial draw ) |
|
123 | 141 |
|
124 |
- ;draw-pads JSR2 |
|
125 |
- ;draw-mixers JSR2 |
|
126 |
- ;draw-octave JSR2 |
|
142 |
+ #00 #10 |
|
143 |
+ &draw-pads |
|
144 |
+ OVR #01 ;draw-pad JSR2 |
|
145 |
+ SWP #01 + SWP |
|
146 |
+ DUP2 < ,&draw-pads JNZ |
|
147 |
+ POP2 |
|
127 | 148 |
|
128 |
- .mix-view/x1 PEK2 #0004 SUB2 |
|
129 |
- .mix-view/y1 PEK2 #0000 SUB2 |
|
130 |
- .mix-view/x2 PEK2 #0002 SUB2 |
|
131 |
- .mix-view/y2 PEK2 #0002 SUB2 |
|
132 |
- #01 |
|
133 |
- ;line-rect JSR2 |
|
149 |
+ #00 #04 |
|
150 |
+ &draw-mixers |
|
151 |
+ OVR ;draw-mixer JSR2 |
|
152 |
+ SWP #01 + SWP |
|
153 |
+ DUP2 < ,&draw-mixers JNZ |
|
154 |
+ POP2 |
|
134 | 155 |
|
135 |
- .wav-view/x1 PEK2 #0000 SUB2 |
|
136 |
- .wav-view/y1 PEK2 #0002 SUB2 |
|
137 |
- .wav-view/x2 PEK2 #0002 SUB2 |
|
138 |
- .wav-view/y2 PEK2 #0002 ADD2 |
|
139 |
- #01 |
|
140 |
- ;line-rect JSR2 |
|
156 |
+ ;draw-octave JSR2 |
|
141 | 157 |
|
142 | 158 |
BRK |
143 | 159 |
|
... | ... |
@@ -147,12 +163,12 @@ BRK |
147 | 163 |
#00 #04 |
148 | 164 |
&loop |
149 | 165 |
OVR STH |
150 |
- ( x ) .mix-view/x1 PEK2 #0074 ADD2 |
|
151 |
- ( y ) .mix-view/y1 PEK2 PAD-HEIGHT DUPr STHr TOS MUL2 ADD2 #0002 ADD2 |
|
152 |
- ( output ) .Audio0/output STHr #10 MUL ADD DEI |
|
166 |
+ ( x ) .mix-view/x1 PEK2 #0074 ++ |
|
167 |
+ ( y ) .mix-view/y1 PEK2 PAD-HEIGHT DUPr STHr TOS ** ++ #0002 ++ |
|
168 |
+ ( output ) .Audio0/output STHr #10 * + DEI |
|
153 | 169 |
;draw-monitor JSR2 |
154 |
- ( incr ) SWP #01 ADD SWP |
|
155 |
- DUP2 LTH ,&loop JNZ |
|
170 |
+ ( incr ) SWP #01 + SWP |
|
171 |
+ DUP2 < ,&loop JNZ |
|
156 | 172 |
POP2 |
157 | 173 |
|
158 | 174 |
BRK |
... | ... |
@@ -161,32 +177,34 @@ BRK |
161 | 177 |
|
162 | 178 |
;draw-cursor JSR2 |
163 | 179 |
|
164 |
- .Mouse/state DEI #00 NEQ ,&on-touch JNZ BRK &on-touch |
|
180 |
+ .Mouse/state DEI #00 ! ,&on-touch JNZ BRK &on-touch |
|
165 | 181 |
|
166 |
- .Mouse/x DEI2 DUP2 .pad-view/x1 PEK2 GTH2 ROT ROT .pad-view/x2 PEK2 #0001 ADD2 LTH2 #0101 EQU2 |
|
167 |
- .Mouse/y DEI2 DUP2 .pad-view/y1 PEK2 GTH2 ROT ROT .pad-view/y2 PEK2 LTH2 #0101 EQU2 |
|
168 |
- #0101 EQU2 ;on-touch-pad JNZ2 |
|
182 |
+ .Mouse/x DEI2 DUP2 .pad-view/x1 PEK2 >> ROT ROT .pad-view/x2 PEK2 #0001 ++ << #0101 == |
|
183 |
+ .Mouse/y DEI2 DUP2 .pad-view/y1 PEK2 >> ROT ROT .pad-view/y2 PEK2 << #0101 == |
|
184 |
+ #0101 == ;on-touch-pad JNZ2 |
|
169 | 185 |
|
170 |
- .Mouse/x DEI2 DUP2 .mix-view/x1 PEK2 GTH2 ROT ROT .mix-view/x2 PEK2 #0001 ADD2 LTH2 #0101 EQU2 |
|
171 |
- .Mouse/y DEI2 DUP2 .mix-view/y1 PEK2 GTH2 ROT ROT .mix-view/y2 PEK2 LTH2 #0101 EQU2 |
|
172 |
- #0101 EQU2 ;on-touch-mix JNZ2 |
|
186 |
+ .Mouse/x DEI2 DUP2 .mix-view/x1 PEK2 >> ROT ROT .mix-view/x2 PEK2 #0001 ++ << #0101 == |
|
187 |
+ .Mouse/y DEI2 DUP2 .mix-view/y1 PEK2 >> ROT ROT .mix-view/y2 PEK2 << #0101 == |
|
188 |
+ #0101 == ;on-touch-mix JNZ2 |
|
173 | 189 |
|
174 |
- .Mouse/x DEI2 DUP2 .oct-view/x1 PEK2 GTH2 ROT ROT .oct-view/x2 PEK2 #0001 ADD2 LTH2 #0101 EQU2 |
|
175 |
- .Mouse/y DEI2 DUP2 .oct-view/y1 PEK2 GTH2 ROT ROT .oct-view/y2 PEK2 LTH2 #0101 EQU2 |
|
176 |
- #0101 EQU2 ;on-touch-oct JNZ2 |
|
190 |
+ .Mouse/x DEI2 DUP2 .oct-view/x1 PEK2 >> ROT ROT .oct-view/x2 PEK2 #0001 ++ << #0101 == |
|
191 |
+ .Mouse/y DEI2 DUP2 .oct-view/y1 PEK2 >> ROT ROT .oct-view/y2 PEK2 << #0101 == |
|
192 |
+ #0101 == ;on-touch-oct JNZ2 |
|
177 | 193 |
|
178 | 194 |
BRK |
179 | 195 |
|
180 | 196 |
@on-midi ( -> ) |
181 | 197 |
|
182 |
- .Midi/note DEI #00 NEQ ,¬e-on JNZ BRK ¬e-on |
|
198 |
+ .Midi/note DEI #00 ! #01 JNZ [ BRK ] |
|
183 | 199 |
|
184 |
- .Midi/channel DEI #90 NEQ ,&no-drum JNZ |
|
185 |
- .Midi/note DEI #10 MOD ;play-pad JSR2 ) |
|
200 |
+ ( drums ) |
|
201 |
+ .Midi/channel DEI #90 ! ,&no-drum JNZ |
|
202 |
+ .Midi/note DEI #10 MOD ;play-pad JSR2 |
|
186 | 203 |
BRK |
187 | 204 |
&no-drum |
188 | 205 |
|
189 |
- ;pad-addr #0008 ADD2 LDA2 .Audio0/addr DEO2 |
|
206 |
+ ( TODO: synths ) |
|
207 |
+ ;pad-addr #0008 ++ LDA2 .Audio0/addr DEO2 |
|
190 | 208 |
#0008 .Audio0/length DEO2 |
191 | 209 |
.Midi/note DEI .Audio0/pitch DEO |
192 | 210 |
|
... | ... |
@@ -194,33 +212,33 @@ BRK |
194 | 212 |
|
195 | 213 |
@on-control ( -> ) |
196 | 214 |
|
197 |
- .Controller/key DEI #00 NEQ ,&key-down JNZ BRK &key-down |
|
215 |
+ .Controller/key DEI #00 ! #01 JNZ [ BRK ] |
|
198 | 216 |
|
199 | 217 |
.Controller/key DEI |
200 |
- DUP #31 NEQ ,&no-0 JNZ #00 ;play-pad JSR2 &no-0 |
|
201 |
- DUP #32 NEQ ,&no-1 JNZ #01 ;play-pad JSR2 &no-1 |
|
202 |
- DUP #33 NEQ ,&no-2 JNZ #02 ;play-pad JSR2 &no-2 |
|
203 |
- DUP #34 NEQ ,&no-3 JNZ #03 ;play-pad JSR2 &no-3 |
|
204 |
- DUP #71 NEQ ,&no-4 JNZ #04 ;play-pad JSR2 &no-4 |
|
205 |
- DUP #77 NEQ ,&no-5 JNZ #05 ;play-pad JSR2 &no-5 |
|
206 |
- DUP #65 NEQ ,&no-6 JNZ #06 ;play-pad JSR2 &no-6 |
|
207 |
- DUP #72 NEQ ,&no-7 JNZ #07 ;play-pad JSR2 &no-7 |
|
208 |
- DUP #61 NEQ ,&no-8 JNZ #08 ;play-pad JSR2 &no-8 |
|
209 |
- DUP #73 NEQ ,&no-9 JNZ #09 ;play-pad JSR2 &no-9 |
|
210 |
- DUP #64 NEQ ,&no-a JNZ #0a ;play-pad JSR2 &no-a |
|
211 |
- DUP #66 NEQ ,&no-b JNZ #0b ;play-pad JSR2 &no-b |
|
212 |
- DUP #7a NEQ ,&no-c JNZ #0c ;play-pad JSR2 &no-c |
|
213 |
- DUP #78 NEQ ,&no-d JNZ #0d ;play-pad JSR2 &no-d |
|
214 |
- DUP #63 NEQ ,&no-e JNZ #0e ;play-pad JSR2 &no-e |
|
215 |
- DUP #76 NEQ ,&no-f JNZ #0f ;play-pad JSR2 &no-f |
|
218 |
+ DUP #31 ! ,&no-0 JNZ #00 ;play-pad JSR2 &no-0 |
|
219 |
+ DUP #32 ! ,&no-1 JNZ #01 ;play-pad JSR2 &no-1 |
|
220 |
+ DUP #33 ! ,&no-2 JNZ #02 ;play-pad JSR2 &no-2 |
|
221 |
+ DUP #34 ! ,&no-3 JNZ #03 ;play-pad JSR2 &no-3 |
|
222 |
+ DUP #71 ! ,&no-4 JNZ #04 ;play-pad JSR2 &no-4 |
|
223 |
+ DUP #77 ! ,&no-5 JNZ #05 ;play-pad JSR2 &no-5 |
|
224 |
+ DUP #65 ! ,&no-6 JNZ #06 ;play-pad JSR2 &no-6 |
|
225 |
+ DUP #72 ! ,&no-7 JNZ #07 ;play-pad JSR2 &no-7 |
|
226 |
+ DUP #61 ! ,&no-8 JNZ #08 ;play-pad JSR2 &no-8 |
|
227 |
+ DUP #73 ! ,&no-9 JNZ #09 ;play-pad JSR2 &no-9 |
|
228 |
+ DUP #64 ! ,&no-a JNZ #0a ;play-pad JSR2 &no-a |
|
229 |
+ DUP #66 ! ,&no-b JNZ #0b ;play-pad JSR2 &no-b |
|
230 |
+ DUP #7a ! ,&no-c JNZ #0c ;play-pad JSR2 &no-c |
|
231 |
+ DUP #78 ! ,&no-d JNZ #0d ;play-pad JSR2 &no-d |
|
232 |
+ DUP #63 ! ,&no-e JNZ #0e ;play-pad JSR2 &no-e |
|
233 |
+ DUP #76 ! ,&no-f JNZ #0f ;play-pad JSR2 &no-f |
|
216 | 234 |
POP |
217 | 235 |
|
218 | 236 |
BRK |
219 | 237 |
|
220 | 238 |
@on-touch-pad ( -> ) |
221 | 239 |
|
222 |
- ( x ) .Mouse/x DEI2 .pad-view/x1 PEK2 SUB2 PAD-WIDTH DIV2 SWP POP |
|
223 |
- ( y ) .Mouse/y DEI2 .pad-view/y1 PEK2 SUB2 PAD-HEIGHT DIV2 SWP POP #04 MUL ADD |
|
240 |
+ ( x ) .Mouse/x DEI2 .pad-view/x1 PEK2 -- PAD-WIDTH // TOB |
|
241 |
+ ( y ) .Mouse/y DEI2 .pad-view/y1 PEK2 -- PAD-HEIGHT // TOB #04 * + |
|
224 | 242 |
|
225 | 243 |
DUP SWP ;play-pad JSR2 |
226 | 244 |
|
... | ... |
@@ -232,40 +250,39 @@ BRK |
232 | 250 |
|
233 | 251 |
@on-touch-mix ( -> ) |
234 | 252 |
|
235 |
- ( channel ) .Mouse/y DEI2 .mix-view/y1 PEK2 SUB2 PAD-HEIGHT DIV2 SWP POP STH |
|
236 |
- |
|
237 |
- ( knob ) .Mouse/x DEI2 .mix-view/x1 PEK2 SUB2 #0010 DIV2 SWP POP |
|
238 |
- |
|
239 |
- DUP #00 NEQ ,&no-a JNZ |
|
240 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] DEI |
|
241 |
- #10 .Mouse/state DEI #10 EQU #e0 MUL ADD ADD |
|
242 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] DEO &no-a |
|
243 |
- DUP #01 NEQ ,&no-d JNZ |
|
244 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] DEI |
|
245 |
- DUP #f0 AND STH #01 .Mouse/state DEI #10 EQU #0e MUL ADD ADD #0f AND STHr ADD |
|
246 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] DEO &no-d |
|
247 |
- DUP #02 NEQ ,&no-s JNZ |
|
248 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] #01 ADD DEI |
|
249 |
- #10 .Mouse/state DEI #10 EQU #e0 MUL ADD ADD |
|
250 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] #01 ADD DEO &no-s |
|
251 |
- DUP #03 NEQ ,&no-r JNZ |
|
252 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] #01 ADD DEI |
|
253 |
- DUP #f0 AND STH #01 .Mouse/state DEI #10 EQU #0e MUL ADD ADD #0f AND STHr ADD |
|
254 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] #01 ADD DEO &no-r |
|
255 |
- |
|
256 |
- DUP #04 NEQ ,&no-repeat JNZ |
|
257 |
- .modes [ DUPr STHr ADD ] PEK |
|
258 |
- #00 EQU |
|
259 |
- .modes [ DUPr STHr ADD ] POK &no-repeat |
|
260 |
- |
|
261 |
- DUP #05 NEQ ,&no-left JNZ |
|
262 |
- .Audio0/volume [ DUPr STHr #10 MUL ADD ] DEI |
|
263 |
- #10 .Mouse/state DEI #10 EQU #e0 MUL ADD ADD |
|
264 |
- .Audio0/volume [ DUPr STHr #10 MUL ADD ] DEO &no-left |
|
265 |
- DUP #06 NEQ ,&no-right JNZ |
|
266 |
- .Audio0/volume [ DUPr STHr #10 MUL ADD ] DEI |
|
267 |
- DUP #f0 AND STH #01 .Mouse/state DEI #10 EQU #0e MUL ADD ADD #0f AND STHr ADD |
|
268 |
- .Audio0/volume [ DUPr STHr #10 MUL ADD ] DEO &no-right |
|
253 |
+ ( channel ) .Mouse/y DEI2 .mix-view/y1 PEK2 -- PAD-HEIGHT // TOB STH |
|
254 |
+ ( knob ) .Mouse/x DEI2 .mix-view/x1 PEK2 -- #0010 // TOB |
|
255 |
+ |
|
256 |
+ DUP #00 ! ,&no-a JNZ |
|
257 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] DEI |
|
258 |
+ #10 .Mouse/state DEI #10 = #e0 * + + |
|
259 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] DEO &no-a |
|
260 |
+ DUP #01 ! ,&no-d JNZ |
|
261 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] DEI |
|
262 |
+ DUP #f0 AND STH #01 .Mouse/state DEI #10 = #0e * + + #0f AND STHr + |
|
263 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] DEO &no-d |
|
264 |
+ DUP #02 ! ,&no-s JNZ |
|
265 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] #01 + DEI |
|
266 |
+ #10 .Mouse/state DEI #10 = #e0 * + + |
|
267 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] #01 + DEO &no-s |
|
268 |
+ DUP #03 ! ,&no-r JNZ |
|
269 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] #01 + DEI |
|
270 |
+ DUP #f0 AND STH #01 .Mouse/state DEI #10 = #0e * + + #0f AND STHr + |
|
271 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] #01 + DEO &no-r |
|
272 |
+ |
|
273 |
+ DUP #04 ! ,&no-repeat JNZ |
|
274 |
+ .modes [ DUPr STHr + ] PEK |
|
275 |
+ #00 = |
|
276 |
+ .modes [ DUPr STHr + ] POK &no-repeat |
|
277 |
+ |
|
278 |
+ DUP #05 ! ,&no-left JNZ |
|
279 |
+ .Audio0/volume [ DUPr STHr #10 * + ] DEI |
|
280 |
+ #10 .Mouse/state DEI #10 = #e0 * + + |
|
281 |
+ .Audio0/volume [ DUPr STHr #10 * + ] DEO &no-left |
|
282 |
+ DUP #06 ! ,&no-right JNZ |
|
283 |
+ .Audio0/volume [ DUPr STHr #10 * + ] DEI |
|
284 |
+ DUP #f0 AND STH #01 .Mouse/state DEI #10 = #0e * + + #0f AND STHr + |
|
285 |
+ .Audio0/volume [ DUPr STHr #10 * + ] DEO &no-right |
|
269 | 286 |
POP |
270 | 287 |
|
271 | 288 |
( release ) #00 .Mouse/state DEO |
... | ... |
@@ -278,27 +295,27 @@ BRK |
278 | 295 |
|
279 | 296 |
@on-touch-oct ( -> ) |
280 | 297 |
|
281 |
- .Mouse/x DEI2 .oct-view/x1 PEK2 SUB2 8/ SWP POP #08 NEQ ,&no-mod JNZ |
|
282 |
- .Mouse/y DEI2 .oct-view/y1 PEK2 SUB2 8/ SWP POP |
|
283 |
- DUP #00 NEQ ,&no-incr JNZ |
|
284 |
- .piano/octave PEK #01 ADD .piano/octave POK &no-incr |
|
285 |
- DUP #02 NEQ ,&no-decr JNZ |
|
286 |
- .piano/octave PEK #01 SUB .piano/octave POK &no-decr |
|
298 |
+ .Mouse/x DEI2 .oct-view/x1 PEK2 -- #0008 // TOB #08 ! ,&no-mod JNZ |
|
299 |
+ .Mouse/y DEI2 .oct-view/y1 PEK2 -- #0008 // TOB |
|
300 |
+ DUP #00 ! ,&no-incr JNZ |
|
301 |
+ .piano/octave PEK #01 + .piano/octave POK &no-incr |
|
302 |
+ DUP #02 ! ,&no-decr JNZ |
|
303 |
+ .piano/octave PEK #01 - .piano/octave POK &no-decr |
|
287 | 304 |
POP |
288 | 305 |
( release ) #00 .Mouse/state DEO |
289 | 306 |
;draw-octave JSR2 |
290 | 307 |
BRK |
291 | 308 |
&no-mod |
292 | 309 |
|
293 |
- .Mouse/x DEI2 .oct-view/x1 PEK2 SUB2 8/ SWP POP #06 GTH ,&no-key JNZ |
|
294 |
- .Mouse/x DEI2 .oct-view/x1 PEK2 SUB2 8/ |
|
310 |
+ .Mouse/x DEI2 .oct-view/x1 PEK2 -- #0008 // TOB #06 GTH ,&no-key JNZ |
|
311 |
+ .Mouse/x DEI2 .oct-view/x1 PEK2 -- #0008 // |
|
295 | 312 |
|
296 | 313 |
( set pitch of pad ) |
297 |
- DUP2 ;notes ADD2 LDA .last PEK SWP .piano/octave PEK #02 SUB #0c MUL ADD ;set-pitch JSR2 |
|
314 |
+ DUP2 ;notes ++ LDA .pads/last PEK SWP .piano/octave PEK #02 - #0c * + ;set-pitch JSR2 |
|
298 | 315 |
|
299 | 316 |
( record last note ) |
300 |
- SWP POP .piano/last POK |
|
301 |
- .last PEK ;play-pad JSR2 |
|
317 |
+ TOB .piano/last POK |
|
318 |
+ .pads/last PEK ;play-pad JSR2 |
|
302 | 319 |
|
303 | 320 |
( release ) #00 .Mouse/state DEO |
304 | 321 |
;draw-octave JSR2 |
... | ... |
@@ -308,13 +325,13 @@ BRK |
308 | 325 |
|
309 | 326 |
@set-pitch ( pad pitch -- ) |
310 | 327 |
|
311 |
- SWP TOS ;pad-pitch ADD2 STA |
|
328 |
+ SWP TOS ;pad-pitch ++ STA |
|
312 | 329 |
|
313 | 330 |
RTN |
314 | 331 |
|
315 | 332 |
@play ( pitch -- ) |
316 | 333 |
|
317 |
- DUP .piano/octave PEK .modes PEK MUL ADD .Audio0/pitch DEO |
|
334 |
+ DUP .piano/octave PEK .modes PEK * + .Audio0/pitch DEO |
|
318 | 335 |
|
319 | 336 |
RTN |
320 | 337 |
|
... | ... |
@@ -322,11 +339,11 @@ RTN |
322 | 339 |
|
323 | 340 |
#00 #10 |
324 | 341 |
&loop |
325 |
- ( name ) OVR TOS #0019 MUL2 ;pad-path ADD2 .File/name DEO2 |
|
326 |
- ( length ) OVR #04 DIV #10 MUL .Audio0/length ADD DEI2 .File/length DEO2 |
|
327 |
- ( load ) OVR TOS #0002 MUL2 ;pad-addr ADD2 LDA2 .File/load DEO2 |
|
328 |
- ( incr ) SWP #01 ADD SWP |
|
329 |
- DUP2 LTH ,&loop JNZ |
|
342 |
+ ( name ) OVR TOS #0019 ** ;pad-path ++ .File/name DEO2 |
|
343 |
+ ( length ) OVR #04 / #10 * .Audio0/length + DEI2 .File/length DEO2 |
|
344 |
+ ( load ) OVR TOS #0002 ** ;pad-addr ++ LDA2 .File/load DEO2 |
|
345 |
+ ( incr ) SWP #01 + SWP |
|
346 |
+ DUP2 < ,&loop JNZ |
|
330 | 347 |
POP2 |
331 | 348 |
|
332 | 349 |
RTN |
... | ... |
@@ -334,48 +351,48 @@ RTN |
334 | 351 |
@play-pad ( note pad -- ) |
335 | 352 |
|
336 | 353 |
( unselect last ) |
337 |
- .last PEK #01 ;draw-pad JSR2 |
|
338 |
- DUP .last POK |
|
354 |
+ .pads/last PEK #01 ;draw-pad JSR2 |
|
355 |
+ DUP .pads/last POK |
|
339 | 356 |
( highlight ) |
340 | 357 |
DUP #02 ;draw-pad JSR2 |
341 | 358 |
( addr ) |
342 |
- DUP TOS #0002 MUL2 ;pad-addr ADD2 LDA2 STH2 |
|
343 |
- DUP #04 DIV #10 MUL .Audio0/addr ADD STH2r ROT DEO2 |
|
359 |
+ DUP TOS #0002 ** ;pad-addr ++ LDA2 STH2 |
|
360 |
+ DUP #04 / #10 * .Audio0/addr + STH2r ROT DEO2 |
|
344 | 361 |
( pitch ) |
345 |
- DUP TOS ;pad-pitch ADD2 LDA STH |
|
346 |
- DUP #04 DIV .modes ADD PEK #00 EQU #80 MUL STH ADDr |
|
347 |
- DUP #04 DIV #10 MUL .Audio0/pitch ADD STHr SWP DEO |
|
348 |
- #04 DIV ;draw-mixer JSR2 |
|
362 |
+ DUP TOS ;pad-pitch ++ LDA STH |
|
363 |
+ DUP #04 / .modes + PEK #00 = #80 * STH ADDr |
|
364 |
+ DUP #04 / #10 * .Audio0/pitch + STHr SWP DEO |
|
365 |
+ #04 / ;draw-mixer JSR2 |
|
349 | 366 |
|
350 | 367 |
RTN |
351 | 368 |
|
352 | 369 |
@draw-waveform ( pad -- ) |
353 | 370 |
|
354 |
- #02 MUL #00 SWP ;pad-addr ADD2 LDA2 STH2 |
|
371 |
+ #02 * #00 SWP ;pad-addr ++ LDA2 STH2 |
|
355 | 372 |
|
356 |
- .wav-view/x1 PEK2 #0002 ADD2 |
|
373 |
+ .wav-view/x1 PEK2 #0002 ++ |
|
357 | 374 |
.wav-view/y1 PEK2 |
358 |
- .wav-view/x2 PEK2 #0002 SUB2 |
|
375 |
+ .wav-view/x2 PEK2 #0002 -- |
|
359 | 376 |
.wav-view/y2 PEK2 |
360 | 377 |
#00 ;fill-rect JSR2 |
361 | 378 |
|
362 |
- .wav-view/x1 PEK2 #0002 ADD2 .Screen/x DEO2 |
|
379 |
+ .wav-view/x1 PEK2 #0002 ++ .Screen/x DEO2 |
|
363 | 380 |
|
364 | 381 |
( waveform ) |
365 | 382 |
#00 #e8 |
366 | 383 |
&loop |
367 | 384 |
( dotted line ) |
368 | 385 |
OVR #01 AND ,&no-dot JNZ |
369 |
- .wav-view/y1 PEK2 #0010 ADD2 .Screen/y DEO2 |
|
386 |
+ .wav-view/y1 PEK2 #0010 ++ .Screen/y DEO2 |
|
370 | 387 |
#01 .Screen/color DEO |
371 | 388 |
&no-dot |
372 |
- OVR TOS #0010 MUL2 [ DUP2r STH2r ] ADD2 LDA |
|
373 |
- #02 DIV |
|
374 |
- TOS #0004 DIV2 .wav-view/y1 PEK2 ADD2 .Screen/y DEO2 |
|
375 |
- .Screen/x DEI2 ++ .Screen/x DEO2 |
|
389 |
+ OVR TOS #0010 ** [ DUP2r STH2r ] ++ LDA |
|
390 |
+ #02 / |
|
391 |
+ TOS #0004 // .wav-view/y1 PEK2 ++ .Screen/y DEO2 |
|
392 |
+ .Screen/x DEI2 #0001 ++ .Screen/x DEO2 |
|
376 | 393 |
( draw ) #02 .Screen/color DEO |
377 |
- ( incr ) SWP #01 ADD SWP |
|
378 |
- DUP2 LTH ,&loop JNZ |
|
394 |
+ ( incr ) SWP #01 + SWP |
|
395 |
+ DUP2 < ,&loop JNZ |
|
379 | 396 |
POP2 |
380 | 397 |
|
381 | 398 |
POP2r |
... | ... |
@@ -384,30 +401,30 @@ RTN |
384 | 401 |
|
385 | 402 |
@draw-mixer ( mixer -- ) |
386 | 403 |
|
387 |
- DUP STH #00 SWP PAD-HEIGHT MUL2 .mix-view/y1 PEK2 ADD2 #0003 ADD2 |
|
404 |
+ DUP STH #00 SWP PAD-HEIGHT ** .mix-view/y1 PEK2 ++ #0003 ++ |
|
388 | 405 |
|
389 | 406 |
( adsr ) |
390 | 407 |
DUP2 .mix-view/x1 PEK2 SWP2 |
391 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] DEI #04 SFT |
|
408 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] DEI #04 SFT |
|
392 | 409 |
;draw-knob JSR2 |
393 |
- DUP2 .mix-view/x1 PEK2 #0010 ADD2 SWP2 |
|
394 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] DEI #0f AND |
|
410 |
+ DUP2 .mix-view/x1 PEK2 #0010 ++ SWP2 |
|
411 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] DEI #0f AND |
|
395 | 412 |
;draw-knob JSR2 |
396 |
- DUP2 .mix-view/x1 PEK2 #0020 ADD2 SWP2 |
|
397 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] #01 ADD DEI #04 SFT |
|
413 |
+ DUP2 .mix-view/x1 PEK2 #0020 ++ SWP2 |
|
414 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] #01 + DEI #04 SFT |
|
398 | 415 |
;draw-knob JSR2 |
399 |
- DUP2 .mix-view/x1 PEK2 #0030 ADD2 SWP2 |
|
400 |
- .Audio0/adsr [ DUPr STHr #10 MUL ADD ] #01 ADD DEI #0f AND |
|
416 |
+ DUP2 .mix-view/x1 PEK2 #0030 ++ SWP2 |
|
417 |
+ .Audio0/adsr [ DUPr STHr #10 * + ] #01 + DEI #0f AND |
|
401 | 418 |
;draw-knob JSR2 |
402 | 419 |
( once/repeat ) |
403 |
- DUP2 .mix-view/x1 PEK2 #0040 ADD2 SWP2 |
|
404 |
- .modes [ DUPr STHr ADD ] PEK ;draw-switch JSR2 |
|
420 |
+ DUP2 .mix-view/x1 PEK2 #0040 ++ SWP2 |
|
421 |
+ .modes [ DUPr STHr + ] PEK ;draw-switch JSR2 |
|
405 | 422 |
( volume ) |
406 |
- DUP2 .mix-view/x1 PEK2 #0050 ADD2 SWP2 |
|
407 |
- .Audio0/volume [ DUPr STHr #10 MUL ADD ] DEI #04 SFT |
|
423 |
+ DUP2 .mix-view/x1 PEK2 #0050 ++ SWP2 |
|
424 |
+ .Audio0/volume [ DUPr STHr #10 * + ] DEI #04 SFT |
|
408 | 425 |
;draw-knob JSR2 |
409 |
- DUP2 .mix-view/x1 PEK2 #0060 ADD2 SWP2 |
|
410 |
- .Audio0/volume [ DUPr STHr #10 MUL ADD ] DEI #0f AND |
|
426 |
+ DUP2 .mix-view/x1 PEK2 #0060 ++ SWP2 |
|
427 |
+ .Audio0/volume [ DUPr STHr #10 * + ] DEI #0f AND |
|
411 | 428 |
;draw-knob JSR2 |
412 | 429 |
POP2 |
413 | 430 |
POPr |
... | ... |
@@ -420,16 +437,16 @@ RTN |
420 | 437 |
|
421 | 438 |
.knob/x PEK2 .Screen/x DEO2 |
422 | 439 |
.knob/y PEK2 .Screen/y DEO2 ;knob-icns .Screen/addr DEO2 #21 .Screen/color DEO |
423 |
- .knob/x PEK2 8+ .Screen/x DEO2 ;knob-icns 8+ .Screen/addr DEO2 #21 .Screen/color DEO |
|
424 |
- .knob/y PEK2 8+ .Screen/y DEO2 ;knob-icns #0018 ADD2 .Screen/addr DEO2 #21 .Screen/color DEO |
|
425 |
- .knob/x PEK2 .Screen/x DEO2 ;knob-icns #0010 ADD2 .Screen/addr DEO2 #21 .Screen/color DEO |
|
426 |
- .knob/x PEK2 #00 #00 .knob/value PEK ;knob-offsetx ADD2 LDA ADD2 .Screen/x DEO2 |
|
427 |
- .knob/y PEK2 #00 #00 .knob/value PEK ;knob-offsety ADD2 LDA ADD2 .Screen/y DEO2 |
|
428 |
- ;knob-icns #0020 ADD2 .Screen/addr DEO2 |
|
440 |
+ .knob/x PEK2 #0008 ++ .Screen/x DEO2 ;knob-icns #0008 ++ .Screen/addr DEO2 #21 .Screen/color DEO |
|
441 |
+ .knob/y PEK2 #0008 ++ .Screen/y DEO2 ;knob-icns #0018 ++ .Screen/addr DEO2 #21 .Screen/color DEO |
|
442 |
+ .knob/x PEK2 .Screen/x DEO2 ;knob-icns #0010 ++ .Screen/addr DEO2 #21 .Screen/color DEO |
|
443 |
+ .knob/x PEK2 #00 #00 .knob/value PEK ;knob-offsetx ++ LDA ++ .Screen/x DEO2 |
|
444 |
+ .knob/y PEK2 #00 #00 .knob/value PEK ;knob-offsety ++ LDA ++ .Screen/y DEO2 |
|
445 |
+ ;knob-icns #0020 ++ .Screen/addr DEO2 |
|
429 | 446 |
#25 .Screen/color DEO |
430 |
- .knob/x PEK2 #0004 ADD2 .Screen/x DEO2 |
|
431 |
- .knob/y PEK2 #0010 ADD2 .Screen/y DEO2 |
|
432 |
- ;font-hex #00 .knob/value PEK #08 MUL ADD2 .Screen/addr DEO2 |
|
447 |
+ .knob/x PEK2 #0004 ++ .Screen/x DEO2 |
|
448 |
+ .knob/y PEK2 #0010 ++ .Screen/y DEO2 |
|
449 |
+ ;font-hex #00 .knob/value PEK #08 * ++ .Screen/addr DEO2 |
|
433 | 450 |
#21 .Screen/color DEO |
434 | 451 |
|
435 | 452 |
RTN |
... | ... |
@@ -441,45 +458,23 @@ RTN |
441 | 458 |
.Screen/y DEO2 |
442 | 459 |
.Screen/x DEO2 |
443 | 460 |
|
444 |
- DUPr STHr #20 MUL #00 SWP ;switch-icns ADD2 ( keep in stack ) |
|
461 |
+ DUPr STHr #20 * #00 SWP ;switch-icns ++ ( keep in stack ) |
|
445 | 462 |
|
446 | 463 |
DUP2 .Screen/addr DEO2 |
447 |
- #21 DUPr STHr ADD .Screen/color DEO |
|
464 |
+ #21 DUPr STHr + .Screen/color DEO |
|
448 | 465 |
|
449 |
- .Screen/x DEI2 #0008 ADD2 .Screen/x DEO2 |
|
450 |
- DUP2 #0008 ADD2 .Screen/addr DEO2 |
|
451 |
- #21 DUPr STHr ADD .Screen/color DEO |
|
466 |
+ .Screen/x DEI2 #0008 ++ .Screen/x DEO2 |
|
467 |
+ DUP2 #0008 ++ .Screen/addr DEO2 |
|
468 |
+ #21 DUPr STHr + .Screen/color DEO |
|
452 | 469 |
|
453 |
- .Screen/y DEI2 #0008 ADD2 .Screen/y DEO2 |
|
454 |
- .Screen/x DEI2 #0008 SUB2 .Screen/x DEO2 |
|
455 |
- DUP2 #0010 ADD2 .Screen/addr DEO2 |
|
456 |
- #21 DUPr STHr ADD .Screen/color DEO |
|
457 |
- |
|
458 |
- .Screen/x DEI2 #0008 ADD2 .Screen/x DEO2 |
|
459 |
- #0018 ADD2 .Screen/addr DEO2 |
|
460 |
- #21 STHr ADD .Screen/color DEO |
|
461 |
- |
|
462 |
-RTN |
|
470 |
+ .Screen/y DEI2 #0008 ++ .Screen/y DEO2 |
|
471 |
+ .Screen/x DEI2 #0008 -- .Screen/x DEO2 |
|
472 |
+ DUP2 #0010 ++ .Screen/addr DEO2 |
|
473 |
+ #21 DUPr STHr + .Screen/color DEO |
|
463 | 474 |
|
464 |
-@draw-pads ( -- ) |
|
465 |
- |
|
466 |
- #00 #10 |
|
467 |
- &loop |
|
468 |
- OVR #01 ;draw-pad JSR2 |
|
469 |
- SWP #01 ADD SWP |
|
470 |
- DUP2 LTH ,&loop JNZ |
|
471 |
- POP2 |
|
472 |
- |
|
473 |
-RTN |
|
474 |
- |
|
475 |
-@draw-mixers ( -- ) |
|
476 |
- |
|
477 |
- #00 #04 |
|
478 |
- &loop |
|
479 |
- OVR ;draw-mixer JSR2 |
|
480 |
- SWP #01 ADD SWP |
|
481 |
- DUP2 LTH ,&loop JNZ |
|
482 |
- POP2 |
|
475 |
+ .Screen/x DEI2 #0008 ++ .Screen/x DEO2 |
|
476 |
+ #0018 ++ .Screen/addr DEO2 |
|
477 |
+ #21 STHr + .Screen/color DEO |
|
483 | 478 |
|
484 | 479 |
RTN |
485 | 480 |
|
... | ... |
@@ -489,34 +484,34 @@ RTN |
489 | 484 |
|
490 | 485 |
DUPr STHr |
491 | 486 |
|
492 |
- DUP #04 DIV SWP #04 MOD TOS PAD-WIDTH MUL2 ( center ) .pad-view/x1 PEK2 ADD2 |
|
493 |
- ROT TOS PAD-HEIGHT MUL2 ( center ) .pad-view/y1 PEK2 ADD2 |
|
487 |
+ DUP #04 / SWP #04 MOD TOS PAD-WIDTH ** ( center ) .pad-view/x1 PEK2 ++ |
|
488 |
+ ROT TOS PAD-HEIGHT ** ( center ) .pad-view/y1 PEK2 ++ |
|
494 | 489 |
|
495 | 490 |
( draw outline ) |
496 | 491 |
OVR2 OVR2 |
497 |
- OVR2 PAD-WIDTH #0002 SUB2 ADD2 |
|
498 |
- OVR2 PAD-HEIGHT #0002 SUB2 ADD2 |
|
492 |
+ OVR2 PAD-WIDTH #0002 -- ++ |
|
493 |
+ OVR2 PAD-HEIGHT #0002 -- ++ |
|
499 | 494 |
OVRr STHr ;line-rect JSR2 |
500 | 495 |
|
501 | 496 |
( draw name ) |
502 |
- OVR2 #0002 ADD2 |
|
503 |
- OVR2 #0002 ADD2 |
|
504 |
- #20 OVRr STHr ADD |
|
505 |
- ;pad-name DUPr STHr TOS #0005 MUL2 ADD2 |
|
497 |
+ OVR2 #0002 ++ |
|
498 |
+ OVR2 #0002 ++ |
|
499 |
+ #20 OVRr STHr + |
|
500 |
+ ;pad-name DUPr STHr TOS #0005 ** ++ |
|
506 | 501 |
;draw-label-left JSR2 |
507 | 502 |
|
508 | 503 |
( draw note ) |
509 |
- OVR2 #0003 ADD2 .Screen/x DEO2 |
|
510 |
- DUP2 #0014 ADD2 .Screen/y DEO2 |
|
511 |
- ( get pitch ) DUPr STHr TOS ;pad-pitch ADD2 LDA |
|
512 |
- #0c DIV TOS #0008 MUL2 ;font-hex ADD2 .Screen/addr DEO2 |
|
504 |
+ OVR2 #0003 ++ .Screen/x DEO2 |
|
505 |
+ DUP2 #0014 ++ .Screen/y DEO2 |
|
506 |
+ ( get pitch ) DUPr STHr TOS ;pad-pitch ++ LDA |
|
507 |
+ #0c / TOS #0008 ** ;font-hex ++ .Screen/addr DEO2 |
|
513 | 508 |
#21 .Screen/color DEO |
514 | 509 |
|
515 | 510 |
( draw octave ) |
516 |
- OVR2 #000b ADD2 .Screen/x DEO2 |
|
517 |
- DUP2 #0014 ADD2 .Screen/y DEO2 |
|
518 |
- ( get pitch ) DUPr STHr TOS ;pad-pitch ADD2 LDA |
|
519 |
- #0c MOD TOS #0008 MUL2 ;font-notes ADD2 .Screen/addr DEO2 |
|
511 |
+ OVR2 #000b ++ .Screen/x DEO2 |
|
512 |
+ DUP2 #0014 ++ .Screen/y DEO2 |
|
513 |
+ ( get pitch ) DUPr STHr TOS ;pad-pitch ++ LDA |
|
514 |
+ #0c MOD TOS #0008 ** ;font-notes ++ .Screen/addr DEO2 |
|
520 | 515 |
#21 .Screen/color DEO |
521 | 516 |
|
522 | 517 |
POP2 POP2 |
... | ... |
@@ -529,26 +524,26 @@ RTN |
529 | 524 |
|
530 | 525 |
.oct-view/x1 PEK2 .oct-view/y1 PEK2 |
531 | 526 |
|
532 |
- OVR2 OVR2 ;keys-left-icns #21 .piano/last PEK #00 EQU ADD ;draw-key JSR2 |
|
533 |
- OVR2 8+ OVR2 ;keys-middle-icns #21 .piano/last PEK #01 EQU ADD ;draw-key JSR2 |
|
534 |
- OVR2 #0010 ADD2 OVR2 ;keys-right-icns #21 .piano/last PEK #02 EQU ADD ;draw-key JSR2 |
|
535 |
- OVR2 #0018 ADD2 OVR2 ;keys-left-icns #21 .piano/last PEK #03 EQU ADD ;draw-key JSR2 |
|
536 |
- OVR2 #0020 ADD2 OVR2 ;keys-middle-icns #21 .piano/last PEK #04 EQU ADD ;draw-key JSR2 |
|
537 |
- OVR2 #0028 ADD2 OVR2 ;keys-middle-icns #21 .piano/last PEK #05 EQU ADD ;draw-key JSR2 |
|
538 |
- SWP2 #0030 ADD2 SWP2 ;keys-right-icns #21 .piano/last PEK #06 EQU ADD ;draw-key JSR2 |
|
527 |
+ OVR2 OVR2 ;keys-left-icns #21 .piano/last PEK #00 = + ;draw-key JSR2 |
|
528 |
+ OVR2 #0008 ++ OVR2 ;keys-middle-icns #21 .piano/last PEK #01 = + ;draw-key JSR2 |
|
529 |
+ OVR2 #0010 ++ OVR2 ;keys-right-icns #21 .piano/last PEK #02 = + ;draw-key JSR2 |
|
530 |
+ OVR2 #0018 ++ OVR2 ;keys-left-icns #21 .piano/last PEK #03 = + ;draw-key JSR2 |
|
531 |
+ OVR2 #0020 ++ OVR2 ;keys-middle-icns #21 .piano/last PEK #04 = + ;draw-key JSR2 |
|
532 |
+ OVR2 #0028 ++ OVR2 ;keys-middle-icns #21 .piano/last PEK #05 = + ;draw-key JSR2 |
|
533 |
+ SWP2 #0030 ++ SWP2 ;keys-right-icns #21 .piano/last PEK #06 = + ;draw-key JSR2 |
|
539 | 534 |
|
540 |
- .oct-view/x1 PEK2 #0040 ADD2 .Screen/x DEO2 |
|
535 |
+ .oct-view/x1 PEK2 #0040 ++ .Screen/x DEO2 |
|
541 | 536 |
|
542 | 537 |
;arrow-icns .Screen/addr DEO2 |
543 | 538 |
.oct-view/y1 PEK2 .Screen/y DEO2 |
544 | 539 |
#21 .Screen/color DEO |
545 | 540 |
|
546 |
- ;arrow-icns 8+ .Screen/addr DEO2 |
|
547 |
- .oct-view/y1 PEK2 #0010 ADD2 .Screen/y DEO2 |
|
541 |
+ ;arrow-icns #0008 ++ .Screen/addr DEO2 |
|
542 |
+ .oct-view/y1 PEK2 #0010 ++ .Screen/y DEO2 |
|
548 | 543 |
#21 .Screen/color DEO |
549 | 544 |
|
550 |
- ;font-hex .piano/octave PEK #03 ADD #00 SWP #0008 MUL2 ADD2 .Screen/addr DEO2 |
|
551 |
- .oct-view/y1 PEK2 8+ .Screen/y DEO2 |
|
545 |
+ ;font-hex .piano/octave PEK #03 + #00 SWP #0008 ** ++ .Screen/addr DEO2 |
|
546 |
+ .oct-view/y1 PEK2 #0008 ++ .Screen/y DEO2 |
|
552 | 547 |
#23 .Screen/color DEO |
553 | 548 |
|
554 | 549 |
RTN |
... | ... |
@@ -562,13 +557,13 @@ RTN |
562 | 557 |
|
563 | 558 |
#00 #0f |
564 | 559 |
&loop |
565 |
- OVR #10 SWP SUB DUPr STHr #0f AND LTH #01 ADD .Screen/color DEO |
|
566 |
- .Screen/x DEI2 #0002 ADD2 .Screen/x DEO2 |
|
567 |
- OVR #10 SWP SUB DUPr STHr #04 SFT LTH #01 ADD .Screen/color DEO |
|
568 |
- .Screen/x DEI2 #0002 SUB2 .Screen/x DEO2 |
|
569 |
- .Screen/y DEI2 #0002 ADD2 .Screen/y DEO2 |
|
570 |
- ( incr ) SWP #01 ADD SWP |
|
571 |
- DUP2 LTH ,&loop JNZ |
|
560 |
+ OVR #10 SWP - DUPr STHr #0f AND < #01 + .Screen/color DEO |
|
561 |
+ .Screen/x DEI2 #0002 ++ .Screen/x DEO2 |
|
562 |
+ OVR #10 SWP - DUPr STHr #04 SFT < #01 + .Screen/color DEO |
|
563 |
+ .Screen/x DEI2 #0002 -- .Screen/x DEO2 |
|
564 |
+ .Screen/y DEI2 #0002 ++ .Screen/y DEO2 |
|
565 |
+ ( incr ) SWP #01 + SWP |
|
566 |
+ DUP2 < ,&loop JNZ |
|
572 | 567 |
POP2 |
573 | 568 |
|
574 | 569 |
POPr |
... | ... |
@@ -580,13 +575,13 @@ RTN |
580 | 575 |
STH |
581 | 576 |
.Screen/addr DEO2 |
582 | 577 |
SWP2 .Screen/x DEO2 |
583 |
- DUP2 #0018 ADD2 |
|
578 |
+ DUP2 #0018 ++ |
|
584 | 579 |
&loop |
585 | 580 |
( move ) OVR2 .Screen/y DEO2 |
586 | 581 |
( draw ) DUPr STHr .Screen/color DEO |
587 |
- ( incr ) .Screen/addr DEI2 8+ .Screen/addr DEO2 |
|
588 |
- ( incr ) SWP2 8+ SWP2 |
|
589 |
- OVR2 OVR2 LTH2 ,&loop JNZ |
|
582 |
+ ( incr ) .Screen/addr DEI2 #0008 ++ .Screen/addr DEO2 |
|
583 |
+ ( incr ) SWP2 #0008 ++ SWP2 |
|
584 |
+ OVR2 OVR2 << ,&loop JNZ |
|
590 | 585 |
POP2 POP2 |
591 | 586 |
POPr |
592 | 587 |
|
... | ... |
@@ -607,23 +602,23 @@ RTN |
607 | 602 |
.pointer/x PEK2 .Screen/x DEO2 |
608 | 603 |
.pointer/y PEK2 .Screen/y DEO2 |
609 | 604 |
( colorize on state ) |
610 |
- #33 [ .Mouse/state DEI #00 NEQ ] SUB .Screen/color DEO |
|
605 |
+ #33 [ .Mouse/state DEI #00 ! ] - .Screen/color DEO |
|
611 | 606 |
|
612 | 607 |
RTN |
613 | 608 |
|
614 | 609 |
@draw-short ( addr color -- ) |
615 | 610 |
|
616 | 611 |
STH SWP |
617 |
- DUP #04 SFT TOS 8* ;font-hex ADD2 .Screen/addr DEO2 |
|
612 |
+ DUP #04 SFT TOS #0008 ** ;font-hex ++ .Screen/addr DEO2 |
|
618 | 613 |
( draw ) DUPr STHr .Screen/color DEO |
619 |
- #0f AND TOS 8* ;font-hex ADD2 .Screen/addr DEO2 |
|
620 |
- .Screen/x DEI2 8+ .Screen/x DEO2 |
|
614 |
+ #0f AND TOS #0008 ** ;font-hex ++ .Screen/addr DEO2 |
|
615 |
+ .Screen/x DEI2 #0008 ++ .Screen/x DEO2 |
|
621 | 616 |
( draw ) DUPr STHr .Screen/color DEO |
622 |
- DUP #04 SFT TOS 8* ;font-hex ADD2 .Screen/addr DEO2 |
|
623 |
- .Screen/x DEI2 8+ .Screen/x DEO2 |
|
617 |
+ DUP #04 SFT TOS #0008 ** ;font-hex ++ .Screen/addr DEO2 |
|
618 |
+ .Screen/x DEI2 #0008 ++ .Screen/x DEO2 |
|
624 | 619 |
( draw ) DUPr STHr .Screen/color DEO |
625 |
- #0f AND TOS 8* ;font-hex ADD2 .Screen/addr DEO2 |
|
626 |
- .Screen/x DEI2 8+ .Screen/x DEO2 |
|
620 |
+ #0f AND TOS #0008 ** ;font-hex ++ .Screen/addr DEO2 |
|
621 |
+ .Screen/x DEI2 #0008 ++ .Screen/x DEO2 |
|
627 | 622 |
( draw ) STHr .Screen/color DEO |
628 | 623 |
|
629 | 624 |
RTN |
... | ... |
@@ -631,21 +626,21 @@ RTN |
631 | 626 |
@line-rect ( x1 y1 x2 y2 color -- ) |
632 | 627 |
|
633 | 628 |
( load ) .color POK DUP2 STH2 .rect/y2 POK2 .rect/x2 POK2 DUP2 STH2 .rect/y1 POK2 .rect/x1 POK2 |
634 |
- STH2r #0001 ADD2 STH2r |
|
629 |
+ STH2r #0001 ++ STH2r |
|
635 | 630 |
&ver |
636 | 631 |
( save ) OVR2 .Screen/y DEO2 |
637 | 632 |
( draw ) .rect/x1 PEK2 .Screen/x DEO2 .color PEK DUP .Screen/color DEO |
638 | 633 |
( draw ) .rect/x2 PEK2 .Screen/x DEO2 .Screen/color DEO |
639 |
- ( incr ) SWP2 ++ SWP2 |
|
634 |
+ ( incr ) SWP2 #0001 ++ SWP2 |
|
640 | 635 |
OVR2 OVR2 LTS2 ,&ver JNZ |
641 | 636 |
POP2 POP2 |
642 |
- .rect/x1 PEK2 #0001 ADD2 .rect/x2 PEK2 #0001 SUB2 |
|
637 |
+ .rect/x1 PEK2 #0001 ++ .rect/x2 PEK2 #0001 -- |
|
643 | 638 |
&hor |
644 | 639 |
( save ) OVR2 .Screen/x DEO2 |
645 | 640 |
( draw ) .rect/y1 PEK2 .Screen/y DEO2 .color PEK DUP .Screen/color DEO |
646 | 641 |
( draw ) .rect/y2 PEK2 .Screen/y DEO2 .Screen/color DEO |
647 |
- ( incr ) SWP2 ++ SWP2 |
|
648 |
- OVR2 OVR2 ++ LTS2 ,&hor JNZ |
|
642 |
+ ( incr ) SWP2 #0001 ++ SWP2 |
|
643 |
+ OVR2 OVR2 #0001 ++ LTS2 ,&hor JNZ |
|
649 | 644 |
POP2 POP2 |
650 | 645 |
|
651 | 646 |
RTN |
... | ... |
@@ -655,10 +650,10 @@ RTN |
655 | 650 |
( load ) .label/addr POK2 .label/color POK .Screen/y DEO2 .Screen/x DEO2 |
656 | 651 |
.label/addr PEK2 |
657 | 652 |
&loop |
658 |
- ( draw ) DUP2 LDA #00 SWP #0030 SUB2 #0008 MUL2 ;font-num-uc ADD2 .Screen/addr DEO2 .label/color PEK .Screen/color DEO |
|
659 |
- ( incr ) #0001 ADD2 |
|
660 |
- ( incr ) .Screen/x DEI2 #0008 ADD2 .Screen/x DEO2 |
|
661 |
- DUP2 LDA #00 NEQ ,&loop JNZ |
|
653 |
+ ( draw ) DUP2 LDA #00 SWP #0030 -- #0008 ** ;font-num-uc ++ .Screen/addr DEO2 .label/color PEK .Screen/color DEO |
|
654 |
+ ( incr ) #0001 ++ |
|
655 |
+ ( incr ) .Screen/x DEI2 #0008 ++ .Screen/x DEO2 |
|
656 |
+ DUP2 LDA #00 ! ,&loop JNZ |
|
662 | 657 |
POP2 |
663 | 658 |
|
664 | 659 |
RTN |
... | ... |
@@ -673,10 +668,10 @@ RTN |
673 | 668 |
&hor |
674 | 669 |
( save ) OVR2 .Screen/x DEO2 |
675 | 670 |
( draw ) .color PEK .Screen/color DEO |
676 |
- ( incr ) SWP2 ++ SWP2 |
|
671 |
+ ( incr ) SWP2 #0001 ++ SWP2 |
|
677 | 672 |
OVR2 OVR2 LTS2 ,&hor JNZ |
678 | 673 |
POP2 POP2 STH2r STH2r |
679 |
- ( incr ) SWP2 ++ SWP2 |
|
674 |
+ ( incr ) SWP2 #0001 ++ SWP2 |
|
680 | 675 |
OVR2 OVR2 LTS2 ,&ver JNZ |
681 | 676 |
POP2 POP2 POP2 POP2 |
682 | 677 |
|