# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1497928138 -10800
# Node ID ea70f3da150fd983ee6f12c57573732367de3bec
# Parent  72ab63f262bfab7d9c2abd8c0b3f9bb79298c06e
color cycling tunnel

diff -r 72ab63f262bf -r ea70f3da150f .hgignore
--- a/.hgignore	Mon Jun 19 08:02:51 2017 +0300
+++ b/.hgignore	Tue Jun 20 06:08:58 2017 +0300
@@ -4,3 +4,7 @@
 \.map$
 \.elf$
 \.bin$
+tools/ppm2md$
+tools/tunnel$
+\.ppm$
+tun_data\.h$
diff -r 72ab63f262bf -r ea70f3da150f Makefile
--- a/Makefile	Mon Jun 19 08:02:51 2017 +0300
+++ b/Makefile	Tue Jun 20 06:08:58 2017 +0300
@@ -9,8 +9,9 @@
 
 warn = -pedantic -Wall
 dbg = -g
+opt = -O2
 def = -DGAMENAME=\"testgame\" -DVERSTR=\"01\" -D__NO_CTYPE
-inc = -Isrc -Isrc/libc
+inc = -I. -Isrc -Isrc/libc
 
 tool_prefix = m68k-linux-gnu-
 
@@ -28,12 +29,18 @@
 $(bin): $(elf)
 	$(OBJCOPY) -O binary $< $@
 
-$(elf): $(obj)
+$(elf): tun_data.h $(obj)
 	$(LD) -o $@ $(obj) -Map link.map $(LDFLAGS)
 
+tun_data.h: tunnel.ppm
+	cat $< | tools/ppm2md tun_ >$@
+
+tunnel.ppm:
+	tools/tunnel >$@
+
 .PHONY: clean
 clean:
-	rm -f $(obj) $(elf) $(bin)
+	rm -f $(obj) $(elf) $(bin) tun_data.h tunnel.ppm
 
 .PHONY: run
 run: $(bin)
diff -r 72ab63f262bf -r ea70f3da150f src/intr.s
--- a/src/intr.s	Mon Jun 19 08:02:51 2017 +0300
+++ b/src/intr.s	Tue Jun 20 06:08:58 2017 +0300
@@ -102,5 +102,5 @@
 	rte
 
 intr_vblank:
-	|jsr vblank_handler
+	jsr vblank_handler
 	rte
diff -r 72ab63f262bf -r ea70f3da150f src/main.c
--- a/src/main.c	Mon Jun 19 08:02:51 2017 +0300
+++ b/src/main.c	Tue Jun 20 06:08:58 2017 +0300
@@ -1,41 +1,29 @@
 #include <stdint.h>
 #include "vdp.h"
+#include "tun_data.h"
 
