Dariaceli's Git
Browse code

Progress on Nasu

neauoire authored on 04/03/2021 01:43:39
Showing 1 changed files
examples/app.nasu.usm
History View file @ 227f546
... ... 
@@ -5,31 +5,26 @@
5 5 
 &Controller { buttons 1 }
6 6 
 &Mouse      { x 2 y 2 state 1 chord 1 }
7 7
8 
-&Label2d { x 2 y 2 color 1 addr 2 }
9 8 
 &Rect2d  { x1 2 y1 2 x2 2 y2 2 }
10 9 
 &Point2d { x 2 y 2 }
11 10 
 &Point { x 1 y 1 }
12 11
13 12 
 &BankView  { x 2 y 2 addr 2 }
14 13 
 &TileView  { x 2 y 2 addr 2 }
15 
-&OverView  { x 2 y 2 addr 2 }
16 14
17 
-;label Label2d
18 15 
 ;bankview BankView
19 16 
 ;tileview TileView
20 
-;overview OverView
21 17 
 ;rect Rect2d
22 18 
 ;mouse Point2d
23 19 
 ;color 1
24 
-;i 1 ;j 2
20 
+;i 1
25 21 
 ;pt Point
26 22 
 ;addr 2
27 23
28 24 
 |0100 @RESET
29 25
30 
-	#0010 =bankview.x #0060 =bankview.y ,bank1 =bankview.addr
31 
-	#00b0 =tileview.x #0060 =tileview.y ,bank1 #0448 ADD2 =tileview.addr
32 
-	#0010 =overview.x #0010 =overview.y
26 
+	~dev/screen.width #0002 DIV2 #0098 SUB2 =bankview.x ~dev/screen.height #0002 DIV2 #0040 SUB2 =bankview.y ,bank1 =bankview.addr
27 
+	~dev/screen.width #0002 DIV2 #0008 SUB2 =tileview.x ~dev/screen.height #0002 DIV2 #0040 SUB2 =tileview.y ,bank1 #0448 ADD2 =tileview.addr
33 28
34 29 
 	,redraw JSR
35 30
... ... 
@@ -40,15 +35,29 @@ BRK
40 35 
 	,no-ctrl ~dev/ctrl.buttons #00 EQU JMP? POP2
41 36
42 37 
 		,no-ctrl-up ~dev/ctrl.buttons #10 EQU JMP? POP2
43 
-			~tileview.addr #0008 ADD2 =tileview.addr
38 
+			~tileview.addr #0080 ADD2 =tileview.addr
39 
+			~tileview.addr #0800 DIV2 #0800 MUL2 =bankview.addr
44 40 
 			,redraw JSR
45 41 
 		@no-ctrl-up
46 42
47 43 
 		,no-ctrl-down ~dev/ctrl.buttons #20 EQU JMP? POP2
48 
-			~tileview.addr #0008 SUB2 =tileview.addr
44 
+			~tileview.addr #0080 SUB2 =tileview.addr
45 
+			~tileview.addr #0800 DIV2 #0800 MUL2 =bankview.addr
49 46 
 			,redraw JSR
50 47 
 		@no-ctrl-down
51 48
49 
+		,no-ctrl-left ~dev/ctrl.buttons #40 EQU JMP? POP2
50 
+			~tileview.addr #0008 ADD2 =tileview.addr
51 
+			~tileview.addr #0800 DIV2 #0800 MUL2 =bankview.addr
52 
+			,redraw JSR
53 
+		@no-ctrl-left
54 
+
55 
+		,no-ctrl-right ~dev/ctrl.buttons #80 EQU JMP? POP2
56 
+			~tileview.addr #0008 SUB2 =tileview.addr
57 
+			~tileview.addr #0800 DIV2 #0800 MUL2 =bankview.addr
58 
+			,redraw JSR
59 
+		@no-ctrl-right
60 
+
52 61 
 	@no-ctrl
53 62
54 63 
 	,no-click ~dev/mouse.state #00 EQU JMP? POP2
... ... 
@@ -63,8 +72,6 @@ BRK
63 72 
 		~bankview.addr ADD2 =tileview.addr
64 73 
 		,redraw JSR
65 74
66 
-
67 
-
68 75 
 	@no-click
69 76
70 77 
 	,draw-cursor JSR
... ... 
@@ -75,7 +82,6 @@ BRK
75 82
76 83 
 	,draw-bankview JSR
