Use latest OpenGL version in viewer

diff --git a/tools/viewer.cpp b/tools/viewer.cpp
index 05f85de2430c5f2854ac40c9fc6e2015d6d48a64..e19353c8adbf0c4e52b7fc90c701ddc715caa837 100644 (file)
--- a/tools/viewer.cpp
+++ b/tools/viewer.cpp
@@ -39,6 +39,8 @@ private:
                list<string> resource_locations;
                string animation_name;
                string renderable_name;
+               Graphics::WindowOptions wnd_opts;
+               Graphics::GLOptions gl_opts;
 
                Options(int, char **);
        };
@@ -57,7 +59,9 @@ private:
        };
 
        Options opts;
-       Graphics::SimpleGLWindow window;
+       Graphics::Display display;
+       Graphics::Window window;
+       Graphics::GLContext gl_ctx;
        Input::Mouse mouse;
        Resources resources;
        GL::WindowView view;
@@ -104,13 +108,19 @@ Viewer::Options::Options(int argc, char **argv)
        getopt.add_option('a', "animation", animation_name, GetOpt::REQUIRED_ARG);
        getopt.add_argument("renderable", renderable_name);
        getopt(argc, argv);
+
+       wnd_opts.width = 1024;
+       wnd_opts.height = 768;
+       gl_opts.gl_version_major = Graphics::GLOptions::LATEST_VERSION;
+       gl_opts.core_profile = true;
 }
 
 Viewer::Viewer(int argc, char **argv):
        opts(argc, argv),
-       window(1024, 768, false),
+       window(display, opts.wnd_opts),
+       gl_ctx(window, opts.gl_opts),
        mouse(window),
-       view(window, window.get_gl_context()),
+       view(window, gl_ctx),
        pipeline(view),
        renderable(0),
        anim_object(0),
@@ -243,7 +253,7 @@ void Viewer::tick()
                anim_player->tick(dt);
        }
 
-       window.tick();
+       display.tick();
        view.render();
 }