X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.cpp;h=637af62a3753becb9407e346fb471bad9213f94a;hb=8aea0f65f9ab7d603e47cf4479388af246cc8400;hp=ae38af6b4e7f2c9274206561759bfdef4d442987;hpb=908354182fd2b0e7748b8778e469133d48f88bbb;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index ae38af6b..637af62a 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -41,6 +41,32 @@ void Object::set_mesh(unsigned i, const Mesh *m)
 	meshes[i].keep();
 }
 
+void Object::update_bounding_sphere()
+{
+	vector<Vector3> points;
+	for(vector<RefPtr<const Mesh> >::const_iterator i=meshes.begin(); i!=meshes.end(); ++i)
+	{
+		const VertexArray &vertices = (*i)->get_vertices();
+		int offset = vertices.get_format().offset(VERTEX3);
+		if(offset<0)
+		{
+			// TODO Handle two-dimensional meshes
+			bounding_sphere = Geometry::BoundingSphere<float, 3>();
+			return;
+		}
+
+		unsigned n_vertices = vertices.size();
+		points.reserve(points.size()+n_vertices);
+		for(unsigned j=0; j<n_vertices; ++j)
+		{
+			const float *v = vertices[j];
+			points.push_back(Vector3(v[offset], v[offset+1], v[offset+2]));
+		}
+	}
+
+	bounding_sphere = Geometry::BoundingSphere<float, 3>::from_point_cloud(points.begin(), points.end());
+}
+
 const Mesh *Object::get_mesh(unsigned i) const
 {
 	if(i>=meshes.size())
@@ -131,9 +157,11 @@ void Object::Loader::init()
 	add("mesh",     &Loader::mesh_lod);
 	add("technique", &Loader::technique_inline);
 	add("technique", &Loader::technique);
+}
 
-	// Deprecated alias, will be removed
-	add("lod_mesh", &Loader::mesh_lod);
+void Object::Loader::finish()
+{
+	obj.update_bounding_sphere();
 }
 
 void Object::Loader::mesh_inline()