-uint32_t pat0[] = {
-	0x00000000,
-	0x00000000,
-	0x00000000,
-	0x00010000,
-	0x00000000,
-	0x00000000,
-	0x00000000,
-	0x00000000
+#define NAMETAB_A	6
+#define NAMETAB_B	6
+
+void load_pattern(int idx, void *data);
+void set_tile(int nametab_idx, int x, int y, int tile_idx, int palidx);
+
+#define CYCLE_BEG	1
+#define CYCLE_END	14
+static uint16_t pal[16] = {
+	VDP_PACK_RGB(0, 0, 0),	/* 0: fixed */
+	VDP_PACK_RGB(0, 0, 0),	/* 1: cycle start */
+	VDP_PACK_RGB(0, 0, 0), VDP_PACK_RGB(0, 0, 0),
+	VDP_PACK_RGB(0, 0, 0), VDP_PACK_RGB(0, 0, 0),
+	VDP_PACK_RGB(0, 0, 0), VDP_PACK_RGB(0, 0, 0),
+	VDP_PACK_RGB(0, 0, 0), VDP_PACK_RGB(0, 0, 0),
+	VDP_PACK_RGB(0, 0, 0), VDP_PACK_RGB(0, 0, 0),
+	VDP_PACK_RGB(0, 0, 0),	/* 12: \            */
+	VDP_PACK_RGB(7, 0, 3),	/* 13:  > beam      */
+	VDP_PACK_RGB(0, 0, 0),	/* 14: /  cycle end */
+	VDP_PACK_RGB(7, 0, 3)		/* 15: fixed */
 };
 
-uint32_t pat1[] = {
-	0x11111111,
-	0x11000011,
-	0x10100101,
-	0x10011001,
-	0x10011001,
-	0x10100101,
-	0x11000011,
-	0x11111111
-};
-
-uint32_t pat2[] = {
-	0x11111111,
-	0x10011001,
-	0x10011001,
-	0x11111111,
-	0x11111111,
-	0x10011001,
-	0x10011001,
-	0x11111111
-};
-
-void load_pattern(int idx, void *data);
-void set_tile(int x, int y, int tile_idx, int palidx);
 
 int main(void)
 {
@@ -43,39 +31,35 @@
 
 	vdp_init();
 
-	vdp_set_pal_entry(0, 0, 0, 0, 0);
-	vdp_set_pal_entry(0, 1, 7, 1, 3);
+	vdp_setreg(VDP_REG_MODE2, vdp_getreg(VDP_REG_MODE2) | VDP_MODE2_V30CELL);
+
+	vdp_begin_palette(0, 0);
+	for(i=0; i<16; i++) {
+		VDP_PORT_DATA = pal[i];
+	}
 	vdp_set_bgcolor(0, 0);
 
-	load_pattern(0, pat0);
-	load_pattern(1, pat1);
-	load_pattern(2, pat2);
+	for(i=0; i<tun_xtiles * tun_ytiles; i++) {
+		load_pattern(i, tun_tiles[i]);
+	}
 
-	vdp_set_nametab_idx(VDP_PLANE_A, 6);
+	vdp_set_nametab_idx(VDP_PLANE_A, NAMETAB_A);
+	vdp_set_nametab_idx(VDP_PLANE_B, NAMETAB_B);
 
-	for(i=0; i<20; i++) {
-		for(j=0; j<20; j++) {
-			set_tile(j, i, 1, 0);
+	for(i=0; i<tun_ytiles; i++) {
+		for(j=0; j<tun_xtiles; j++) {
+			set_tile(NAMETAB_A, j, i, i * tun_xtiles + j, 0);
 		}
 	}
 
 	//vdp_enable_hintr(12);
-	//vdp_enable_vintr();
+	vdp_enable_vintr();
 
 	for(;;);
 
 	return 0;
 }
 
-/*
-uint16_t testcol = 0x00c0;
-
-void vblank_handler(void)
-{
-	testcol = 0x00c0;
-}
-*/
-
 void load_pattern(int idx, void *data)
 {
 	int i;
@@ -88,13 +72,28 @@
 	}
 }
 
-void set_tile(int x, int y, int tile_idx, int palidx)
+void set_tile(int nametab_idx, int x, int y, int tile_idx, int palidx)
 {
 	uint16_t tile_ent, addr;
 
 	tile_ent = vdp_nametab_entry(tile_idx, palidx, VDP_TILE_LOW_PRIO);
 
-	addr = vdp_nametab_addr(6) + (y * 64 + x) * 2;
+	addr = vdp_nametab_addr(nametab_idx) + (y * 64 + x) * 2;
 	vdp_setup_access(addr, VDP_MEM_WRITE, VDP_MEM_VRAM);
 	VDP_PORT_DATA = tile_ent;
 }
+
+void vblank_handler(void)
+{
+	int idx = CYCLE_BEG;
+	uint16_t first = pal[idx];
+
+	vdp_begin_palette(0, idx);
+	while(idx < CYCLE_END) {
+		pal[idx] = pal[idx + 1];
+		VDP_PORT_DATA = pal[idx];
+		++idx;
+	}
+	pal[idx] = first;
+	VDP_PORT_DATA = pal[idx];
+}
diff -r 72ab63f262bf -r ea70f3da150f src/vdp.c
--- a/src/vdp.c	Mon Jun 19 08:02:51 2017 +0300
+++ b/src/vdp.c	Tue Jun 20 06:08:58 2017 +0300
@@ -2,8 +2,31 @@
 
 void vdp_init(void)
 {
+	int i;
+
 	vdp_setreg(VDP_REG_MODE1, VDP_MODE1_BASE);
 	vdp_setreg(VDP_REG_MODE2, VDP_MODE2_BASE | VDP_MODE2_DISP);
 
+	vdp_set_nametab_addr(VDP_PLANE_A, 0xc000);
+	vdp_set_nametab_addr(VDP_PLANE_B, 0xe000);
+	vdp_disable_layer(VDP_PLANE_WIN);
+	vdp_set_scroll_table(0xd000);
+	vdp_set_sprite_table(0xd400);
+
+	vdp_setreg(VDP_REG_MODE3, VDP_MODE3_BASE);
+	vdp_setreg(VDP_REG_MODE4, VDP_MODE4_BASE | VDP_MODE4_H40CELL);
+	vdp_setreg(VDP_REG_SCROLL_SIZE, VDP_SCROLL_H64 | VDP_SCROLL_V32);
+
 	vdp_set_autoinc(2);
+	vdp_set_bgcolor(0, 0);
+
+	vdp_setreg(VDP_REG_HINTR, 0);
+	vdp_setreg(VDP_REG_WIN_XPOS, 0);
+	vdp_setreg(VDP_REG_WIN_YPOS, 0);
+
+	/* clear vmem at the planes A/B name tables, scroll table, and sprite table */
+	vdp_setup_access(0xd000, VDP_MEM_WRITE, VDP_MEM_VRAM);
+	for(i=0xd000; i<65536; i++) {
+		VDP_PORT_DATA = 0;
+	}
 }
diff -r 72ab63f262bf -r ea70f3da150f src/vdp.h
--- a/src/vdp.h	Mon Jun 19 08:02:51 2017 +0300
+++ b/src/vdp.h	Tue Jun 20 06:08:58 2017 +0300
@@ -157,11 +157,15 @@
 	vdp_setreg(VDP_REG_AUTOINC, stride);
 }
 
+static inline void vdp_begin_palette(int pidx, int cidx)
+{
+	uint16_t paddr = (pidx << 5) | (cidx << 1);
+	vdp_setup_access(paddr, VDP_MEM_WRITE, VDP_MEM_CRAM);
+}
+
 static inline void vdp_set_pal_entry(int pidx, int cidx, int r, int g, int b)
 {
-	uint16_t paddr = (pidx << 5) | (cidx << 1);
-
-	vdp_setup_access(paddr, VDP_MEM_WRITE, VDP_MEM_CRAM);
+	vdp_begin_palette(pidx, cidx);
 	VDP_PORT_DATA = VDP_PACK_RGB(r, g, b);
 }
 
@@ -188,22 +192,18 @@
 
 static inline void vdp_set_nametab_addr(int plane, uint16_t addr)
 {
-	int reg;
 	switch(plane) {
 	case VDP_PLANE_A:
-		reg = VDP_REG_NAMETAB_A;
+		vdp_setreg(VDP_REG_NAMETAB_A, (addr >> 10) & 0x38);
 		break;
 	case VDP_PLANE_B:
-		reg = VDP_REG_NAMETAB_B;
+		vdp_setreg(VDP_REG_NAMETAB_B, (addr >> 13) & 7);
 		break;
 	case VDP_PLANE_WIN:
-		reg = VDP_REG_NAMETAB_WIN;
+		vdp_setreg(VDP_REG_NAMETAB_WIN, (addr >> 10) & 0x7e);
+	default:
 		break;
-	default:
-		return;
 	}
-
-	vdp_setreg(reg, (addr >> 10) & 0x38);
 }
 
 static inline uint16_t vdp_nametab_addr(int idx)
@@ -216,11 +216,37 @@
 	vdp_set_nametab_addr(plane, vdp_nametab_addr(idx));
 }
 
