fixed loading screen. regression in blitfb

diff --git a/src/gfxutil.c b/src/gfxutil.c
index d410766..6f8ca5e 100644 (file)
--- a/src/gfxutil.c
+++ b/src/gfxutil.c
@@ -247,6 +247,7 @@ void blitfb(uint16_t *dest, uint16_t *src, int width, int height, int pitch_pix)
        for(i=0; i<height; i++) {
                memcpy(dest, src, width << 1);
                dest += 320;
+               src += pitch_pix;
        }
 }
 

diff --git a/src/glut/main.c b/src/glut/main.c
index 638438d..abe25cc 100644 (file)
--- a/src/glut/main.c
+++ b/src/glut/main.c
@@ -118,6 +118,8 @@ int main(int argc, char **argv)
        wgl_swap_interval_ext = wglGetProcAddress("wglSwapIntervalEXT");
 #endif
 
+       reshape(glutGet(GLUT_WINDOW_WIDTH), glutGet(GLUT_WINDOW_HEIGHT));
+
        if(au_init() == -1) {
                return 1;
        }

diff --git a/src/screen.c b/src/screen.c
index 8069ce8..baf4ec2 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -186,10 +186,20 @@ int scr_change(struct screen *s, long trans_time)
 
 /* loading screen */
 extern uint16_t loading_pixels[];
+static long prev_load_msec;
+static long load_delay = 180;
 
 void start_loadscr(void)
 {
+       char *env;
+       if((env = getenv("MLAPSE_LOADDELAY"))) {
+               load_delay = atoi(env);
+               printf("load delay: %ld ms\n", load_delay);
+       }
+
        swap_buffers(loading_pixels);
+       sleep_msec(load_delay * 2);
+       prev_load_msec = get_msec();
 }
 
 #define SPLAT_X 288
@@ -204,10 +214,9 @@ void start_loadscr(void)
 void end_loadscr(void)
 {
        blitfb(loading_pixels + SPLAT_Y * 320 + SPLAT_X, loading_pixels + 320 * 240, 32, 72, 32);
-       blit_key(loading_pixels + FING_Y * 320 + FING_LAST_X, 320, loading_pixels + 247 * 320 + 64,
-                       FING_W, FING_H, FING_W, 0);
+       blit_key(loading_pixels + FING_Y * 320 + FING_LAST_X, 320, loading_pixels + 247 * 320 + 64, FING_W, FING_H, FING_W, 0);
        swap_buffers(loading_pixels);
-       sleep_msec(300);
+       sleep_msec(load_delay * 4);
 }
 
 void loadscr(int n, int count)
@@ -215,6 +224,7 @@ void loadscr(int n, int count)
        int xoffs = 75 * n / (count - 1);
        static int prev_xoffs;
        uint16_t *sptr, *dptr;
+       long delta;
 
        sptr = loading_pixels + 247 * 320 + 64;
        dptr = loading_pixels + FING_Y * 320 + FING_X + prev_xoffs;
@@ -227,5 +237,9 @@ void loadscr(int n, int count)
 
        swap_buffers(loading_pixels);
 
-       /*sleep_msec(200);*/
+       delta = get_msec() - prev_load_msec;
+       if(delta < load_delay) {
+               sleep_msec(load_delay - delta);
+       }
+       prev_load_msec = get_msec();
 }