Throw if trying to render an Object without a Technique

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

diff --git a/source/object.cpp b/source/object.cpp
index bd899961030095439688bf3bdc866691cfccb088..ae38af6b4e7f2c9274206561759bfdef4d442987 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -25,9 +25,9 @@ Object::Object(const Mesh *m, const Technique *t)
        set_technique(t);
 }
 
+// Avoid synthesizing ~RefPtr in files including object.h
 Object::~Object()
-{
-}
+{ }
 
 void Object::set_mesh(unsigned i, const Mesh *m)
 {
@@ -77,11 +77,11 @@ void Object::render(Renderer &renderer, const Tag &tag) const
                return;
 
        Renderer::Push push(renderer);
-       renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
-       renderer.set_material(pass->get_material());
-       renderer.set_texturing(pass->get_texturing());
+       pass->apply(renderer);
 
+       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,19 +91,21 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
                return;
 
        Renderer::Push push(renderer);
-       renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
-       renderer.set_material(pass->get_material());
-       renderer.set_texturing(pass->get_texturing());
+       pass->apply(renderer);
 
+       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
 {
-       if(!technique || !technique->has_pass(tag))
+       if(!technique)
+               throw logic_error("!technique");
+       if(!technique->has_pass(tag))
                return 0;
        return &technique->get_pass(tag);
 }