X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Ftunnel.c;h=9071b74ea4a1cba12010c6bcd4c86c88bfff6da3;hp=466242049e308173ab7fe497ac627144426e1fd4;hb=3398fc6c4188104048f99b650a6cb90beda9b6ed;hpb=77c1d84c258ca14e1bba06ab711426668ff24290

diff --git a/src/tunnel.c b/src/tunnel.c
index 4662420..9071b74 100644
--- a/src/tunnel.c
+++ b/src/tunnel.c
@@ -1,10 +1,12 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
 #include <assert.h>
-/*#include <imago2.h>*/
+#include "imago2.h"
 #include "demo.h"
 #include "screen.h"
+#include "gfxutil.h"
 
 #ifndef M_PI
 #define M_PI	3.1415926535
@@ -26,8 +28,6 @@ static void draw_tunnel_range(unsigned short *pixels, int xoffs, int yoffs, int
 static int count_bits(unsigned int x);
 static int count_zeros(unsigned int x);
 
-static unsigned int *gen_test_image(int *wptr, int *hptr);
-
 static struct screen scr = {
 	"tunnel",
 	init,
@@ -64,7 +64,7 @@ static int init(void)
 	unsigned char *fog;
 	float aspect = (float)fb_width / (float)fb_height;
 
-	xsz = fb_width / 2;
+	xsz = fb_width;
 	ysz = fb_height;
 	vxsz = xsz * VSCALE;
 	vysz = ysz * VSCALE;
@@ -102,16 +102,16 @@ static int init(void)
 		}
 	}
 
-	/*if(!(tex_pixels = img_load_pixels(TEX_FNAME, &tex_xsz, &tex_ysz, IMG_FMT_RGBA32))) {
+	if(!(tex_pixels = img_load_pixels(TEX_FNAME, &tex_xsz, &tex_ysz, IMG_FMT_RGBA32))) {
 		fprintf(stderr, "failed to load image " TEX_FNAME "\n");
 		return -1;
 	}
 	if((count_bits(tex_xsz) | count_bits(tex_ysz)) != 1) {
 		fprintf(stderr, "non-pow2 image (%dx%d)\n", tex_xsz, tex_ysz);
 		return -1;
-	}*/
+	}
 
-	tex_pixels = gen_test_image(&tex_xsz, &tex_ysz);
+	/*tex_pixels = gen_test_image(&tex_xsz, &tex_ysz);*/
 
 	n = count_zeros(tex_xsz);
 	for(i=0; i<n; i++) {
@@ -132,7 +132,7 @@ static void destroy(void)
 {
 	free(tunnel_map);
 	free(tunnel_fog);
-	free(tex_pixels);
+	img_free_pixels(tex_pixels);
 }
 
 static void start(long trans_time)
@@ -181,8 +181,15 @@ static void draw(void)
 
 	for(i=0; i<NUM_WORK_ITEMS; i++) {
 		int starty = i * num_lines;
-		draw_tunnel_range((unsigned short*)fb_pixels, xoffs, yoffs, starty, draw_lines, time_msec);
+		int resty = starty + draw_lines;
+		int rest_lines = num_lines - draw_lines;
+		draw_tunnel_range(fb_pixels, xoffs, yoffs, starty, draw_lines, time_msec);
+		if(rest_lines) {
+			memset(fb_pixels + resty * fb_width, 0, rest_lines * fb_width * 2);
+		}
 	}
+
+	swap_buffers(0);
 }
 
 static void tunnel_color(int *rp, int *gp, int *bp, long toffs, unsigned int tpacked, int fog)
@@ -207,28 +214,25 @@ static void tunnel_color(int *rp, int *gp, int *bp, long toffs, unsigned int tpa
 	*bp = (b * fog) >> 8;
 }
 
-#define PACK_RGB16(r, g, b) \
-	(((((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 *pix, int xoffs, int yoffs, int starty, int num_lines, long tm)
 {
 	int i, j;
 	unsigned int *tmap = tunnel_map + (starty + yoffs) * vxsz + xoffs;
 	unsigned char *fog = tunnel_fog + (starty + yoffs) * vxsz + xoffs;
 
-	long toffs = tm / 4;
+	long toffs = tm / 8;
 	unsigned int *pixels = (unsigned int*)pix + starty * (fb_width >> 1);
 
 	for(i=0; i<num_lines; i++) {
-		for(j=0; j<xsz; j++) {
+		for(j=0; j<(xsz>>1); j++) {
 			unsigned int col;
-			int r, g, b;
+			int r, g, b, idx = j << 1;
 
-			tunnel_color(&r, &g, &b, toffs, tmap[j], fog[j]);
+			tunnel_color(&r, &g, &b, toffs, tmap[idx], fog[idx]);
 			col = PACK_RGB16(r, g, b);
-			*pixels++ = (col << 16) | col;
+			tunnel_color(&r, &g, &b, toffs, tmap[idx + 1], fog[idx + 1]);
+			col |= PACK_RGB16(r, g, b) << 16;
+			*pixels++ = col;
 		}
 		tmap += vxsz;
 		fog += vxsz;
@@ -256,6 +260,7 @@ static int count_zeros(unsigned int x)
 	return num;
 }
 
+/*
 static unsigned int *gen_test_image(int *wptr, int *hptr)
 {
 	int i, j;
@@ -279,3 +284,4 @@ static unsigned int *gen_test_image(int *wptr, int *hptr)
 	*hptr = ysz;
 	return pixels;
 }
+*/