77 84 
 	,draw-tileview JSR
78 
-	,draw-overview JSR
79 85
80 86 
 RTS
81 87
... ... 
@@ -128,7 +134,12 @@ RTS
128 134
129 135 
 @draw-tileview
130 136
131 
-	~tileview.x #0002 SUB2 ~tileview.y #0002 SUB2 ~tileview.x #0081 ADD2 ~tileview.y #0081 ADD2 #03 ,line-rect JSR
137 
+	~tileview.x #0002 SUB2 ~tileview.y #0002 SUB2 ~tileview.x #0080 ADD2 ~tileview.y #0081 ADD2 #03 ,line-rect JSR
138 
+
139 
+	~tileview.x #0028 ADD2 =dev/sprite.x
140 
+	~tileview.y #0010 SUB2 =dev/sprite.y
141 
+	~tileview.addr =dev/sprite.addr
142 
+	#03 =dev/sprite.color
132 143
133 144 
 	( position )
134 145
... ... 
@@ -158,45 +169,74 @@ RTS
158 169 
 	~tileview.addr #0008 ADD2 =tileview.addr
159 170 
 	,draw-tileview-icn JSR
160 171
161 
-	~tileview.addr #0018 SUB2 =tileview.addr
162 
-
163 
-RTS
172 
+	( line hor )
173 
+	~tileview.y #003f ADD2 =dev/screen.y
174 
+	~tileview.x =dev/screen.x
175 
+	@draw-hor
176 
+		( draw ) #03 =dev/screen.color
177 
+		( incr ) ~dev/screen.x #0002 ADD2 =dev/screen.x
178 
+	~dev/screen.x ~tileview.x #0082 ADD2 LTH2 ,draw-hor ROT JMP? POP2
164 179
165 
-@draw-overview
180 
+	( line ver )
181 
+	~tileview.y =dev/screen.y
182 
+	~tileview.x #003f ADD2 =dev/screen.x
183 
+	@draw-ver
184 
+		( draw ) #03 =dev/screen.color
185 
+		( incr ) ~dev/screen.y #0002 ADD2 =dev/screen.y
186 
+	~dev/screen.y ~tileview.y #0081 ADD2 LTH2 ,draw-ver ROT JMP? POP2
166 187
167 
-	~overview.x =dev/sprite.x ~overview.y =dev/sprite.y
168 
-	#00 =pt.x #00 =pt.y ~tileview.addr =dev/sprite.addr
188 
+	( rewind ) ~tileview.addr #0018 SUB2 =tileview.addr
169 189
170 
-	( draw hor line )
171 
-	#0040 =dev/screen.y
172 
-	#0000 =dev/screen.x
173 
-	@draw-ver
174 
-		( draw ) #02 =dev/screen.color
175 
-		( incr ) ~dev/screen.x #0002 ADD2 =dev/screen.x
176 
-	~dev/screen.x ~tileview.x ~dev/screen.width ADD2 LTH2 ,draw-ver ROT JMP? POP2
190 
+	( bytes )
177 191
178 
-	( draw ver line )
179 
-	#0000 =dev/screen.y
180 
-	#0040 =dev/screen.x
181 
-	@draw-hor
182 
-		( draw ) #02 =dev/screen.color
183 
-		( incr ) ~dev/screen.y #0002 ADD2 =dev/screen.y
184 
-	~dev/screen.y #0040 LTH2 ,draw-hor ROT JMP? POP2
192 
+	~tileview.y #0018 ADD2 =dev/sprite.y
193 
+	#00 =i
194 
+	@draw-tileview-bytes
195 
+		~tileview.x #0090 ADD2 =dev/sprite.x
196 
+		,font_hex #00 ~tileview.addr #00 ~i ADD2 LDR #f0 AND #04 ROR #08 MUL ADD2 =dev/sprite.addr
197 
+		( draw ) #02 =dev/sprite.color
198 
+		~dev/sprite.x #0008 ADD2 =dev/sprite.x
199 
+		,font_hex #00 ~tileview.addr #00 ~i ADD2 LDR #0f AND #08 MUL ADD2 =dev/sprite.addr
200 
+		( draw ) #02 =dev/sprite.color
201 
+		( incr ) ~i #01 ADD =i
202 
+		( incr ) ~dev/sprite.y #0008 ADD2 =dev/sprite.y
203 
+	,draw-tileview-bytes ~i #08 LTH JMP? POP2
185 204
186 
-	( body )
205 
+	~tileview.y =dev/sprite.y
206 
+	#00 =pt.x #00 =pt.y ~tileview.addr =dev/sprite.addr
187 207
188 
-	@draw-overview-tiles-ver
208 
+	@draw-tileview-tiles-ver
189 209 
 		#00 =pt.x
