Dariaceli's Git
Browse code

Removed a few unused in drumrack

neauoire authored on 03/05/2021 23:38:11
Showing 1 changed files
projects/demos/drum-rack.usm
History View file @ ce00dc2
... ... 
@@ -1,8 +1,6 @@
1 1 
 ( drum rack
2 2
3 3 
 	TODO
4 
-		- Change pitch of sample
5 
-		- Draw pad pitch on pad
6 4 
 		- When selecting a pad, should highlight note in octave
7 5 
 )
8 6
... ... 
@@ -21,7 +19,6 @@
21 19
22 20 
 %PAD-WIDTH { #0030 }
23 21 
 %PAD-HEIGHT { #0020 }
24 
-%STATE-LENGTH { #04 }
25 22
26 23 
 ( devices )
27 24
... ... 
@@ -44,7 +41,6 @@
44 41
45 42 
 @piano [ &last $1 &octave $1 ]
46 43
47 
-@last-note $1
48 44 
 @last $1
49 45 
 @color $1
50 46 
 @center      [ &x $2 &y $2 ]
... ... 
@@ -53,18 +49,10 @@
53 49 
 @rect        [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
54 50 
 @frame       [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
55 51 
 @label       [ &x $2 &y $2 &color $1 &addr $2 ]
56 
-@pos         [ &x $2 &y $2 ]
57 
-@pad-view     [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
58 
-@mix-view     [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
59 
-@oct-view     [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
60 
-@wav-view     [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
61 
-
62 
-@state [ ( addr length )
63 
-	$4 $4 $4 $4
64 
-	$4 $4 $4 $4
65 
-	$4 $4 $4 $4
66 
-	$4 $4 $4 $4
67 
-]
52 
+@pad-view    [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
53 
+@mix-view    [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
54 
+@oct-view    [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
55 
+@wav-view    [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
68 56
69 57 
 @modes [ $1 $1 $1 $1 ] ( single/repeat )
70 58
... ... 
@@ -95,7 +83,7 @@
95 83 
 	#1000 .Audio3/length DEO2
96 84
97 85 
 	#01 .modes POK
98 
-	#03 .piano/octave POK
86 
+	#01 .piano/octave POK
99 87
100 88 
 	;load-samples JSR2
101 89
... ... 
@@ -309,7 +297,7 @@ BRK
309 297 
 		DUP2 ;notes ADD2 LDA .last PEK SWP .piano/octave PEK #02 SUB #0c MUL ADD ;set-pitch JSR2
310 298
311 299 
 		( record last note )
312 
-		SWP POP .last-note POK
300 
+		SWP POP .piano/last POK
313 301 
 		.last PEK ;play-pad JSR2
314 302
315 303 
 		( release ) #00 .Mouse/state DEO
... ... 
@@ -541,13 +529,13 @@ RTN
541 529
542 530 
 	.oct-view/x1 PEK2 .oct-view/y1 PEK2
543 531
544 
-	OVR2 OVR2 ;keys-left-icns #21 .last-note PEK #00 EQU ADD ;draw-key JSR2
545 
-	OVR2 8+ OVR2 ;keys-middle-icns #21 .last-note PEK #01 EQU ADD ;draw-key JSR2
546 
-	OVR2 #0010 ADD2 OVR2 ;keys-right-icns #21 .last-note PEK #02 EQU ADD ;draw-key JSR2
547 
-	OVR2 #0018 ADD2 OVR2 ;keys-left-icns #21 .last-note PEK #03 EQU ADD ;draw-key JSR2
548 
-	OVR2 #0020 ADD2 OVR2 ;keys-middle-icns #21 .last-note PEK #04 EQU ADD ;draw-key JSR2
549 
-	OVR2 #0028 ADD2 OVR2 ;keys-middle-icns #21 .last-note PEK #05 EQU ADD ;draw-key JSR2
550 
-	SWP2 #0030 ADD2 SWP2 ;keys-right-icns #21 .last-note PEK #06 EQU ADD ;draw-key JSR2
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
551 539
552 540 
 	.oct-view/x1 PEK2 #0040 ADD2 .Screen/x DEO2
553 541
... ... 
@@ -774,24 +762,6 @@ RTN
774 762 
 	07 06 05 03 02 01 00 00
775 763 
 	00 00 01 02 03 05 06 07 ]
776 764
777 
-@meter [
778 
-	0000 0000 0000 0000
779 
-	0000 0000 0000 0070
780 
-	0000 0000 0000 007e
781 
-	0000 0000 0000 707e
782 
-	0000 0000 0070 7e7e
783 
-	0000 0000 007e 7e7e
784 
-	0000 0000 707e 7e7e
785 
-	0000 0000 7e7e 7e7e
786 
-	0000 0070 7e7e 7e7e
787 
-	0000 007e 7e7e 7e7e
788 
-	0000 707e 7e7e 7e7e
789 
-	0000 7e7e 7e7e 7e7e
790 
-	0070 7e7e 7e7e 7e7e
791 
-	007e 7e7e 7e7e 7e7e
792 
-	707e 7e7e 7e7e 7e7e
793 
-	7e7e 7e7e 7e7e 7e7e ]
794 
-
795 765 
 @font-notes [
796 766 
 	003e 4140 4040 413e
797 767 
 	40ae 4100 4040 413e