X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fobject.cpp;h=e46274f6362a44fb2dc569269c8e39f5123eeadf;hb=274b6fb1b02692cc422bad9040d1abe5d545505a;hp=e2e95a9b024d25b610d256ef8c6678d7bb53ff89;hpb=e70662d7812464159f2e47f4bebb69d88f89ae93;p=libs%2Fgl.git diff --git a/source/render/object.cpp b/source/render/object.cpp index e2e95a9b..e46274f6 100644 --- a/source/render/object.cpp +++ b/source/render/object.cpp @@ -112,7 +112,7 @@ void Object::update_bounding_sphere() for(unsigned j=0; j(vertices[j]+offset); - points.push_back(Vector3(v[0], v[1], (three ? v[2] : 0.0f))); + points.emplace_back(v[0], v[1], (three ? v[2] : 0.0f)); } } @@ -156,6 +156,7 @@ void Object::render(Renderer &renderer, Tag tag) const throw logic_error("no mesh"); Renderer::Push push(renderer); + renderer.set_pipeline_key(this, tag.id); method->apply(renderer); setup_render(renderer, tag); @@ -175,6 +176,7 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, Tag tag) con throw logic_error("no mesh"); Renderer::Push push(renderer); + renderer.set_pipeline_key(this, tag.id); method->apply(renderer); setup_render(renderer, tag);