X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmodern%2Fmain.c;h=ea1080552e88e2b2fd64e530d7c5adecc43259c4;hb=7ef52b31864696747396945b2ca8892d8796f96c;hp=c72b788fb70ec7d76025edd7bcce781060f9c0a1;hpb=5f50ec3c542ea29211591d4865bdaf1368f8c649;p=retroray diff --git a/src/modern/main.c b/src/modern/main.c index c72b788..ea10805 100644 --- a/src/modern/main.c +++ b/src/modern/main.c @@ -20,7 +20,9 @@ along with this program. If not, see . #include #include "miniglut.h" #include "app.h" +#include "logger.h" +static void display(void); static void reshape(int x, int y); static void keydown(unsigned char key, int x, int y); static void keyup(unsigned char key, int x, int y); @@ -52,7 +54,7 @@ int main(int argc, char **argv) glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE); glutCreateWindow("RetroRay"); - glutDisplayFunc(app_display); + glutDisplayFunc(display); glutReshapeFunc(reshape); glutKeyboardFunc(keydown); glutKeyboardUpFunc(keyup); @@ -81,6 +83,8 @@ int main(int argc, char **argv) win_height = glutGet(GLUT_WINDOW_HEIGHT); win_aspect = (float)win_width / win_height; + init_logger(); + if(app_init() == -1) { return 1; } @@ -175,6 +179,11 @@ void app_vsync(int vsync) #endif +static void display(void) +{ + app_display(); + app_swap_buffers(); +} static void reshape(int x, int y) { @@ -234,7 +243,7 @@ static int translate_skey(int key) case GLUT_KEY_PAGE_UP: return KEY_PGUP; case GLUT_KEY_PAGE_DOWN: - return KEY_PGDOWN; + return KEY_PGDN; case GLUT_KEY_HOME: return KEY_HOME; case GLUT_KEY_END: