Dariaceli's Git
Browse code

Starting Orca

neauoire authored on 07/04/2021 04:34:11
Showing 3 changed files
projects/software/orca.usm
History View file @ 09571b1
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,247 @@
1 
+( Orca )
2 
+
3 
+%RTN { JMP2r }
4 
+%8* { #0008 MUL2 } %8/ { #0008 DIV2 }
5 
+
6 
+( variables )
7 
+
8 
+;timer { byte 1 frame 1 }
9 
+;grid { width 1 height 1 }
10 
+;selection { x1 1 y1 1 x2 1 y2 1 }
11 
+
12 
+( devices )
13 
+
14 
+|0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
15 
+|0110 ;Console { pad 8 char 1 byte 1 short 2 }
16 
+|0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 color 1 }
17 
+|0130 ;Sprite { vector 2 pad 6 x 2 y 2 addr 2 color 1 }
18 
+|0140 ;Controller { vector 2 button 1 }
19 
+|0150 ;Keys { vector 2 key 1 }
20 
+
21 
+|0200
22 
+
23 
+	( theme ) #0faf =System.r #0fff =System.g #0f5f =System.b
24 
+	( vectors ) ,on-button =Controller.vector
25 
+	( vectors ) ,on-key =Keys.vector
26 
+	( vectors ) ,on-frame =Screen.vector
27 
+
28 
+	( find size )
29 
+	~Screen.width 8/ SWP POP =grid.width
30 
+	~Screen.height 8/ SWP POP =grid.height
31 
+
32 
+	,redraw JSR2
33 
+
34 
+BRK
35 
+
36 
+@on-frame
37 
+
38 
+	~timer #01 ADD DUP =timer
39 
+
40 
+	#10 EQU ^$tick JNZ BRK $tick
41 
+
42 
+	,run JSR2
43 
+
44 
+	#00 =timer
45 
+	~timer.frame #01 ADD =timer.frame
46 
+
47 
+BRK
48 
+
49 
+@on-key
50 
+
51 
+	~Keys.key #00 NEQ ^$continue JNZ BRK $continue
52 
+
53 
+	~selection.x1 ~selection.y1 ~Keys.key ,put-char JSR2
54 
+
55 
+	( release ) #00 =Keys.key
56 
+
57 
+	,redraw JSR2
58 
+
59 
+BRK
60 
+
61 
+@on-button
62 
+
63 
+	( arrows )
64 
+	~Controller.button #f0 AND
65 
+		DUP #04 SFT #01 AND #01 NEQ ^$no-up JNZ
66 
+			~selection.y1 #01 SUB =selection.y1
67 
+			~selection.y2 #01 SUB =selection.y2 $no-up
68 
+		DUP #05 SFT #01 AND #01 NEQ ^$no-down JNZ
69 
+			~selection.y1 #01 ADD =selection.y1
70 
+			~selection.y2 #01 ADD =selection.y2 $no-down
71 
+		DUP #06 SFT #01 AND #01 NEQ ^$no-left JNZ
72 
+			~selection.x1 #01 SUB =selection.x1
73 
+			~selection.x2 #01 SUB =selection.x2 $no-left
74 
+		DUP #07 SFT #01 AND #01 NEQ ^$no-right JNZ
75 
+			~selection.x1 #01 ADD =selection.x1
76 
+			~selection.x2 #01 ADD =selection.x2 $no-right
77 
+	POP
78 
+	,redraw JSR2
79 
+
80 
+BRK
81 
+
82 
+@is-selected ( x y -- flag )
83 
+
84 
+	~selection.x1 ~selection.y1 EQU2
85 
+
86 
+RTN
87 
+
88 
+@put-char (x y char -- )
89 
+
90 
+	ROT ROT
91 
+
92 
+	#00 SWP #00 ~grid.width MUL2
93 
+
94 
+	ROT #00 SWP ADD2 ,data ADD2 POK2
95 
+
96 
+RTN
97 
+
98 
+@get-char ( x y -- char )
99 
+
100 
+	#00 SWP #00 ~grid.width MUL2
101 
+
102 
+	ROT #00 SWP ADD2 ,data ADD2 PEK2
103 
+
104 
+RTN
105 
+
106 
+@get-value ( x y -- value )
107 
+
108 
+	POP2 #01
109 
+
110 
+RTN
111 
+
112 
+@get-char-sprite ( x y -- addr )
113 
+
114 
+	,get-char JSR2 #20 SUB #00 SWP #0008 MUL2 ,font ADD2
115 
+
116 
+RTN
117 
+
118 
+@op-a ( x y char -- )
119 
+
120 
+	POP
121 
+
122 
+	( get left ) DUP2 SWP #01 SUB SWP ,get-value JSR2 STH
123 
+	( get right ) DUP2 SWP #01 ADD SWP ,get-value JSR2 STH
124 
+
125 
+	#01 ADD ADDr STHr ( remove this extra addition -> ) #30 ADD ,put-char JSR2
126 
+
127 
+RTN
128 
+
129 
+@op-b ( x y char -- )
130 
+
131 
+	POP POP2
132 
+
133 
+RTN
134 
+
135 
+@op-c ( x y char -- )
136 
+
137 
+	POP
138 
+	#01 ADD
139 
+	#30 ~timer.frame ADD ,put-char JSR2
140 
+
141 
+RTN
142 
+
143 
+@run-char ( x y char -- )
144 
+
145 
+	( A ) DUP #41 EQU ,op-a JNZ2
146 
+	( B ) DUP #42 EQU ,op-b JNZ2
147 
+	( C ) DUP #43 EQU ,op-c JNZ2
148 
+	POP POP2
149 
+
150 
+RTN
151 
+
152 
+@run
153 
+
154 
+	#00 ~grid.height
155 
+	$ver
156 
+		#00 ~grid.width
157 
+		$hor
158 
+			( get x,y ) SWP2 OVR STH SWP2 OVR STHr DUP2
159 
+			,get-char JSR2
160 
+			,run-char JSR2
161 
+			$next-char
162 
+			( incr )    SWP #01 ADD SWP
163 
+			DUP2 LTH ^$hor JNZ
164 
+		POP2
165 
+		( incr ) SWP #01 ADD SWP
166 
+		DUP2 LTH ^$ver JNZ
167 
+	POP2
168 
+
169 
+	,redraw JSR2
170 
+
171 
+RTN
172 
+
173 
+@redraw ( -- )
174 
+
175 
+	#00 ~grid.height
176 
+	$ver
177 
+		( pos-y ) OVR #00 SWP #0008 MUL2 =Sprite.y
178 
+		#00 ~grid.width
179 
+		$hor
180 
+			( pos-x )   OVR #00 SWP #0008 MUL2 =Sprite.x
181 
+			( get x,y ) SWP2 OVR STH SWP2 OVR STHr
182 
+			( sprite )  DUP2 ,get-char-sprite JSR2 =Sprite.addr
183 
+			( draw )    ,is-selected JSR2 #08 MUL #01 ADD =Sprite.color
184 
+			( incr )    SWP #01 ADD SWP
185 
+			DUP2 LTH ^$hor JNZ
186 
+		POP2
187 
+		( incr ) SWP #01 ADD SWP
188 
+		DUP2 LTH ^$ver JNZ
189 
+	POP2
190 
+
191 
+RTN
192 
+
193 
+@blank_icn [ ffff ffff ffff ffff ]
194 
+
195 
+@font ( specter8-frag font )
196 
+[
197 
+	0000 0000 0000 0000 0008 0808 0800 0800
198 
+	0014 1400 0000 0000 0024 7e24 247e 2400
199 
+	0008 1e28 1c0a 3c08 0000 2204 0810 2200
200 
+	0030 4832 4c44 3a00 0008 1000 0000 0000
201 
+	0004 0808 0808 0400 0020 1010 1010 2000
202 
+	0000 2214 0814 2200 0000 0808 3e08 0800
203 
+	0000 0000 0000 0810 0000 0000 3e00 0000
204 
+	0000 0000 0000 0800 0000 0204 0810 2000
205 
+	003c 464a 5262 3c00 0018 0808 0808 1c00
206 
+	003c 4202 3c40 7e00 003c 421c 0242 3c00
207 
+	000c 1424 447e 0400 007e 407c 0242 3c00
208 
+	003c 407c 4242 3c00 007e 0204 0810 1000
209 
+	003c 423c 4242 3c00 003c 4242 3e02 3c00
210 
+	0000 0010 0000 1000 0000 1000 0010 1020
211 
+	0000 0810 2010 0800 0000 003e 003e 0000
212 
+	0000 1008 0408 1000 003c 420c 1000 1000
213 
+	003c 4232 4a42 3c00 003c 4242 7e42 4200
214 
+	007c 427c 4242 7c00 003c 4240 4042 3c00
215 
+	007c 4242 4242 7c00 007e 4078 4040 7e00
216 
+	007e 4078 4040 4000 003c 4240 4642 3c00
217 
+	0042 427e 4242 4200 001c 0808 0808 1c00
218 
+	007e 0202 0242 3c00 0042 4478 4442 4200
219 
+	0040 4040 4040 7e00 0042 665a 4242 4200
220 
+	0042 6252 4a46 4200 003c 4242 4242 3c00
221 
+	007c 4242 7c40 4000 003c 4242 4244 3a00
222 
+	007c 4242 7c44 4200 003e 403c 0242 3c00
223 
+	007e 0808 0808 1000 0042 4242 4244 3a00
224 
+	0042 4242 4224 1800 0042 4242 5a66 4200
225 
+	0042 423c 4242 4200 0042 423e 0242 3c00
226 
+	007e 020c 3040 7e00 000c 0808 0808 0c00
227 
+	0040 2010 0804 0200 0030 1010 1010 3000
228 
+	0008 1400 0000 0000 0000 0000 0000 7e00
229 
+	0008 0400 0000 0000 0000 3c02 3e42 3a00
230 
+	0040 407c 4242 7c00 0000 3c42 4042 3c00
231 
+	0002 023e 4242 3e00 0000 3c42 7e40 3e00
232 
+	0000 3e40 7840 4000 0000 3c42 3e02 3c00
233 
+	0040 405c 6242 4200 0008 0018 0808 0400
234 
+	0008 0018 0808 4830 0040 4244 7844 4200
235 
+	0010 1010 1010 0c00 0000 6c52 5252 5200
236 
+	0000 5c62 4242 4200 0000 3c42 4242 3c00
237 
+	0000 7c42 427c 4040 0000 3e42 423e 0202
238 
+	0000 5c62 4040 4000 0000 3e40 3c02 7c00
239 
+	0008 7e08 0808 1000 0000 4242 4244 3a00
240 
+	0000 4242 4224 1800 0000 5252 5252 2e00
241 
+	0000 4224 1824 4200 0000 4242 3e02 7c00
242 
+	0000 7e02 3c40 7e00 000c 0810 1008 0c00
243 
+	0008 0808 0808 0800 0030 1008 0810 3000
244 
+	0000 0032 4c00 0000 3c42 99a1 a199 423c
245 
+]
246 
+
247 
+@data [ elephant ]
0 248 
\ No newline at end of file
projects/tests/basics.usm
History View file @ 09571b1
... ... 
@@ -4,13 +4,12 @@
4 4
5 5 
 ( devices )
