X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fobject.cpp;h=8a3963eebe992f9db802184b5f20b9d86b461ab7;hb=7ab13563ec79b45a09f03da73acb15b39e192df9;hp=caad3a0725caa8e1de4d18d7e27c985c351daac3;hpb=3ac3a51c623271da815c8ee60c484445871753bf;p=libs%2Fgl.git diff --git a/source/render/object.cpp b/source/render/object.cpp index caad3a07..8a3963ee 100644 --- a/source/render/object.cpp +++ b/source/render/object.cpp @@ -11,7 +11,6 @@ #include "renderer.h" #include "resourcemanager.h" #include "technique.h" -#include "texturing.h" using namespace std; @@ -77,12 +76,12 @@ void Object::set_mesh(unsigned i, const Mesh *m) void Object::update_bounding_sphere() { vector points; - for(vector::const_iterator i=lods.begin(); i!=lods.end(); ++i) + for(const LevelOfDetail &l: lods) { - if(!i->mesh || !i->mesh->is_loaded()) + if(!l.mesh || !l.mesh->is_loaded()) continue; - const VertexArray &vertices = i->mesh->get_vertices(); + const VertexArray &vertices = l.mesh->get_vertices(); int offset = vertices.get_format().offset(VERTEX3); bool three = true; @@ -98,8 +97,8 @@ void Object::update_bounding_sphere() points.reserve(points.size()+n_vertices); for(unsigned j=0; j(vertices[j]+offset); + points.push_back(Vector3(v[0], v[1], (three ? v[2] : 0.0f))); } }