disabled dep-files when building on dos, because it goes into an infinite loop

[dosdemo] / src / tunnel.c

diff --git a/src/tunnel.c b/src/tunnel.c
index ee6758e..9071b74 100644 (file)
--- 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,
@@ -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,18 +214,13 @@ 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++) {
@@ -258,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;
@@ -281,3 +284,4 @@ static unsigned int *gen_test_image(int *wptr, int *hptr)
        *hptr = ysz;
        return pixels;
 }
+*/