commit 1bda3b7
Devine Lu Linvega
·
2023-04-10 17:47:05 +0000 UTC
parent a60a2a0
(screen) Ported screen to use PEEK2
3 files changed,
+36,
-33
+34,
-31
1@@ -53,6 +53,15 @@ screen_blit(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8
2 }
3 }
4
5+static void
6+screen_wipe(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y)
7+{
8+ int v, h;
9+ for(v = 0; v < 8; v++)
10+ for(h = 0; h < 8; h++)
11+ screen_write(p, layer, x + h, y + v, 0);
12+}
13+
14 static void
15 layer_clear(UxnScreen *p, Layer *layer)
16 {
17@@ -122,14 +131,14 @@ clamp(int val, int min, int max)
18 /* IO */
19
20 Uint8
21-screen_dei(Uint8 *d, Uint8 port)
22+screen_dei(Uxn *u, Uint8 addr)
23 {
24- switch(port) {
25- case 0x2: return uxn_screen.width >> 8;
26- case 0x3: return uxn_screen.width;
27- case 0x4: return uxn_screen.height >> 8;
28- case 0x5: return uxn_screen.height;
29- default: return d[port];
30+ switch(addr) {
31+ case 0x22: return uxn_screen.width >> 8;
32+ case 0x23: return uxn_screen.width;
33+ case 0x24: return uxn_screen.height >> 8;
34+ case 0x25: return uxn_screen.height;
35+ default: return u->dev[addr];
36 }
37 }
38
39@@ -138,49 +147,43 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
40 {
41 switch(port) {
42 case 0x3:
43- if(!FIXED_SIZE) {
44- Uint16 w;
45- PEKDEV(w, 0x2);
46- screen_resize(&uxn_screen, clamp(w, 1, 1024), uxn_screen.height);
47- }
48+ if(!FIXED_SIZE)
49+ screen_resize(&uxn_screen, clamp(PEEK2(d + 2), 1, 1024), uxn_screen.height);
50 break;
51 case 0x5:
52- if(!FIXED_SIZE) {
53- Uint16 h;
54- PEKDEV(h, 0x4);
55- screen_resize(&uxn_screen, uxn_screen.width, clamp(h, 1, 1024));
56- }
57+ if(!FIXED_SIZE)
58+ screen_resize(&uxn_screen, uxn_screen.width, clamp(PEEK2(d + 4), 1, 1024));
59 break;
60 case 0xe: {
61- Uint16 x, y;
62+ Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa);
63 Uint8 layer = d[0xe] & 0x40;
64- PEKDEV(x, 0x8);
65- PEKDEV(y, 0xa);
66 screen_write(&uxn_screen, layer ? &uxn_screen.fg : &uxn_screen.bg, x, y, d[0xe] & 0x3);
67- if(d[0x6] & 0x01) POKDEV(0x8, x + 1); /* auto x+1 */
68- if(d[0x6] & 0x02) POKDEV(0xa, y + 1); /* auto y+1 */
69+ if(d[0x6] & 0x01) POKE2(d + 0x8, x + 1); /* auto x+1 */
70+ if(d[0x6] & 0x02) POKE2(d + 0xa, y + 1); /* auto y+1 */
71 break;
72 }
73 case 0xf: {
74- Uint16 x, y, dx, dy, addr;
75+ Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa), dx, dy, addr = PEEK2(d + 0xc);
76 Uint8 i, n, twobpp = !!(d[0xf] & 0x80);
77 Layer *layer = (d[0xf] & 0x40) ? &uxn_screen.fg : &uxn_screen.bg;
78- PEKDEV(x, 0x8);
79- PEKDEV(y, 0xa);
80- PEKDEV(addr, 0xc);
81 n = d[0x6] >> 4;
82 dx = (d[0x6] & 0x01) << 3;
83 dy = (d[0x6] & 0x02) << 2;
84 if(addr > 0x10000 - ((n + 1) << (3 + twobpp)))
85 return;
86 for(i = 0; i <= n; i++) {
87- screen_blit(&uxn_screen, layer, x + dy * i, y + dx * i, &ram[addr], d[0xf] & 0xf, d[0xf] & 0x10, d[0xf] & 0x20, twobpp);
88- addr += (d[0x6] & 0x04) << (1 + twobpp);
89+ if(!(d[0xf] & 0xf))
90+ screen_wipe(&uxn_screen, layer, x + dy * i, y + dx * i);
91+ else {
92+ screen_blit(&uxn_screen, layer, x + dy * i, y + dx * i, &ram[addr], d[0xf] & 0xf, d[0xf] & 0x10, d[0xf] & 0x20, twobpp);
93+ addr += (d[0x6] & 0x04) << (1 + twobpp);
94+ }
95 }
96- POKDEV(0xc, addr); /* auto addr+length */
97- POKDEV(0x8, x + dx); /* auto x+8 */
98- POKDEV(0xa, y + dy); /* auto y+8 */
99+ POKE2(d + 0xc, addr); /* auto addr+length */
100+ POKE2(d + 0x8, x + dx); /* auto x+8 */
101+ POKE2(d + 0xa, y + dy); /* auto y+8 */
102 break;
103 }
104 }
105 }
106+
+1,
-1
1@@ -28,6 +28,6 @@ void screen_resize(UxnScreen *p, Uint16 width, Uint16 height);
2 void screen_clear(UxnScreen *p);
3 void screen_redraw(UxnScreen *p, Uint32 *pixels);
4
5-Uint8 screen_dei(Uint8 *d, Uint8 port);
6+Uint8 screen_dei(Uxn *u, Uint8 addr);
7 void screen_deo(Uint8 *ram, Uint8 *d, Uint8 port);
8 int clamp(int val, int min, int max);
+1,
-1
1@@ -52,7 +52,7 @@ emu_dei(Uxn *u, Uint8 addr)
2 {
3 Uint8 p = addr & 0x0f, d = addr & 0xf0;
4 switch(d) {
5- case 0x20: return screen_dei(&u->dev[d], p);
6+ case 0x20: return screen_dei(u, addr);
7 case 0xa0: return file_dei(0, &u->dev[d], p);
8 case 0xb0: return file_dei(1, &u->dev[d], p);
9 case 0xc0: return datetime_dei(&u->dev[d], p);