X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fobject.cpp;h=769996834bd89692f1be7496e6c2d1a411b0d3b6;hb=8b9d1625ac367114612b57a83901033ffc2bc7e0;hp=bd899961030095439688bf3bdc866691cfccb088;hpb=b250a711295f5ba00114f11a5b1c855eebe08d26;p=libs%2Fgl.git diff --git a/source/object.cpp b/source/object.cpp index bd899961..76999683 100644 --- 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) { @@ -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(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