glut version: make the loading screen fullscreen if demo is going to run fullscreen

[dosdemo] / src / glut / main.c

diff --git a/src/glut/main.c b/src/glut/main.c
index 79833d9..824837e 100644 (file)
--- a/src/glut/main.c
+++ b/src/glut/main.c
@@ -73,7 +73,12 @@ static cgm_quat rot = {0, 0, 0, 1};
 int main(int argc, char **argv)
 {
        glutInit(&argc, argv);
-       glutInitWindowSize(1280, 960);
+
+       if(glutGet(GLUT_SCREEN_HEIGHT) <= 1024) {
+               glutInitWindowSize(640, 480);
+       } else {
+               glutInitWindowSize(1280, 960);
+       }
        glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
        glutCreateWindow("Mindlapse");
 
@@ -117,15 +122,22 @@ int main(int argc, char **argv)
                return 1;
        }
        time_msec = 0;
-       if(demo_init(argc, argv) == -1) {
+       if(demo_init1(argc, argv) == -1) {
                return 1;
        }
-       atexit(demo_cleanup);
 
        if(opt.fullscreen) {
                set_fullscreen(opt.fullscreen);
+               reshape(glutGet(GLUT_SCREEN_WIDTH), glutGet(GLUT_SCREEN_HEIGHT));
+       } else {
+               reshape(glutGet(GLUT_WINDOW_WIDTH), glutGet(GLUT_WINDOW_HEIGHT));
        }
 
+       if(demo_init2() == -1) {
+               return 1;
+       }
+       atexit(demo_cleanup);
+
        reset_timer();
 
        glutMainLoop();