X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.cpp;h=769996834bd89692f1be7496e6c2d1a411b0d3b6;hb=355e3a068ea4ad6a7d3ab9318b3ce74b7f0b0b15;hp=964099e51e4022c09335c16b7ca023d491de7c26;hpb=0c731643d6363eb4c492e836ffb919cb7c0a3035;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index 964099e5..76999683 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -25,14 +25,14 @@ 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)
 {
 	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);
@@ -81,7 +81,9 @@ void Object::render(Renderer &renderer, const Tag &tag) const
 	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
@@ -95,10 +97,12 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
 	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);