X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fobject.cpp;h=e2e95a9b024d25b610d256ef8c6678d7bb53ff89;hb=6080120777fdf7b6e1184288eff9d205ca7ebf5f;hp=ccc7b97ecdd0086db8f6b6029fc9546e94b82771;hpb=ae45c0397e2cb8f0a01f2f31d01c95ff3870271e;p=libs%2Fgl.git

diff --git a/source/render/object.cpp b/source/render/object.cpp
index ccc7b97e..e2e95a9b 100644
--- a/source/render/object.cpp
+++ b/source/render/object.cpp
@@ -17,19 +17,31 @@ namespace GL {
 const Matrix Object::identity_matrix;
 
 Object::Object():
-	lods(1),
-	lod0_watched(false)
+	lods(1)
 { }
 
 Object::Object(const Mesh *m, const Technique *t):
-	lods(1),
-	lod0_watched(false)
+	Object()
 {
 	set_mesh(m);
 	set_technique(t);
 }
 
-// TODO should have copy-c'tor to set watch on lod0 mesh if necessary
+Object::Object(const Object &other):
+	lods(other.lods),
+	bounding_sphere(other.bounding_sphere)
+{
+	if(other.lod0_watched)
+		watch_lod0();
+}
+
+Object::Object(Object &&other):
+	lods(move(other.lods)),
+	bounding_sphere(move(other.bounding_sphere))
+{
+	if(other.lod0_watched)
+		watch_lod0();
+}
 
 Object::~Object()
 {
@@ -61,15 +73,20 @@ void Object::set_mesh(unsigned i, const Mesh *m)
 	lod0_watched = false;
 
 	if(i==0 && m)
-		if(ResourceManager *rm = m->get_manager())
-		{
-			rm->observe_resource(*m, *this);
-			lod0_watched = true;
-		}
+		watch_lod0();
 
 	update_bounding_sphere();
 }
 
+void Object::watch_lod0()
+{
+	if(ResourceManager *rm = lods[0].mesh->get_manager())
+	{
+		rm->observe_resource(*lods[0].mesh, *this);
+		lod0_watched = true;
+	}
+}
+
 void Object::update_bounding_sphere()
 {
 	vector<Vector3> points;