X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ftunnel.c;h=4707d81a9adb65f712a22265bf463934a6d94412;hb=70c067c2da05fb71f3d2de115cefbc225eff3667;hp=85ca7b42fa27f2a6576e07db94657c66e6d6bbac;hpb=6c34c443c62d0b40c91aee5f28985ee99c944caa;p=fbgfx

diff --git a/src/tunnel.c b/src/tunnel.c
index 85ca7b4..4707d81 100644
--- a/src/tunnel.c
+++ b/src/tunnel.c
@@ -1,9 +1,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <assert.h>
 #include <imago2.h>
 #include "tpool.h"
-#include "tunnel.h"
+#include "demo.h"
+#include "screen.h"
 
 #define TEX_FNAME	"data/grid.png"
 #define TEX_USCALE	4
@@ -12,12 +14,28 @@
 #define USCALE	2
 #define VSCALE	1
 
-extern unsigned long time_msec;
+static int init(void);
+static void destroy(void);
+static void start(long trans_time);
+static void stop(long trans_time);
+static void draw(void);
 
-static void draw_tunnel_range(unsigned short *pixels, int starty, int num_lines);
+static void (*draw_tunnel_range)(void*, int, int);
+
+static void draw_tunnel_range16(void *pixels, int starty, int num_lines);
+static void draw_tunnel_range32(void *pixels, int starty, int num_lines);
 static int count_bits(unsigned int x);
 static int count_zeros(unsigned int x);
 
+static struct screen scr = {
+	"tunnel",
+	init,
+	destroy,
+	start,
+	stop,
+	draw
+};
+
 static int xsz, ysz, vxsz, vysz;
 static unsigned int *tunnel_map;
 static unsigned char *tunnel_fog;
@@ -30,15 +48,33 @@ static unsigned int tex_xmask, tex_ymask;
 static struct thread_pool *tpool;
 
 
-int init_tunnel(int x, int y)
+struct screen *tunnel_screen(void)
+{
+	return &scr;
+}
+
+
+static int init(void)
 {
 	int i, j, n;
 	unsigned int *tmap;
 	unsigned char *fog;
-	float aspect = (float)x / (float)y;
+	float aspect = (float)fb_width / (float)fb_height;
+
+	switch(fb_depth) {
+	case 16:
+		draw_tunnel_range = draw_tunnel_range16;
+		break;
+	case 32:
+		draw_tunnel_range = draw_tunnel_range32;
+		break;
+	default:
+		fprintf(stderr, "unsupported color depth: %d\n", fb_depth);
+		return -1;
+	}
 
-	xsz = x;
-	ysz = y;
+	xsz = fb_width;
+	ysz = fb_height;
 	vxsz = xsz / USCALE;
 	vysz = ysz / VSCALE;
 
@@ -101,17 +137,25 @@ int init_tunnel(int x, int y)
 	return 0;
 }
 
-void destroy_tunnel(void)
+static void destroy(void)
 {
 	tpool_destroy(tpool);
 	free(tunnel_map);
 	free(tunnel_fog);
 }
 
+static void start(long trans_time)
+{
+}
+
+static void stop(long trans_time)
+{
+}
+
 #define NUM_WORK_ITEMS	32
 
 static struct work {
-	unsigned short *pixels;
+	void *pixels;
 	int starty, num_lines;
 } work[NUM_WORK_ITEMS];
 
@@ -121,11 +165,11 @@ static void work_func(void *cls)
 	draw_tunnel_range(w->pixels, w->starty, w->num_lines);
 }
 
