transitions

[fbgfx] / src / tunnel.c

diff --git a/src/tunnel.c b/src/tunnel.c
index 4707d81..8dec902 100644 (file)
--- a/src/tunnel.c
+++ b/src/tunnel.c
@@ -20,10 +20,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, 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 starty, int num_lines, long tm);
+static void draw_tunnel_range32(void *pixels, int starty, int num_lines, long tm);
 static int count_bits(unsigned int x);
 static int count_zeros(unsigned int x);
 
@@ -47,6 +47,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)
 {
@@ -146,10 +149,16 @@ static void destroy(void)
 
 static void start(long trans_time)
 {
+       trans_start = time_msec;
+       trans_dur = trans_time;
+       trans_dir = 1;
 }
 
 static void stop(long trans_time)
 {
+       trans_start = time_msec;
+       trans_dur = trans_time;
+       trans_dir = -1;
 }
 
 #define NUM_WORK_ITEMS 32
@@ -157,21 +166,38 @@ static void stop(long trans_time)
 static struct work {
        void *pixels;
        int starty, num_lines;
+       long tm;
 } 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->starty, w->num_lines, w->tm);
 }
 
 static void draw(void)
 {
        int i, num_lines = vysz / NUM_WORK_ITEMS;
+       int draw_lines = num_lines;
+
+       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;
+               }
+       }
+
        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;
 
                tpool_enqueue(tpool, work + i, work_func, 0);
        }
@@ -205,13 +231,13 @@ 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 starty, int num_lines, long tm)
 {
        int i, j;
        unsigned int *tmap = tunnel_map + starty * vxsz;
        unsigned char *fog = tunnel_fog + starty * vxsz;
 
-       long toffs = time_msec / 4;
+       long toffs = tm / 4;
        unsigned int *pixels = (unsigned int*)pix + starty * (xsz >> 1);
 
        for(i=0; i<num_lines; i++) {
@@ -226,13 +252,13 @@ static void draw_tunnel_range16(void *pix, int starty, int num_lines)
        }
 }
 
-static void draw_tunnel_range32(void *pix, int starty, int num_lines)
+static void draw_tunnel_range32(void *pix, int starty, int num_lines, long tm)
 {
        int i, j;
        unsigned int *tmap = tunnel_map + starty * vxsz;
        unsigned char *fog = tunnel_fog + starty * vxsz;
 
-       long toffs = time_msec / 4;
+       long toffs = tm / 4;
        unsigned int *pixels = (unsigned int*)pix + starty * xsz * VSCALE;
 
        for(i=0; i<num_lines; i++) {