Add setup/finish_render hooks to Object

[libs/gl.git] / source / object.cpp

diff --git a/source/object.cpp b/source/object.cpp
index 06062fc099da69e169f0f23431c5445ce931216b..ab7afc1480aaf272589df76a6dbe31ac732dd084 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -32,7 +32,7 @@ Object::~Object()
 void Object::set_mesh(unsigned i, const Mesh *m)
 {
        if(i>meshes.size())
-               throw invalid_argument("Object::set_mesh");
+               throw out_of_range("Object::set_mesh");
 
        if(i==meshes.size())
                meshes.push_back(m);
@@ -77,11 +77,13 @@ void Object::render(Renderer &renderer, const Tag &tag) const
                return;
 
        Renderer::Push push(renderer);
-       renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
+       renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
        renderer.set_material(pass->get_material());
        renderer.set_texturing(pass->get_texturing());
 
+       setup_render(renderer, tag);
        meshes.front()->draw(renderer);
+       finish_render(renderer, tag);
 }
 
 void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &tag) const
@@ -91,14 +93,16 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
                return;
 
        Renderer::Push push(renderer);
-       renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
+       renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
        renderer.set_material(pass->get_material());
        renderer.set_texturing(pass->get_texturing());
 
+       setup_render(renderer, tag);
        inst.setup_render(renderer, tag);
        unsigned lod = min<unsigned>(inst.get_level_of_detail(renderer), meshes.size()-1);
        meshes[lod]->draw(renderer);
        inst.finish_render(renderer, tag);
+       finish_render(renderer, tag);
 }
 
 const RenderPass *Object::get_pass(const Tag &tag) const
@@ -144,7 +148,7 @@ void Object::Loader::mesh_inline()
 void Object::Loader::mesh_inline_lod(unsigned l)
 {
        if(l>obj.meshes.size())
-               throw invalid_argument("Object::Loader::mesh_inline_lod");
+               throw out_of_range("Object::Loader::mesh_inline_lod");
 
        RefPtr<Mesh> msh = new Mesh;
        load_sub(*msh);