-void draw_tunnel(unsigned short *pixels)
+static void draw(void)
 {
 	int i, num_lines = vysz / NUM_WORK_ITEMS;
 	for(i=0; i<NUM_WORK_ITEMS; i++) {
-		work[i].pixels = pixels;
+		work[i].pixels = fb_pixels;
 		work[i].starty = i * num_lines;
 		work[i].num_lines = num_lines;
 
@@ -134,61 +178,74 @@ void draw_tunnel(unsigned short *pixels)
 	tpool_wait(tpool);
 }
 
+static void tunnel_color(int *rp, int *gp, int *bp, long toffs, unsigned int tpacked, int fog)
+{
+	int r, g, b;
+	unsigned int col;
+	unsigned int tx = (((tpacked >> 16) & 0xffff) << tex_xshift) >> 16;
+	unsigned int ty = ((tpacked & 0xffff) << tex_yshift) >> 16;
+	tx += toffs;
+	ty += toffs << 1;
+
+	tx &= tex_xmask;
+	ty &= tex_ymask;
+
+	col = tex_pixels[(ty << tex_xshift) + tx];
+	r = col & 0xff;
+	g = (col >> 8) & 0xff;
+	b = (col >> 16) & 0xff;
+
+	*rp = (r * fog) >> 8;
+	*gp = (g * fog) >> 8;
+	*bp = (b * fog) >> 8;
+}
+
 #define PACK_RGB16(r, g, b) \
-	(((((r) >> 3) & 0x1f) << 11) | ((((g) >> 2) & 0x3f) << 5) | ((b) & 0x1f))
+	(((((r) >> 3) & 0x1f) << 11) | ((((g) >> 2) & 0x3f) << 5) | (((b) >> 3) & 0x1f))
+#define PACK_RGB32(r, g, b) \
+	((((r) & 0xff) << 16) | (((g) & 0xff) << 8) | ((b) & 0xff))
 
-static void draw_tunnel_range(unsigned short *pixels, int starty, int num_lines)
+static void draw_tunnel_range16(void *pix, int starty, int num_lines)
 {
-	int i, j, k, r, g, b;
+	int i, j;
 	unsigned int *tmap = tunnel_map + starty * vxsz;
 	unsigned char *fog = tunnel_fog + starty * vxsz;
 
 	long toffs = time_msec / 4;
-	pixels += starty * xsz * VSCALE;
+	unsigned int *pixels = (unsigned int*)pix + starty * (xsz >> 1);
 
 	for(i=0; i<num_lines; i++) {
 		for(j=0; j<vxsz; j++) {
-			unsigned short *ptr;
 			unsigned int col;
-			unsigned int tx = (((*tmap >> 16) & 0xffff) << tex_xshift) >> 16;
-			unsigned int ty = ((*tmap & 0xffff) << tex_yshift) >> 16;
-			++tmap;
-
-			tx += toffs;
-			ty += toffs << 1;
-
-			tx &= tex_xmask;
-			ty &= tex_ymask;
-
-			col = tex_pixels[(ty << tex_xshift) + tx];
-			r = col & 0xff;
-			g = (col >> 8) & 0xff;
-			b = (col >> 16) & 0xff;
-
-			r = (r * *fog) >> 8;
-			g = (g * *fog) >> 8;
-			b = (b * *fog) >> 8;
-			++fog;
-
-			col = ((((r >> 3) & 0x1f) << 11) | (((g >> 2) & 0x3f) << 5) | ((b >> 3) & 0x1f));
-
-			ptr = pixels;
-			for(k=0; k<VSCALE; k++) {
-				switch(USCALE) {
-				case 4:
-					ptr[3] = col;
-				case 3:
-					ptr[2] = col;
-				case 2:
-					ptr[1] = col;
-				case 1:
-					*ptr = col;
-				}
-				ptr += xsz;
-			}
-			pixels += USCALE;
+			int r, g, b;
+
+			tunnel_color(&r, &g, &b, toffs, *tmap++, *fog++);
+			col = PACK_RGB16(r, g, b);
+			*pixels++ = col;
+		}
+	}
+}
+
+static void draw_tunnel_range32(void *pix, int starty, int num_lines)
+{
+	int i, j;
+	unsigned int *tmap = tunnel_map + starty * vxsz;
+	unsigned char *fog = tunnel_fog + starty * vxsz;
+
+	long toffs = time_msec / 4;
+	unsigned int *pixels = (unsigned int*)pix + starty * xsz * VSCALE;
+
+	for(i=0; i<num_lines; i++) {
+		for(j=0; j<vxsz; j++) {
+			unsigned int col;
+			int r, g, b;
+
+			tunnel_color(&r, &g, &b, toffs, *tmap++, *fog++);
+			col = PACK_RGB32(r, g, b);
+
+			*pixels++ = col;
+			*pixels++ = col;
 		}
-		pixels += xsz * (VSCALE - 1);
 	}
 }