From 2bcdae2a8c8067a7c4a413fabe60283fadf6713b Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sat, 16 Aug 2014 12:39:16 +0300 Subject: [PATCH] Rework loading in viewer It can now load external resources, and adding new types of renderables in the future is easier. --- tools/viewer.cpp | 162 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 118 insertions(+), 44 deletions(-) diff --git a/tools/viewer.cpp b/tools/viewer.cpp index 1d533b5d..2582b887 100644 --- a/tools/viewer.cpp +++ b/tools/viewer.cpp @@ -1,6 +1,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -13,6 +16,8 @@ #include #include #include +#include +#include #include #include #include @@ -25,11 +30,23 @@ using namespace Msp; class Viewer: public RegisteredApplication { private: + class Resources: public GL::Resources + { + private: + DataFile::DirectorySource dir_source; + DataFile::PackSource pack_source; + + public: + Resources(); + + void add_directory(const string &); + void add_pack(const string &); + }; + Graphics::SimpleGLWindow window; Input::Mouse mouse; - GL::Object *object; - GL::Mesh *mesh; - GL::Animation *animation; + Resources resources; + GL::Renderable *renderable; GL::AnimatedObject *anim_object; GL::AnimationPlayer *anim_player; GL::Light light; @@ -45,6 +62,10 @@ private: public: Viewer(int, char **); +private: + template + T *load(const string &); +public: ~Viewer(); virtual int main(); @@ -63,9 +84,7 @@ private: Viewer::Viewer(int argc, char **argv): window(1024, 768, false), mouse(window), - object(0), - mesh(0), - animation(0), + renderable(0), anim_object(0), anim_player(0), yaw(0), @@ -75,43 +94,72 @@ Viewer::Viewer(int argc, char **argv): light_pitch(0), dragging(0) { - if(argc<2) - throw usage_error("Filename must be provided"); - - for(int i=1; i 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) { - string fn = argv[i]; - string ext = FS::extpart(fn); - - if(ext==".mesh") + if(FS::is_dir(*i)) + resources.add_directory(*i); + else { - if(mesh || object) - throw usage_error("Only one mesh or object may be specified"); - - mesh = new GL::Mesh; - DataFile::load(*mesh, fn); + string ext = FS::extpart(*i); + if(ext==".mdp") + resources.add_pack(*i); + else + DataFile::load(resources, *i); } - else if(ext==".object") - { - if(mesh || object) - throw usage_error("Only one mesh or object may be specified"); + } - object = new GL::Object; - DataFile::load(*object, fn); - } - else if(ext==".anim") + GL::Object *object = 0; + + string ext = FS::extpart(renderable_name); + if(ext==".mesh") + { + GL::Mesh *mesh = 0; + if(FS::exists(renderable_name)) { - if(!object) - throw usage_error("An object must be provided for animation"); - - animation = new GL::Animation; - DataFile::load(*animation, argv[2]); - anim_object = new GL::AnimatedObject(*object); - anim_player = new GL::AnimationPlayer; - anim_player->play(*anim_object, *animation); + mesh = new GL::Mesh; + DataFile::load(*mesh, renderable_name); + resources.add("__"+renderable_name, mesh); } else - throw usage_error("Don't know how to view this file"); + mesh = &resources.get(renderable_name); + + object = new GL::Object; + GL::Technique *tech = new GL::Technique; + tech->add_pass(0); + object->set_mesh(mesh); + object->set_technique(tech); + renderable = object; + + resources.add("__.tech", tech); + resources.add("__.object", object); + } + else if(ext==".object") + { + object = load(renderable_name); + renderable = object; + } + else + throw usage_error("Unknown renderable type"); + + if(!animation_name.empty()) + { + if(!object) + throw usage_error("Must have an object to animate"); + + GL::Animation *anim = load(animation_name); + anim_player = new GL::AnimationPlayer; + anim_object = new GL::AnimatedObject(*object); + anim_player->play(*anim_object, *anim); + renderable = anim_object; } window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Viewer::exit), 0)); @@ -126,10 +174,24 @@ Viewer::Viewer(int argc, char **argv): update_camera(); } +template +T *Viewer::load(const string &name) +{ + if(FS::exists(name)) + { + T *thing = new T; + DataFile::load(*thing, name, resources); + resources.add("__"+name, thing); + return thing; + } + else + return &resources.get(name); +} + Viewer::~Viewer() { - delete object; - delete mesh; + delete anim_player; + delete anim_object; } int Viewer::main() @@ -160,12 +222,7 @@ void Viewer::tick() GL::Bind bind_lighting(lighting); GL::Bind bind_depth(GL::DepthTest::lequal()); GL::Bind bind_blend(GL::Blend::alpha()); - if(anim_object) - anim_object->render(); - else if(object) - object->render(); - else if(mesh) - mesh->draw(); + renderable->render(); window.swap_buffers(); } @@ -251,3 +308,20 @@ void Viewer::update_light() float sp = sin(light_pitch); light.set_position(GL::Vector4(-cy*cp, -sy*cp, -sp, 0)); } + + +Viewer::Resources::Resources() +{ + add_source(dir_source); + add_source(pack_source); +} + +void Viewer::Resources::add_directory(const string &dir) +{ + dir_source.add_directory(dir); +} + +void Viewer::Resources::add_pack(const string &pack) +{ + pack_source.add_pack_file(pack); +} -- 2.45.2