X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=tools%2Fviewer.cpp;h=2c950e18e2acc22714ee9d3030ed7467371a0fe0;hp=a1853e922f19485097ee644e80900b76c9913b1f;hb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b;hpb=3e9eb612a32ebe05030b934e0afb059f19cbb320 diff --git a/tools/viewer.cpp b/tools/viewer.cpp index a1853e92..2c950e18 100644 --- a/tools/viewer.cpp +++ b/tools/viewer.cpp @@ -16,15 +16,17 @@ #include #include #include -#include +#include +#include +#include #include #include #include #include -#include #include #include #include +#include #include #include @@ -34,6 +36,17 @@ using namespace Msp; class Viewer: public RegisteredApplication { private: + struct Options + { + list 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 +60,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 +103,39 @@ private: }; +Viewer::Options::Options(int argc, char **argv) +{ + string window_size; + + GetOpt getopt; + getopt.add_option('r', "resources", resource_locations, GetOpt::REQUIRED_ARG); + getopt.add_option('a', "animation", animation_name, GetOpt::REQUIRED_ARG); + getopt.add_option('w', "window-size", window_size, GetOpt::REQUIRED_ARG); + getopt.add_argument("renderable", renderable_name); + getopt(argc, argv); + + wnd_opts.width = 1024; + wnd_opts.height = 768; + if (!window_size.empty()) + { + RegMatch m = Regex("^([1-9][0-9]*)x([1-9][0-9]*)$").match(window_size); + if(!m) + throw usage_error("Invalid window size"); + + wnd_opts.width = lexical_cast(m[1].str); + wnd_opts.height = lexical_cast(m[2].str); + } + 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(0), renderable(0), anim_object(0), anim_player(0), @@ -102,16 +146,7 @@ Viewer::Viewer(int argc, char **argv): light_pitch(0), dragging(0) { - list 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::const_iterator i=resource_locations.begin(); i!=resource_locations.end(); ++i) + for(list::const_iterator i=opts.resource_locations.begin(); i!=opts.resource_locations.end(); ++i) { if(FS::is_dir(*i)) resources.add_directory(*i); @@ -127,18 +162,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(renderable_name); + mesh = &resources.get(opts.renderable_name); object = new GL::Object; GL::Technique *tech = new GL::Technique; @@ -151,22 +186,35 @@ Viewer::Viewer(int argc, char **argv): resources.add("__.object", object); } else if(ext==".object") - renderable = load(renderable_name); + renderable = load(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(opts.renderable_name); + } + else if(ext==".seq") + { + GL::SequenceTemplate *tmpl = load(opts.renderable_name); + GL::SequenceBuilder bld(*tmpl); + sequence = bld.build(view); } 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(animation_name); + GL::Animation *anim = load(opts.animation_name); anim_player = new GL::AnimationPlayer; anim_object = new GL::AnimatedObject(*object); anim_player->play(*anim_object, *anim); @@ -179,17 +227,21 @@ Viewer::Viewer(int argc, char **argv): mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Viewer::axis_motion), false)); light.set_position(GL::Vector4(0, 0, 1, 0)); - lighting.attach(0, light); + lighting.attach(light); 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()); + if(!sequence) + { + sequence = new GL::Sequence(view); + GL::Sequence::Step &step = sequence->add_step(0, *renderable); + step.set_lighting(&lighting); + step.set_depth_test(GL::LEQUAL); + step.set_blend(GL::Blend(GL::SRC_ALPHA, GL::ONE_MINUS_SRC_ALPHA)); + } - view.set_content(&pipeline); + view.set_content(sequence); view.set_camera(&camera); } @@ -211,6 +263,7 @@ Viewer::~Viewer() { delete anim_player; delete anim_object; + delete sequence; } int Viewer::main() @@ -232,7 +285,7 @@ void Viewer::tick() anim_player->tick(dt); } - window.tick(); + display.tick(); view.render(); }