moving on

[eradicate] / src / introscr.c

diff --git a/src/introscr.c b/src/introscr.c
index 16567ff..170cab4 100644 (file)
--- a/src/introscr.c
+++ b/src/introscr.c
@@ -5,7 +5,7 @@
 #include "gfxutil.h"
 #include "game.h"
 
-#define FADE_DUR       1024
+#define FADE_DUR       800
 
 static void *logo;
 static int logo_width, logo_height;
@@ -13,7 +13,7 @@ static long start_time;
 
 int intro_init(void)
 {
-       if(!(logo = img_load_pixels("data/msglogo.jpg", &logo_width, &logo_height, IMG_FMT_RGB24))) {
+       if(!(logo = img_load_pixels("data/msglogo.jpg", &logo_width, &logo_height, IMG_FMT_BGRA32))) {
                fprintf(stderr, "failed to load logo image\n");
                return -1;
        }
@@ -27,6 +27,9 @@ void intro_cleanup(void)
 
 void intro_start(void)
 {
+       draw = intro_draw;
+       key_event = intro_keyb;
+
        start_time = time_msec;
 }
 
@@ -34,27 +37,49 @@ void intro_stop(void)
 {
 }
 
+void fade_image(void *dest, void *src, uint16_t fade);
+
 void intro_draw(void)
 {
-       int i, j;
+       long tm;
        uint16_t fade;
-       unsigned char *src = logo;
-       uint16_t *dest = fb_pixels;
 
-       fade = (time_msec - start_time) * 256 / FADE_DUR;
-       if(fade > 256) fade = 256;
+       tm = time_msec - start_time;
+       if(tm < FADE_DUR) {
+               fade = tm * 256 / FADE_DUR;
+       } else if(tm < FADE_DUR * 2) {
+               fade = 256;
+       } else if(tm < FADE_DUR * 3) {
+               fade = 256 - (tm - 2 * FADE_DUR) * 256 / FADE_DUR;
+       } else {
+               fade = 0;
+               menu_start();
+               return;
+       }
 
-       for(i=0; i<fb_height; i++) {
-               for(j=0; j<fb_width; j++) {
-                       uint16_t r = (uint16_t)*src++ * fade / 256;
-                       uint16_t g = (uint16_t)*src++ * fade / 256;
-                       uint16_t b = (uint16_t)*src++ * fade / 256;
+#ifdef USE_MMX
+       fade_image(fb_pixels, logo, fade);
+#else
+       {
+               int i, j;
+               uint32_t *src = logo;
+               uint16_t *dest = fb_pixels;
+               for(i=0; i<640*480; i++) {
+                       uint32_t pix = *src++;
+                       uint16_t r = (uint16_t)UNPACK_R32(pix) * fade / 256;
+                       uint16_t g = (uint16_t)UNPACK_G32(pix) * fade / 256;
+                       uint16_t b = (uint16_t)UNPACK_B32(pix) * fade / 256;
                        *dest++ = PACK_RGB16(r, g, b);
-                       src += 3;
                }
        }
+#endif
+
+       blit_frame(fb_pixels, 0);
 }
 
 void intro_keyb(int key, int pressed)
 {
+       if(pressed) {
+               menu_start();
+       }
 }