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

diff --git a/src/tunnel.c b/src/tunnel.c
index 4707d81..221fadc 100644
--- a/src/tunnel.c
+++ b/src/tunnel.c
@@ -7,12 +7,20 @@
 #include "demo.h"
 #include "screen.h"
 
+#define VSCALE	1.5
+
 #define TEX_FNAME	"data/grid.png"
 #define TEX_USCALE	4
 #define TEX_VSCALE	2
 
-#define USCALE	2
-#define VSCALE	1
+#define NUM_WORK_ITEMS	8
+
+static struct work {
+	void *pixels;
+	int starty, num_lines;
+	long tm;
+	int xoffs, yoffs;
+} work[NUM_WORK_ITEMS];
 
 static int init(void);
 static void destroy(void);
@@ -20,10 +28,10 @@ static void start(long trans_time);
 static void stop(long trans_time);
 static void draw(void);
 
-static void (*draw_tunnel_range)(void*, int, int);
+static void (*draw_tunnel_range)(void*, int, int, int, int, long);
 
-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 void draw_tunnel_range16(void *pixels, int xoffs, int yoffs, int starty, int num_lines, long tm);
+static void draw_tunnel_range32(void *pixels, int xoffs, int yoffs, int starty, int num_lines, long tm);
 static int count_bits(unsigned int x);
 static int count_zeros(unsigned int x);
 
@@ -37,6 +45,7 @@ static struct screen scr = {
 };
 
 static int xsz, ysz, vxsz, vysz;
+static int pan_width, pan_height;
 static unsigned int *tunnel_map;
 static unsigned char *tunnel_fog;
 
@@ -47,6 +56,9 @@ static unsigned int tex_xmask, tex_ymask;
 
 static struct thread_pool *tpool;
 
+static long trans_start, trans_dur;
+static int trans_dir;
+
 
 struct screen *tunnel_screen(void)
 {
@@ -73,10 +85,13 @@ static int init(void)
 		return -1;
 	}
 
-	xsz = fb_width;
+	xsz = fb_width / 2;
 	ysz = fb_height;
-	vxsz = xsz / USCALE;
-	vysz = ysz / VSCALE;
+	vxsz = xsz * VSCALE;
+	vysz = ysz * VSCALE;
+
+	pan_width = vxsz - xsz;
+	pan_height = vysz - ysz;
 
 	if(!(tunnel_map = malloc(vxsz * vysz * sizeof *tunnel_map))) {
 		fprintf(stderr, "failed to allocate tunnel map\n");
@@ -101,7 +116,7 @@ static int init(void)
 			int tx = (int)(tu * 65535.0 * TEX_USCALE) & 0xffff;
 			int ty = (int)(tv * 65535.0 * TEX_VSCALE) & 0xffff;
 
-			int f = (int)(d * 95.0);
+			int f = (int)(d * 128.0);
 
 			*tmap++ = (tx << 16) | ty;
 			*fog++ = f > 255 ? 255 : f;
@@ -134,6 +149,13 @@ static int init(void)
 		return -1;
 	}
 
+	/* initialize the constant part of all work items */
+	for(i=0; i<NUM_WORK_ITEMS; i++) {
+		int num_lines = ysz / NUM_WORK_ITEMS;
+		work[i].pixels = fb_pixels;
+		work[i].starty = i * num_lines;
+	}
+
 	return 0;
 }
 
@@ -146,32 +168,58 @@ static void destroy(void)
 
 static void start(long trans_time)
 {
+	if(trans_time) {
+		trans_start = time_msec;
+		trans_dur = trans_time;
+		trans_dir = 1;
+	}
 }
 
 static void stop(long trans_time)
 {
+	if(trans_time) {
+		trans_start = time_msec;
+		trans_dur = trans_time;
+		trans_dir = -1;
+	}
 }
 