6 6
7 
-|0100 ;Console { pad 8 char 1 byte 1 short 2 }
8 
-|01F0 .RESET .FRAME .ERROR ( vectors )
9 
-|01F8 [ 13fd 1ef3 1bf2 ] ( palette )
7 
+|0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
8 
+|0110 ;Console { pad 8 char 1 byte 1 short 2 }
10 9
11 10 
 ( program )
12 11
13 
-|0400 @RESET
12 
+|0200
14 13
15 14 
 	( for loop )
16 15 
 	#00 #0d
... ... 
@@ -41,6 +40,3 @@
41 40 
 	POP
42 41
43 42 
 BRK
44 
-
45 
-@FRAME BRK
46 
-@ERROR BRK
47 43 
\ No newline at end of file
src/emulator.c
History View file @ 09571b1
... ... 
@@ -595,18 +595,15 @@ start(Uxn *u)
595 595 
 				domouse(u, &event);
596 596 
 				evaluxn(u, devmouse->vector);
597 597 
 				break;
598 
-			case SDL_TEXTINPUT:
599 
-				dotext(u, &event);
600 
-				evaluxn(u, devkey->vector);
601 
-				break;
602 598 
 			case SDL_KEYDOWN:
603 
-				doctrl(u, &event, 1);
604 
-				evaluxn(u, devctrl->vector);
605 
-				break;
606 599 
 			case SDL_KEYUP:
607 
-				doctrl(u, &event, 0);
600 
+				doctrl(u, &event, event.type == SDL_KEYDOWN);
608 601 
 				evaluxn(u, devctrl->vector);
609 602 
 				break;
603 
+			case SDL_TEXTINPUT:
604 
+				dotext(u, &event);
605 
+				evaluxn(u, devkey->vector);
606 
+				break;
610 607 
 			case SDL_WINDOWEVENT:
611 608 
 				if(event.window.event == SDL_WINDOWEVENT_EXPOSED)
612 609 
 					redraw(pixels, u);