+static inline void vdp_disable_layer(int plane)
+{
+	switch(plane) {
+	case VDP_PLANE_A:
+		vdp_setreg(VDP_REG_NAMETAB_A, 0x40);
+		break;
+	case VDP_PLANE_B:
+		vdp_setreg(VDP_REG_NAMETAB_B, 0x08);
+		break;
+	case VDP_PLANE_WIN:
+		vdp_setreg(VDP_REG_NAMETAB_WIN, 0x40);
+	default:
+		break;
+	}
+}
+
 static inline uint16_t vdp_nametab_entry(int tileidx, int palidx, uint16_t flags)
 {
 	return tileidx | (((uint16_t)palidx & 0x3) << 13) | flags;
 }
 
+static inline void vdp_set_sprite_table(uint16_t addr)
+{
+	vdp_setreg(VDP_REG_SPRITE_TAB, addr >> 9);
+}
+
+static inline void vdp_set_scroll_table(uint16_t addr)
+{
+	vdp_setreg(VDP_REG_SCROLL_TAB, addr >> 10);
+}
+
 void vdp_init(void);
 
 #endif	/* VDP_H_ */
diff -r 72ab63f262bf -r ea70f3da150f tools/ppm2md.c
--- a/tools/ppm2md.c	Mon Jun 19 08:02:51 2017 +0300
+++ b/tools/ppm2md.c	Tue Jun 20 06:08:58 2017 +0300
@@ -3,26 +3,92 @@
 #include <string.h>
 #include <ctype.h>
 
+#define RODATA_STR	"__attribute__((section(\".rodata\")))"
+
 unsigned char *read_image(int *xsz, int *ysz, int *maxval);
 
