d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Starting Theme app

This commit is contained in:
neauoire 2021-03-22 20:04:04 -07:00
parent 2c8ce4970e
commit 6df5a1a767
3 changed files with 175 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -28,7 +28,7 @@ else
fi fi
echo "Assembling.." echo "Assembling.."
./bin/assembler projects/software/left.usm bin/boot.rom ./bin/assembler projects/software/noodle.usm bin/boot.rom
echo "Running.." echo "Running.."
if [ "${2}" = '--cli' ]; if [ "${2}" = '--cli' ];

162
projects/software/theme.usm Normal file
View File

@ -0,0 +1,162 @@
( draw routines )
%RTN { JMP2r }
%++ { #0001 ADD2 }
%8+ { #0008 ADD2 }
;color { byte 1 }
;pointer { x 2 y 2 sprite 2 }
;rect { x1 2 y1 2 x2 2 y2 2 }
;r1 { x1 2 y1 2 x2 2 y2 2 }
;r2 { x1 2 y1 2 x2 2 y2 2 }
;r3 { x1 2 y1 2 x2 2 y2 2 }
;window { x1 2 y1 2 x2 2 y2 2 w 2 h 2 }
;label { x 2 y 2 addr 2 }
|0110 ;Screen { width 2 height 2 pad 4 x 2 y 2 color 1 }
|0120 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 }
|0150 ;Mouse { x 2 y 2 state 1 chord 1 }
|01F0 .RESET .FRAME .ERROR ( vectors )
|01F8 [ f07c f0e2 f0c2 ] ( palette )
|0200 @RESET
#0080 =window.w
#0050 =window.h
( center window )
~Screen.width #0002 DIV2 ~window.w #0002 DIV2 SUB2 =window.x1
~Screen.height #0002 DIV2 ~window.h #0002 DIV2 SUB2 =window.y1
,draw-window JSR2
BRK
@FRAME
,draw-cursor JSR2
BRK
@draw-window
~window.x1 ~window.w ADD2 =window.x2
~window.y1 ~window.h ADD2 =window.y2
~window.x1 ~window.y1 ~window.x2 ~window.y2 #02 ,fill-rect JSR2
~window.x1 ~window.y1 ~window.x2 ~window.y2 #01 ,line-rect JSR2
~window.x1 #0002 SUB2 ~window.y1 #0002 SUB2 ~window.x2 #0002 ADD2 ~window.y2 #0002 ADD2 #01 ,line-rect JSR2
~window.x1 ~window.y1 #04 ,window_txt ,draw-label JSR2
~window.x1 #0008 ADD2 ~window.y1 #0010 ADD2 #05 ,red_txt ,draw-label JSR2
~window.x1 #0008 ADD2 ~window.y1 #0020 ADD2 #05 ,green_txt ,draw-label JSR2
~window.x1 #0008 ADD2 ~window.y1 #0030 ADD2 #05 ,blue_txt ,draw-label JSR2
RTN
@draw-cursor
( clear last cursor )
,clear_icn =Sprite.addr
~pointer.x =Sprite.x
~pointer.y =Sprite.y
#10 =Sprite.color
( record pointer positions )
~Mouse.x =pointer.x ~Mouse.y =pointer.y
( draw new cursor )
,pointer_icn =Sprite.addr
~pointer.x =Sprite.x
~pointer.y =Sprite.y
#11 =Sprite.color
RTN
@fill-rect ( x1 y1 x2 y2 color )
( load ) =color =rect.y2 =rect.x2 DUP2 =Screen.y =rect.y1 DUP2 =Screen.x =rect.x1
$ver
~rect.x1 =Screen.x
$hor
( draw ) ~color =Screen.color
( incr ) ~Screen.x ++ =Screen.x
,$hor ~Screen.x ~rect.x2 LTH2 JMP2?
( incr ) ~Screen.y ++ =Screen.y
,$ver ~Screen.y ~rect.y2 LTH2 JMP2?
RTN
@line-rect ( x1 y1 x2 y2 color )
( load ) =color =rect.y2 =rect.x2 DUP2 =Screen.y =rect.y1 DUP2 =Screen.x =rect.x1
$hor
( incr ) ~Screen.x ++ =Screen.x
( draw ) ~rect.y1 =Screen.y ~color =Screen.color
( draw ) ~rect.y2 =Screen.y ~color =Screen.color
,$hor ~Screen.x ~rect.x2 LTH2 JMP2?
~rect.y1 =Screen.y
$ver
( draw ) ~rect.x1 =Screen.x ~color =Screen.color
( draw ) ~rect.x2 =Screen.x ~color =Screen.color
( incr ) ~Screen.y ++ =Screen.y
,$ver ~Screen.y ~rect.y2 ++ LTH2 JMP2?
RTN
@draw-label ( x y color addr )
( load ) =label.addr =color =Sprite.y =Sprite.x ~label.addr
$loop
( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =Sprite.addr ~color =Sprite.color
( incr ) ++
( incr ) ~Sprite.x 8+ =Sprite.x
DUP2 LDR #00 NEQ ,$loop ROT JMP2?
POP2
RTN
@clear_icn [ 0000 0000 0000 0000 ]
@pointer_icn [ 80c0 e0f0 f8e0 1000 ]
@window_txt [ theme 20 editor 00 ]
@red_txt [ red 00 ]
@green_txt [ green 00 ]
@blue_txt [ blue 00 ]
@font ( spectrum-zx font )
[
0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
]
@ERROR BRK

49
src/emulator.c
View File

@ -20,27 +20,17 @@ WITH REGARD TO THIS SOFTWARE.
#define RES (HOR * VER * 16) #define RES (HOR * VER * 16)
typedef struct { typedef struct {
Uint8 reqdraw, bg[RES], fg[RES];
Uint16 x1, y1, x2, y2; Uint16 x1, y1, x2, y2;
} Rect2d;
typedef struct {
Uint8 reqdraw;
Uint8 bg[RES], fg[RES];
Rect2d bounds;
} Screen; } Screen;
int WIDTH = 8 * HOR + 8 * PAD * 2; int WIDTH = 8 * HOR + 8 * PAD * 2;
int HEIGHT = 8 * VER + 8 * PAD * 2; int HEIGHT = 8 * VER + 8 * PAD * 2;
int FPS = 30, GUIDES = 0, ZOOM = 2; int FPS = 30, GUIDES = 0, ZOOM = 2;
Uint32 theme[] = { Uint32 *pixels, theme[4];
0x000000,
0xFFFFFF,
0x72DEC2,
0x666666,
0x222222};
Uint8 icons[][8] = { Uint8 font[][8] = {
{0x00, 0x3c, 0x46, 0x4a, 0x52, 0x62, 0x3c, 0x00}, {0x00, 0x3c, 0x46, 0x4a, 0x52, 0x62, 0x3c, 0x00},
{0x00, 0x18, 0x28, 0x08, 0x08, 0x08, 0x3e, 0x00}, {0x00, 0x18, 0x28, 0x08, 0x08, 0x08, 0x3e, 0x00},
{0x00, 0x3c, 0x42, 0x02, 0x3c, 0x40, 0x7e, 0x00}, {0x00, 0x3c, 0x42, 0x02, 0x3c, 0x40, 0x7e, 0x00},
@ -61,8 +51,6 @@ Uint8 icons[][8] = {
static SDL_Window *gWindow; static SDL_Window *gWindow;
static SDL_Renderer *gRenderer; static SDL_Renderer *gRenderer;
static SDL_Texture *gTexture; static SDL_Texture *gTexture;
static Uint32 *pixels;
static Screen screen; static Screen screen;
static Device *devscreen, *devmouse, *devkey, *devctrl; static Device *devscreen, *devmouse, *devkey, *devctrl;
@ -92,18 +80,6 @@ paintpixel(Uint8 *dst, Uint16 x, Uint16 y, Uint8 color)
dst[row + 8] |= 1UL << col; dst[row + 8] |= 1UL << col;
} }
void
paintchr(Uint8 *dst, Uint16 x, Uint16 y, Uint8 *sprite)
{
Uint16 v, h;
for(v = 0; v < 8; v++)
for(h = 0; h < 8; h++) {
Uint8 ch1 = ((sprite[v] >> (7 - h)) & 0x1);
Uint8 ch2 = (((sprite[v + 8] >> (7 - h)) & 0x1) << 1);
paintpixel(dst, x + h, y + v, ch1 + ch2);
}
}
void void
painticn(Uint8 *dst, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 blend) painticn(Uint8 *dst, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 blend)
{ {
@ -131,7 +107,7 @@ clear(Uint32 *dst)
void void
drawpixel(Uint32 *dst, Uint16 x, Uint16 y, Uint8 color) drawpixel(Uint32 *dst, Uint16 x, Uint16 y, Uint8 color)
{ {
if(x >= screen.bounds.x1 && x <= screen.bounds.x2 && y >= screen.bounds.x1 && y <= screen.bounds.y2) if(x >= screen.x1 && x <= screen.x2 && y >= screen.x1 && y <= screen.y2)
dst[y * WIDTH + x] = theme[color]; dst[y * WIDTH + x] = theme[color];
} }
@ -188,9 +164,9 @@ drawdebugger(Uint32 *dst, Uxn *u)
{ {
Uint8 i, x, y, b; Uint8 i, x, y, b;
for(i = 0; i < 0x10; ++i) { /* memory */ for(i = 0; i < 0x10; ++i) { /* memory */
x = ((i % 8) * 3 + 3) * 8, y = screen.bounds.x1 + 8 + i / 8 * 8, b = u->wst.dat[i]; x = ((i % 8) * 3 + 3) * 8, y = screen.x1 + 8 + i / 8 * 8, b = u->wst.dat[i];
drawicn(dst, x, y, icons[(b >> 4) & 0xf], 1 + (u->wst.ptr == i), 0); drawicn(dst, x, y, font[(b >> 4) & 0xf], 1 + (u->wst.ptr == i), 0);
drawicn(dst, x + 8, y, icons[b & 0xf], 1 + (u->wst.ptr == i), 0); drawicn(dst, x + 8, y, font[b & 0xf], 1 + (u->wst.ptr == i), 0);
} }
for(x = 0; x < 32; ++x) { for(x = 0; x < 32; ++x) {
drawpixel(dst, x, HEIGHT / 2, 2); drawpixel(dst, x, HEIGHT / 2, 2);
@ -254,10 +230,10 @@ init(void)
clear(pixels); clear(pixels);
SDL_StartTextInput(); SDL_StartTextInput();
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
screen.bounds.x1 = PAD * 8; screen.x1 = PAD * 8;
screen.bounds.x2 = WIDTH - PAD * 8 - 1; screen.x2 = WIDTH - PAD * 8 - 1;
screen.bounds.y1 = PAD * 8; screen.y1 = PAD * 8;
screen.bounds.y2 = HEIGHT - PAD * 8 - 1; screen.y2 = HEIGHT - PAD * 8 - 1;
return 1; return 1;
} }
@ -377,9 +353,6 @@ sprite_poke(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1)
Uint16 a = (m[ptr + 4] << 8) + m[ptr + 5]; Uint16 a = (m[ptr + 4] << 8) + m[ptr + 5];
Uint8 source = (b1 >> 4) & 0xf; Uint8 source = (b1 >> 4) & 0xf;
Uint8 *layer = source % 2 ? screen.fg : screen.bg; Uint8 *layer = source % 2 ? screen.fg : screen.bg;
if(source / 2)
paintchr(layer, x, y, &m[a]);
else
painticn(layer, x, y, &m[a], b1 & 0xf); painticn(layer, x, y, &m[a], b1 & 0xf);
screen.reqdraw = 1; screen.reqdraw = 1;
} }