X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobject.cpp;h=1852f91b50222ead401dfa177605c31d9d1ee21b;hp=283894501e29a0aec9b3694d47b9730154d56c60;hb=71240e5c5ef7165313664ee9fe81df95c0eff10b;hpb=84269f7b598673b06757313d70934a1747045b69

diff --git a/source/object.cpp b/source/object.cpp
index 28389450..1852f91b 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -17,19 +17,26 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+Matrix Object::identity_matrix;
+
 Object::Object():
-	lods(1)
+	lods(1),
+	lod0_watched(false)
 { }
 
-Object::Object(const Mesh *m, const Technique *t)
+Object::Object(const Mesh *m, const Technique *t):
+	lods(1),
+	lod0_watched(false)
 {
 	set_mesh(m);
 	set_technique(t);
 }
 
+// TODO should have copy-c'tor to set watch on lod0 mesh if necessary
+
 Object::~Object()
 {
-	if(lods[0].mesh)
+	if(lods[0].mesh && lod0_watched)
 		if(ResourceManager *rm = lods[0].mesh->get_manager())
 			rm->unwatch_resource(*lods[0].mesh, *this);
 }
@@ -50,15 +57,19 @@ Object::LevelOfDetail &Object::get_lod(unsigned i, const char *caller)
 void Object::set_mesh(unsigned i, const Mesh *m)
 {
 	RefPtr<const Mesh> &ptr = get_lod(i, "Object::set_mesh").mesh;
-	if(i==0 && ptr)
+	if(i==0 && ptr && lod0_watched)
 		if(ResourceManager *rm = ptr->get_manager())
 			rm->unwatch_resource(*ptr, *this);
 	ptr = m;
 	ptr.keep();
+	lod0_watched = false;
 
 	if(i==0 && m)
 		if(ResourceManager *rm = m->get_manager())
+		{
 			rm->watch_resource(*m, *this);
+			lod0_watched = true;
+		}
 
 	update_bounding_sphere();
 }
@@ -123,21 +134,6 @@ const Technique *Object::get_technique(unsigned i) const
 	return lods[i].technique.get();
 }
 
-void Object::render(const Tag &tag) const
-{
-	const RenderPass *pass = get_pass(tag, 0);
-	if(!pass)
-		return;
-
-	Bind bind_shader(pass->get_shader_program());
-	if(pass->get_shader_data())
-		pass->get_shader_data()->apply();
-	Bind bind_material(pass->get_material());
-	Bind bind_texturing(pass->get_texturing());
-
-	lods.front().mesh->draw();
-}
-
 void Object::render(Renderer &renderer, const Tag &tag) const
 {
 	const RenderPass *pass = get_pass(tag, 0);
@@ -185,6 +181,12 @@ void Object::resource_loaded(Resource &res)
 		update_bounding_sphere();
 }
 
+void Object::resource_removed(Resource &res)
+{
+	if(&res==lods.front().mesh.get())
+		lod0_watched = false;
+}
+
 
 Object::Loader::Loader(Object &o):
 	LodLoader(o, 0, 0)