-int main(void)
+int main(int argc, char **argv)
 {
-	int i, j, width, height, maxval;
-	unsigned char *pixels;
+	int i, j, width, height, xtiles, ytiles, maxval;
+	unsigned char *pixels, *tiles, *src, *dest;
+	const char *prefix = "img_";
+
+	if(argv[1]) {
+		prefix = argv[1];
+	}
 
 	if(!(pixels = read_image(&width, &height, &maxval))) {
 		return 1;
 	}
 	fprintf(stderr, "read image %dx%d (maxval: %d)\n", width, height, maxval);
 
-	/* reduce colors */
+	xtiles = width / 8;
+	ytiles = height / 8;
+	/* each tile is 32 bytes, 8 rows of 4 bytes each */
+	if(!(tiles = malloc(xtiles * ytiles * 32))) {
+		free(pixels);
+		return 1;
+	}
 
-	/* slice tiles */
-	for(i=0; i<height / 8; i++) {
-		for(j=0; j<width / 8; j++) {
+	/* if we have 15 as max val, we'll assume they are straight palette indices
+	 * otherwise, do color quantization and palette allocation
+	 */
+	if(maxval == 15) {
+		/* just drop green/blue components in-place, keep red as index */
+		dest = src = pixels;
+		for(i=0; i<width * height; i++) {
+			*dest++ = *src;
+			src += 3;
+		}
+	} else {
+		/* TODO */
+	}
+
+	/* after processing, we have 1 color index per byte */
+
+	/* slice tiles and pack indices as nibbles */
+	dest = tiles;
+	for(i=0; i<ytiles; i++) {
+		for(j=0; j<xtiles; j++) {
+			int x, y;
+			int tilestart = (i * xtiles * 8 + j) * 8;
+
+			for(y=0; y<8; y++) {
+				for(x=0; x<4; x++) {
+					src = pixels + tilestart + y * width + x * 2;
+					*dest++ = (src[0] << 4) | (src[1] & 0xf);
+				}
+			}
+
 		}
 	}
 
+	/* output as C array */
+	printf("/* generated by ppm2md */\n");
+	printf("int %sxtiles " RODATA_STR " = %d;\n", prefix, xtiles);
+	printf("int %sytiles " RODATA_STR " = %d;\n", prefix, ytiles);
+	printf("unsigned char %stiles[][32] " RODATA_STR " = {", prefix);
+
+	src = tiles;
+	for(i=0; i<xtiles * ytiles; i++) {
+		if(i > 0) {
+			printf(",\n");
+		} else {
+			putchar('\n');
+		}
+		printf("\t{");
+		for(j=0; j<32; j++) {
+			if(j == 0) {
+				printf("%u", (unsigned int)*src++);
+			} else {
+				printf(", %u", (unsigned int)*src++);
+			}
+		}
+		printf(" }");
+	}
+	printf("\n};\n");
+
+
 	return 0;
 }
 
diff -r 72ab63f262bf -r ea70f3da150f tools/tunnel.c
--- a/tools/tunnel.c	Mon Jun 19 08:02:51 2017 +0300
+++ b/tools/tunnel.c	Tue Jun 20 06:08:58 2017 +0300
@@ -2,13 +2,14 @@
 #include <stdlib.h>
 #include <math.h>
 
-#define XSZ		512
-#define YSZ		512
+#define XSZ		320
+#define YSZ		240
 
 int main(void)
 {
 	int i, j;
 	unsigned char *pixels, *pptr;
+	float aspect = (float)XSZ / (float)YSZ;
 
 	pixels = malloc(XSZ * YSZ);
 	pptr = pixels;
@@ -16,15 +17,19 @@
 	for(i=0; i<YSZ; i++) {
 		float y = 2.0 * (float)i / (float)YSZ - 1.0;
 		for(j=0; j<XSZ; j++) {
-			float x = 2.0 * (float)j / (float)XSZ - 1.0;
+			float x = aspect * (2.0 * (float)j / (float)XSZ - 1.0);
 			float tu = atan2(y, x) / M_PI * 0.5 + 0.5;
 			float d = sqrt(x * x + y * y);
-			float tv = d == 0.0 ? 0.0 : 1.0 / d;
+			float tv = d == 0.0 ? 0.0 : 0.5 / d;
 
-			int ty = (int)(tv * 64.0) & 0xf;
+			int ty = (int)(tv * 64.0) % 14 + 1;
 			int tx = (int)(tu * 256.0) & 0xf;
 
-			*pptr++ = tx ? ty : 0;
+			if(d < 0.2) {
+				*pptr++ = 0;
+			} else {
+				*pptr++ = tx ? ty : 0xf;
+			}
 		}
 	}