X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.cpp;h=efd84db89168b85598b278f79147b70214eee493;hb=e2765175f4a083623c1a9549695140ca902ce0b2;hp=769996834bd89692f1be7496e6c2d1a411b0d3b6;hpb=8b9d1625ac367114612b57a83901033ffc2bc7e0;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index 76999683..efd84db8 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -7,6 +7,7 @@
 #include "program.h"
 #include "programdata.h"
 #include "renderer.h"
+#include "resourcemanager.h"
 #include "technique.h"
 #include "texturing.h"
 
@@ -27,7 +28,11 @@ Object::Object(const Mesh *m, const Technique *t)
 
 // Avoid synthesizing ~RefPtr in files including object.h
 Object::~Object()
-{ }
+{
+	if(meshes[0])
+		if(ResourceManager *rm = meshes[0]->get_manager())
+			rm->unwatch_resource(*meshes[0], *this);
+}
 
 void Object::set_mesh(unsigned i, const Mesh *m)
 {
@@ -37,8 +42,43 @@ void Object::set_mesh(unsigned i, const Mesh *m)
 	if(i==meshes.size())
 		meshes.push_back(m);
 	else
+	{
+		if(i==0 && meshes[i])
+			if(ResourceManager *rm = meshes[i]->get_manager())
+				rm->unwatch_resource(*meshes[i], *this);
 		meshes[i] = m;
+	}
 	meshes[i].keep();
+
+	if(i==0 && m)
+		if(ResourceManager *rm = m->get_manager())
+			rm->watch_resource(*m, *this);
+}
+
+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
@@ -77,9 +117,7 @@ void Object::render(Renderer &renderer, const Tag &tag) const
 		return;
 
 	Renderer::Push push(renderer);
-	renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
-	renderer.set_material(pass->get_material());
-	renderer.set_texturing(pass->get_texturing());
+	pass->apply(renderer);
 
 	setup_render(renderer, tag);
 	meshes.front()->draw(renderer);
@@ -93,9 +131,7 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
 		return;
 
 	Renderer::Push push(renderer);
-	renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
-	renderer.set_material(pass->get_material());
-	renderer.set_texturing(pass->get_texturing());
+	pass->apply(renderer);
 
 	setup_render(renderer, tag);
 	inst.setup_render(renderer, tag);
@@ -107,11 +143,19 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
 
 const RenderPass *Object::get_pass(const Tag &tag) const
 {
-	if(!technique || !technique->has_pass(tag))
+	if(!technique)
+		throw logic_error("!technique");
+	if(!technique->has_pass(tag))
 		return 0;
 	return &technique->get_pass(tag);
 }
 
+void Object::resource_loaded(Resource &res)
+{
+	if(!meshes.empty() && &res==meshes.front().get() && bounding_sphere.is_empty())
+		update_bounding_sphere();
+}
+
 
 Object::Loader::Loader(Object &o):
 	DataFile::CollectionObjectLoader<Object>(o, 0)
@@ -133,9 +177,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()