Rename Pipeline to Sequence

[libs/gl.git] / tools / viewer.cpp

diff --git a/tools/viewer.cpp b/tools/viewer.cpp
index a1853e922f19485097ee644e80900b76c9913b1f..ffdc4ec6eb513e4ad2955ddfedc8004f53032692 100644 (file)
--- a/tools/viewer.cpp
+++ b/tools/viewer.cpp
@@ -16,7 +16,7 @@
 #include <msp/gl/lighting.h>
 #include <msp/gl/mesh.h>
 #include <msp/gl/object.h>
-#include <msp/gl/pipeline.h>
+#include <msp/gl/sequence.h>
 #include <msp/gl/renderer.h>
 #include <msp/gl/resources.h>
 #include <msp/gl/simplescene.h>
@@ -34,6 +34,17 @@ using namespace Msp;
 class Viewer: public RegisteredApplication<Viewer>
 {
 private:
+       struct Options
+       {
+               list<string> resource_locations;
+               string animation_name;
+               string renderable_name;
+               Graphics::WindowOptions wnd_opts;
+               Graphics::GLOptions gl_opts;
+
+               Options(int, char **);
+       };
+
        class Resources: public GL::Resources
        {
        private:
@@ -47,11 +58,14 @@ private:
                void add_pack(const string &);
        };
 
-       Graphics::SimpleGLWindow window;
+       Options opts;
+       Graphics::Display display;
+       Graphics::Window window;
+       Graphics::GLContext gl_ctx;
        Input::Mouse mouse;
        Resources resources;
        GL::WindowView view;
-       GL::Pipeline pipeline;
+       GL::Sequence sequence;
        GL::Renderable *renderable;
        GL::AnimatedObject *anim_object;
        GL::AnimationPlayer *anim_player;
@@ -87,11 +101,27 @@ private:
 };
 
 
+Viewer::Options::Options(int argc, char **argv)
+{
+       GetOpt getopt;
+       getopt.add_option('r', "resources", resource_locations, GetOpt::REQUIRED_ARG);
+       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):
-       window(1024, 768, false),
+       opts(argc, argv),
+       window(display, opts.wnd_opts),
+       gl_ctx(window, opts.gl_opts),
        mouse(window),
-       view(window, window.get_gl_context()),
-       pipeline(view),
+       view(window, gl_ctx),
+       sequence(view),
        renderable(0),
        anim_object(0),
        anim_player(0),
@@ -102,16 +132,7 @@ Viewer::Viewer(int argc, char **argv):
        light_pitch(0),
        dragging(0)
 {
-       list<string> resource_locations;
-       string animation_name;
-       string renderable_name;
-       GetOpt getopt;
-       getopt.add_option('r', "resources", resource_locations, GetOpt::REQUIRED_ARG);
-       getopt.add_option('a', "animation", animation_name, GetOpt::REQUIRED_ARG);
-       getopt.add_argument("renderable", renderable_name);
-       getopt(argc, argv);
-
-       for(list<string>::const_iterator i=resource_locations.begin(); i!=resource_locations.end(); ++i)
+       for(list<string>::const_iterator i=opts.resource_locations.begin(); i!=opts.resource_locations.end(); ++i)
        {
                if(FS::is_dir(*i))
                        resources.add_directory(*i);
@@ -127,18 +148,18 @@ Viewer::Viewer(int argc, char **argv):
 
        GL::Object *object = 0;
 
-       string ext = FS::extpart(renderable_name);
+       string ext = FS::extpart(opts.renderable_name);
        if(ext==".mesh")
        {
                GL::Mesh *mesh = 0;
-               if(FS::exists(renderable_name))
+               if(FS::exists(opts.renderable_name))
                {
                        mesh = new GL::Mesh;
-                       DataFile::load(*mesh, renderable_name);
-                       resources.add("__"+renderable_name, mesh);
+                       DataFile::load(*mesh, opts.renderable_name);
+                       resources.add("__"+opts.renderable_name, mesh);
                }
                else
-                       mesh = &resources.get<GL::Mesh>(renderable_name);
+                       mesh = &resources.get<GL::Mesh>(opts.renderable_name);
 
                object = new GL::Object;
                GL::Technique *tech = new GL::Technique;
@@ -151,22 +172,29 @@ Viewer::Viewer(int argc, char **argv):
                resources.add("__.object", object);
        }
        else if(ext==".object")
-               renderable = load<GL::Object>(renderable_name);
+               renderable = load<GL::Object>(opts.renderable_name);
        else if(ext==".scene")
        {
-               GL::SimpleScene *scene = new GL::SimpleScene;
-               DataFile::load(*scene, renderable_name, resources);
-               renderable = scene;
+               if(FS::exists(opts.renderable_name))
+               {
+                       GL::Scene::GenericLoader ldr(resources);
+                       IO::BufferedFile in(opts.renderable_name);
+                       DataFile::Parser parser(in, opts.renderable_name);
+                       ldr.load(parser);
+                       renderable = ldr.get_scene();
+               }
+               else
+                       renderable = &resources.get<GL::Scene>(opts.renderable_name);
        }
        else
                throw usage_error("Unknown renderable type");
 
-       if(!animation_name.empty())
+       if(!opts.animation_name.empty())
        {
                if(!object)
                        throw usage_error("Must have an object to animate");
 
-               GL::Animation *anim = load<GL::Animation>(animation_name);
+               GL::Animation *anim = load<GL::Animation>(opts.animation_name);
                anim_player = new GL::AnimationPlayer;
                anim_object = new GL::AnimatedObject(*object);
                anim_player->play(*anim_object, *anim);
@@ -184,12 +212,12 @@ Viewer::Viewer(int argc, char **argv):
        camera.set_up_direction(GL::Vector3(0, 0, 1));
        update_camera();
 
-       GL::Pipeline::Pass &pass = pipeline.add_pass(0, *renderable);
-       pass.set_lighting(&lighting);
-       pass.set_depth_test(&GL::DepthTest::lequal());
-       pass.set_blend(&GL::Blend::alpha());
+       GL::Sequence::Step &step = sequence.add_step(0, *renderable);
+       step.set_lighting(&lighting);
+       step.set_depth_test(&GL::DepthTest::lequal());
+       step.set_blend(&GL::Blend::alpha());
 
-       view.set_content(&pipeline);
+       view.set_content(&sequence);
        view.set_camera(&camera);
 }
 
@@ -232,7 +260,7 @@ void Viewer::tick()
                anim_player->tick(dt);
        }
 
-       window.tick();
+       display.tick();
        view.render();
 }