-#define NUM_WORK_ITEMS	32
-
-static struct work {
-	void *pixels;
-	int starty, num_lines;
-} work[NUM_WORK_ITEMS];
 
 static void work_func(void *cls)
 {
 	struct work *w = (struct work*)cls;
-	draw_tunnel_range(w->pixels, w->starty, w->num_lines);
+	draw_tunnel_range(w->pixels, w->xoffs, w->yoffs, w->starty, w->num_lines, w->tm);
 }
 
 static void draw(void)
 {
-	int i, num_lines = vysz / NUM_WORK_ITEMS;
+	int i, num_lines = ysz / NUM_WORK_ITEMS;
+	int draw_lines = num_lines;
+	float t;
+	int xoffs, yoffs;
+
+	if(trans_dir) {
+		long interval = time_msec - trans_start;
+		int progr = num_lines * interval / trans_dur;
+		if(trans_dir < 0) {
+			draw_lines = num_lines - progr - 1;
+		} else {
+			draw_lines = progr;
+		}
+		if(progr >= num_lines) {
+			trans_dir = 0;
+		}
+	}
+
+	t = time_msec / 10000.0;
+	xoffs = (int)(cos(t * 3.0) * pan_width / 2) + pan_width / 2;
+	yoffs = (int)(sin(t * 4.0) * pan_height / 2) + pan_height / 2;
+
 	for(i=0; i<NUM_WORK_ITEMS; i++) {
-		work[i].pixels = fb_pixels;
-		work[i].starty = i * num_lines;
-		work[i].num_lines = num_lines;
+		work[i].num_lines = draw_lines;
+		work[i].tm = time_msec;
+		work[i].xoffs = xoffs;
+		work[i].yoffs = yoffs;
 
 		tpool_enqueue(tpool, work + i, work_func, 0);
 	}
@@ -205,47 +253,51 @@ static void tunnel_color(int *rp, int *gp, int *bp, long toffs, unsigned int tpa
 #define PACK_RGB32(r, g, b) \
 	((((r) & 0xff) << 16) | (((g) & 0xff) << 8) | ((b) & 0xff))
 
-static void draw_tunnel_range16(void *pix, int starty, int num_lines)
+static void draw_tunnel_range16(void *pix, int xoffs, int yoffs, int starty, int num_lines, long tm)
 {
 	int i, j;
-	unsigned int *tmap = tunnel_map + starty * vxsz;
-	unsigned char *fog = tunnel_fog + starty * vxsz;
+	unsigned int *tmap = tunnel_map + (starty + yoffs) * vxsz + xoffs;
+	unsigned char *fog = tunnel_fog + (starty + yoffs) * vxsz + xoffs;
 
-	long toffs = time_msec / 4;
-	unsigned int *pixels = (unsigned int*)pix + starty * (xsz >> 1);
+	long toffs = tm / 4;
+	unsigned int *pixels = (unsigned int*)pix + starty * (fb_width >> 1);
 
 	for(i=0; i<num_lines; i++) {
-		for(j=0; j<vxsz; j++) {
+		for(j=0; j<xsz; j++) {
 			unsigned int col;
 			int r, g, b;
 
-			tunnel_color(&r, &g, &b, toffs, *tmap++, *fog++);
+			tunnel_color(&r, &g, &b, toffs, tmap[j], fog[j]);
 			col = PACK_RGB16(r, g, b);
-			*pixels++ = col;
+			*pixels++ = (col << 16) | col;
 		}
+		tmap += vxsz;
+		fog += vxsz;
 	}
 }
 
-static void draw_tunnel_range32(void *pix, int starty, int num_lines)
+static void draw_tunnel_range32(void *pix, int xoffs, int yoffs, int starty, int num_lines, long tm)
 {
 	int i, j;
-	unsigned int *tmap = tunnel_map + starty * vxsz;
-	unsigned char *fog = tunnel_fog + starty * vxsz;
+	unsigned int *tmap = tunnel_map + (starty + yoffs) * vxsz + xoffs;
+	unsigned char *fog = tunnel_fog + (starty + yoffs) * vxsz + xoffs;
 
-	long toffs = time_msec / 4;
-	unsigned int *pixels = (unsigned int*)pix + starty * xsz * VSCALE;
+	long toffs = tm / 4;
+	unsigned int *pixels = (unsigned int*)pix + starty * fb_width;
 
 	for(i=0; i<num_lines; i++) {
-		for(j=0; j<vxsz; j++) {
+		for(j=0; j<xsz; j++) {
 			unsigned int col;
 			int r, g, b;
 
-			tunnel_color(&r, &g, &b, toffs, *tmap++, *fog++);
+			tunnel_color(&r, &g, &b, toffs, tmap[j], fog[j]);
 			col = PACK_RGB32(r, g, b);
 
 			*pixels++ = col;
 			*pixels++ = col;
 		}
+		tmap += vxsz;
+		fog += vxsz;
 	}
 }