190 
-		~overview.x =dev/sprite.x
191 
-		@draw-overview-tiles-hor
192 
-			( draw ) #01 =dev/sprite.color
210 
+		~tileview.x #0090 ADD2 =dev/sprite.x
211 
+		@draw-tileview-tiles-hor
212 
+			( draw ) #03 =dev/sprite.color
193 213 
 			( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x
194 214 
 			( incr ) ~dev/sprite.addr #0008 ADD2 =dev/sprite.addr
195 215 
 			( incr ) ~pt.x #01 ADD =pt.x
196 
-			,draw-overview-tiles-hor ~pt.x #04 LTH JMP? POP2
216 
+			,draw-tileview-tiles-hor ~pt.x #02 LTH JMP? POP2
197 217 
 		( incr ) ~pt.y #01 ADD =pt.y
198 218 
 		( incr ) ~dev/sprite.y #0008 ADD2 =dev/sprite.y
199 
-		,draw-overview-tiles-ver ~pt.y #04 LTH JMP? POP2
219 
+		,draw-tileview-tiles-ver ~pt.y #02 LTH JMP? POP2
220 
+
221 
+	( toolbar )
222 
+
223 
+	~tileview.x =dev/sprite.x
224 
+	~tileview.y #0083 ADD2 =dev/sprite.y
225 
+	,tool_selector =dev/sprite.addr
226 
+	#01 =dev/sprite.color
227 
+
228 
+	~dev/sprite.x #0008 ADD2 =dev/sprite.x
229 
+	,tool_hand =dev/sprite.addr
230 
+	#02 =dev/sprite.color
231 
+
232 
+	~dev/sprite.x #0008 ADD2 =dev/sprite.x
233 
+	,tool_eraser =dev/sprite.addr
234 
+	#02 =dev/sprite.color
235 
+
236 
+	~dev/sprite.x #0008 ADD2 =dev/sprite.x
237 
+	,tool_copy =dev/sprite.addr
238 
+	#02 =dev/sprite.color
239 
+
200 240
201 241 
 RTS
202 242
... ... 
@@ -207,7 +247,7 @@ RTS
207 247 
 		#00 =pt.x
208 248 
 		@redraw-hor
209 249 
 			( get bit )
210 
-			,cell0_icn #00
250 
+			,blank_icn #00
211 251 
 			~tileview.addr #00 ~pt.y ADD2 LDR #07 ~pt.x SUB ROR #01 AND ( get bit )
212 252 
 			#0008 MUL2 ADD2 =dev/sprite.addr ( add *8 )
213 253 
 			( draw ) #01 =dev/sprite.color
... ... 
@@ -229,7 +269,7 @@ RTS
229 269 
 	#0000 EQU2 RTS? ( Return if unchanged )
230 270
231 271 
 	( clear last cursor )
232 
-	#10 ,clear_icn ~mouse.x ~mouse.y ,draw-sprite JSR
272 
+	#10 ,blank_icn ~mouse.x ~mouse.y ,draw-sprite JSR
233 273 
 	( record mouse positions )
234 274 
 	~dev/mouse.x =mouse.x ~dev/mouse.y =mouse.y
235 275 
 	#12 ,cursor_icn ~mouse.x ~mouse.y ,draw-sprite JSR
... ... 
@@ -255,20 +295,6 @@ RTS
255 295
256 296 
 ( Utils )
257 297
258 
-@fill-rect ( x1 y1 x2 y2 color )
259 
-
260 
-	( load ) =color =rect.y2 =rect.x2 DUP2 =dev/screen.y =rect.y1 DUP2 =dev/screen.x =rect.x1
261 
-	@fill-rect-ver
262 
-		~rect.x1 =dev/screen.x
263 
-		@fill-rect-hor
264 
-			( draw ) ~color =dev/screen.color
265 
-			( incr ) ~dev/screen.x #0001 ADD2 =dev/screen.x
266 
-			,fill-rect-hor ~dev/screen.x ~rect.x2 LTH2 JMP? POP2
267 
-		( incr ) ~dev/screen.y #0001 ADD2 =dev/screen.y
268 
-		,fill-rect-ver ~dev/screen.y ~rect.y2 LTH2 JMP? POP2
269 
-
270 
-RTS
271 
-
272 298 
 @line-rect ( x1 y1 x2 y2 color )
273 299
274 300 
 	( load ) =color =rect.y2 =rect.x2 DUP2 =dev/screen.y =rect.y1 DUP2 =dev/screen.x =rect.x1
... ... 
@@ -286,19 +312,6 @@ RTS
286 312
287 313 
 RTS
288 314
289 
-@draw-label-left ( x y color addr )
290 
-
291 
-	( load ) =label.addr =label.color =dev/sprite.y =dev/sprite.x
292 
-	~label.addr
293 
-	@draw-label-left-loop
294 
-		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =dev/sprite.addr ~label.color =dev/sprite.color
295 
-		( incr ) #0001 ADD2
296 
-		( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x
297 
-		DUP2 #0001 ADD2  LDR #00 NEQ ,draw-label-left-loop ROT JMP? POP2
298 
-	POP2
299 
-
300 
-RTS
301 
-
302 315 
 @draw-sprite
303 316
304 317 
 	=dev/sprite.y
... ... 
@@ -308,13 +321,13 @@ RTS
308 321
309 322 
 RTS
310 323
311 
-@cell0_icn   [ 0000 0000 0000 0000 ]
312 
-@cell1_icn   [ 7cfe fefe fefe 7c00 ]
324 
+@tool_selector [ 80c0 e0f0 f8e0 1000 ]
325 
+@tool_hand     [ 4040 4070 f8f8 f870 ]
326 
+@tool_eraser   [ 0814 2244 a850 2d00 ]
327 
+@tool_copy     [ 5824 5a42 4242 3c00 ]
313 328
314 
-@bank_txt    [ BANKVIEW 00 ]
315 
-@tile_txt    [ TILEVIEW 00 ]
316 
-@over_txt    [ OVERVIEW 00 ]
317 
-@clear_icn   [ 0000 0000 0000 0000 ]
329 
+@blank_icn   [ 0000 0000 0000 0000 ]
330 
+@cell1_icn   [ 7cfe fefe fefe 7c00 ]
318 331 
 @cursor_icn  [ 80c0 e0f0 f8e0 1000 ]
319 332
320 333 
 @font_hex ( 0-F )
... ... 
@@ -329,42 +342,6 @@ RTS
329 342 
 	7c82 80f0 8082 7c00 7c82 80f0 8080 8000
330 343 
 ]
331 344
332 
-@font ( spectrum-zx font )
333 
-[
334 
-	0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
335 
-	0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
336 
-	007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
337 
-	0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
338 
-	0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
339 
-	003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
340 
-	0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
341 
-	0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
342 
-	0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
343 
-	0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
344 
-	0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
345 
-	0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
346 
-	003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
347 
-	0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
348 
-	003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
349 
-	0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
350 
-	003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
351 
-	0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
352 
-	0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
353 
-	0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
354 
-	007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
355 
-	00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
356 
-	0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
357 
-	0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
358 
-	0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
359 
-	0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
360 
-	0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
361 
-	0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
362 
-	0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
363 
-	0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
364 
-	0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
365 
-	0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
366 
-]
367 
-
368 345 
 |E000 @bank1
369 346 
 [
370 347 
 	0103 070f 1f3f 7fff 0000 0000 0000 0000
... ... 
@@ -497,7 +474,42 @@ RTS
497 474 
 	bcb2 b2b2 bcb0 3000 0000 0000 0000 0000
498 475 
 ]
499 476
500 
-|F300 @bank2
477 
+|E800 @bank2 [
478 
+
479 
+	0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
480 
+	0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
481 
+	007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
482 
+	0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
483 
+	0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
484 
+	003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
485 
+	0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
486 
+	0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
487 
+	0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
488 
+	0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
489 
+	0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
490 
+	0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
491 
+	003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
492 
+	0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
493 
+	003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
494 
+	0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
495 
+	003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
496 
+	0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
497 
+	0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
498 
+	0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
499 
+	007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
500 
+	00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
501 
+	0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
502 
+	0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
503 
+	0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
504 
+	0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
505 
+	0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
506 
+	0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
507 
+	0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
508 
+	0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
509 
+	0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
510 
+	0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
511 
+
512 
+]
501 513 
 |F500 @bank3
502 514 
 |F700 @bank4
503 515