X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgame.c;h=8afa769917fde9acf224589baffc5c8a001aa407;hb=3f381738bd1f53bace45c8bf9ffc6d772ff90aab;hp=b4baecad05ed7cdeb92d617ac469fa8b15ae8ce3;hpb=cab072d239d772d1c3445612d2599da36b087b25;p=retrocrawl

diff --git a/src/game.c b/src/game.c
index b4baeca..8afa769 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,90 +1,110 @@
+#include <stdio.h>
 #include <string.h>
 #include "game.h"
-#include "data_test.h"
 #include "gfx.h"
+#include "copper.h"
+#include "data.h"
+#include "sprite.h"
 
-#define TILE_W	32
-#define TILE_H	16
+#include "hwregs.h"	/* XXX */
+
+#define TILE_W	64
+#define TILE_H	32
 
 void draw_tile(int tid, int x, int y, int light);
-void convert_tile_data(unsigned char *dest, const char *src);
 
-static unsigned char test_tiles[2][TILE_W * TILE_H / 8 * NBPL];
+static uint16_t *sprdata[NUM_HWSPRITES];
+static uint16_t *sprdata2[NUM_HWSPRITES];
+
+/* hardcoded test sprite */
+static struct sprite test_sprite;
+static struct sprite test_sprite2;
 
 int game_init(void)
 {
 	int i;
 
-	for(i=0; i<2; i++) {
-		convert_tile_data(test_tiles[i], test_tiles_cpix[i][0]);
-	}
-	return 0;
-}
+	printf("hello world\n");
 
-void game_draw(void)
-{
-	draw_tile(0, 32, 16, 0);
-}
+	REG_COLOR0 = 0x221;
+	REG_COLOR1 = 0x222;
+	REG_COLOR2 = 0x332;
+	REG_COLOR3 = 0x433;
+	REG_COLOR4 = 0x543;
+	REG_COLOR5 = 0x554;
+	REG_COLOR6 = 0x654;
+	REG_COLOR7 = 0x765;
 
+	for(i=0; i<16; i++) {
+		REG_COLOR_PTR[i + 16] = sprpal[i];
+	}
 
-void draw_tile(int tid, int x, int y, int light)
-{
-	int i;
-
-	unsigned char *dest = bplptr[0] + (y * SCANSZ * NBPL) + x / 8;
-	unsigned char *src = test_tiles[tid];
-
-	for(i=0; i<TILE_H * NBPL; i++) {
-		memcpy(dest, src, TILE_W / 8);
-		dest += SCANSZ;
-		src += TILE_W / 8;
+	sprdata[0] = sprdata2[0] = spr0a;
+	sprdata[1] = sprdata2[1] = spr0b;
+	sprdata[2] = sprdata2[2] = spr1a;
+	sprdata[3] = sprdata2[3] = spr1b;
+	sprdata[4] = sprdata2[4] = spr2a;
+	sprdata[5] = sprdata2[5] = spr2b;
+
+	test_sprite.width = test_sprite.height = 48;
+	test_sprite.origx = 24;
+	test_sprite.origy = 24;
+	test_sprite.img = test_sprite.mask = 0;
+	test_sprite.hwslices = 3;
+	for(i=0; i<8; i++) {
+		test_sprite.hwspr[i] = i < 6 ? sprdata[i] : 0;
 	}
-}
 
-static inline int charpix_color(char c)
-{
-	switch(c) {
-	case '#':
-		return 1;
-	case 'x':
-		return 2;
-	case '@':
-		return 3;
-	case 'o':
-		return 4;
-	default:
-	case '.':
-		break;
+	test_sprite2 = test_sprite;
+	for(i=0; i<8; i++) {
+		test_sprite2.hwspr[i] = i < 6 ? sprdata2[i] : 0;
 	}
+
 	return 0;
 }
 
-#define TILE_SCANSZ	(TILE_W / 8)
-void convert_tile_data(unsigned char *dest, const char *src)
-{
-	int i, j, k;
-	unsigned char *bptr[NBPL];
+#define XTILES	5
+#define YTILES	13
 
-	for(i=0; i<NBPL; i++) {
-		bptr[i] = dest + TILE_SCANSZ * i;
+void game_draw(void)
+{
+	int i, j, xoffs, yoffs, ntiles;
+
+	yoffs = 0;
+	for(i=0; i<YTILES; i++) {
+		xoffs = i & 1 ? TILE_W / 2 : 0;
+		ntiles = i & 1 ? XTILES - 1 : XTILES;
+		for(j=0; j<ntiles; j++) {
+			draw_tile(0, xoffs, yoffs, 0);
+			xoffs += TILE_W;
+		}
+		yoffs += TILE_H / 2;
 	}
 
-	for(i=0; i<TILE_H; i++) {
-		for(j=0; j<TILE_W; j++) {
-			int col = charpix_color(*src++);
-
-			for(k=0; k<NBPL; k++) {
-				*bptr[k] = (*bptr[k] << 1) | (col & 1);
-				col >>= 1;
+	begin_sprites();
+	draw_sprite(&test_sprite, 160, 80);
+	draw_sprite(&test_sprite2, 160, 160);
+	end_sprites();
+}
 
-				if((j & 7) == 7) {
-					bptr[k]++;
-				}
-			}
-		}
 
-		for(j=0; j<NBPL; j++) {
-			bptr[j] += TILE_SCANSZ * (NBPL - 1);
-		}
-	}
+void draw_tile(int tid, int x, int y, int light)
+{
+	unsigned char *dest = bplptr[0] + (y * SCANSZ * NBPL) + x / 8;
+	unsigned char *src = test_tile;
+
+	wait_blit();
+
+	REG32_BLTCON = BLTCON_USEA | BLTCON_USEB | BLTCON_USEC | BLTCON_USED |
+		BLTCON_LF(0xca);
+	REG32_BLTAFLWM = 0xffffffff;
+	REG_BLTAMOD = 0;
+	REG_BLTBMOD = 0;
+	REG_BLTCMOD = SCANSZ - TILE_W / 8;
+	REG_BLTDMOD = SCANSZ - TILE_W / 8;
+	REG32_BLTAPT = (intptr_t)test_tile_mask;
+	REG32_BLTBPT = (intptr_t)src;
+	REG32_BLTCPT = (intptr_t)dest;
+	REG32_BLTDPT = (intptr_t)dest;
+	REG_BLTSIZE = BLTSIZE(TILE_W, TILE_H * NBPL);
 }