fixed menu blur

[eradicate] / src / menuscr.c

diff --git a/src/menuscr.c b/src/menuscr.c
index 51f8ae9..22846f4 100644 (file)
--- a/src/menuscr.c
+++ b/src/menuscr.c
@@ -1,16 +1,24 @@
 #include <stdio.h>
+#include <string.h>
+#include <math.h>
 #include "screens.h"
 #include "imago2.h"
 #include "gfx.h"
 #include "gfxutil.h"
 #include "game.h"
+#include "util.h"
+
+#define PADX   42
+#define PADX2  (PADX * 2)
+#define PADY   16
+#define PADY2  (PADY * 2)
 
 static const struct menuent {
        int x, y, len, height;
 } menuent[] = {
-       {240, 300, 170, 32},
-       {230, 360, 184, 32},
-       {260, 424, 130, 32}
+       {252 - PADX, 281 - PADY, 147 + PADX2, 37 + PADY2},
+       {244 - PADX, 344 - PADY, 161 + PADX2, 37 + PADY2},
+       {276 - PADX, 407 - PADY, 102 + PADX2, 38 + PADY2}
 };
 
 static int cur;
@@ -36,6 +44,8 @@ void menu_start(void)
 {
        draw = menu_draw;
        key_event = menu_keyb;
+
+       memcpy(fb_pixels, bgpix, fb_size);
 }
 
 void menu_stop(void)
@@ -43,36 +53,74 @@ void menu_stop(void)
 }
 
 
+#define BBW            256
+#define BBH            64
 
 void menu_draw(void)
 {
-       static uint16_t blurbuf[2][16384];
-       int y, offs;
-       int i, j;
+       static uint16_t blurbuf[2][BBW * BBH];
+       int fboffs, tmp, cleartop;
        const struct menuent *ent = menuent + cur;
 
-       y = ent->y - ent->height / 2;
-       offs = y * ent->len + ent->x;
-       blit(blurbuf[0], ent->len, bgpix + offs, ent->len, ent->height, bgwidth);
+       int blur_rad_x = (int)((sin(time_msec / 1000.0f) * 0.5f + 0.5f) * 50.0f);
+       int blur_rad_y = (int)((cos(time_msec / 1000.0f) * 0.5f + 0.5f) * 50.0f);
 
-       //blur_grey_horiz(blurbuf[1], blurbuf[0], ent->len, ent->height, 5, 0x100);
-       for(i=0; i<ent->height; i++) {
-               for(j=0; j<ent->len; j++) {
-                       blurbuf[1][i * ent->len + j] = 0xff;//~blurbuf[0][i * ent->len + j];
-               }
-       }
+       fboffs = ent->y * fb_width + ent->x;
+
+       memset(blurbuf[0], 0, sizeof blurbuf[0]);
+       blit(blurbuf[0], BBW, bgpix + fboffs, ent->len, ent->height, bgwidth);
 
-       wait_vsync();
+       blur_horiz(blurbuf[1], blurbuf[0], BBW, BBH, blur_rad_x + 3, 0x140);
+       blur_vert(blurbuf[0], blurbuf[1], BBW, BBH, blur_rad_y / 4 + 3, 0x140);
+
+       //wait_vsync();
+
+       cleartop = 280 * fb_width;
+       memcpy(fb_pixels + cleartop, bgpix + cleartop, (fb_height - 280) * fb_width << 1);
+
+       blit(fb_pixels + fboffs, fb_width, blurbuf[0], ent->len, ent->height, BBW);
+       blit_key(fb_pixels + fboffs, fb_width, bgpix + fboffs, ent->len, ent->height, bgwidth, 0);
+
+       if(show_fps) {
+               blit(fb_pixels, fb_width, bgpix, 64, 16, bgwidth);
+       }
 
-       blit_frame(bgpix, 0);
-       blit(fb_pixels + offs, fb_width, blurbuf[1], ent->len, ent->height, ent->len);
+       blit_frame(fb_pixels, 0);
 }
 
 void menu_keyb(int key, int pressed)
 {
+       if(!pressed) return;
+
        switch(key) {
        case 27:
                game_quit();
                break;
+
+       case KB_UP:
+               if(cur > 0) cur--;
+               break;
+
+       case KB_DOWN:
+               if(cur < sizeof menuent / sizeof *menuent - 1) {
+                       cur++;
+               }
+               break;
+
+       case '\n':
+       case '\r':
+               switch(cur) {
+               case 0:
+                       /* enter game */
+                       break;
+
+               case 1:
+                       //options_start();
+                       break;
+
+               case 2:
+                       game_quit();
+                       break;
+               }
        }
 }