X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fobject.cpp;h=65e9a7ef083fc52db1f899906b7febaed96264a5;hp=38d2e6f282cd3b5378a15c561e1ac91c302dcd0a;hb=5871764de7aa23d2c40cac03ad9d07088fb57e06;hpb=5b652353d545a3190ea2d86ba82a87b2e3382a0d

diff --git a/source/render/object.cpp b/source/render/object.cpp
index 38d2e6f2..65e9a7ef 100644
--- a/source/render/object.cpp
+++ b/source/render/object.cpp
@@ -2,12 +2,9 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include "error.h"
-#include "material.h"
 #include "mesh.h"
 #include "object.h"
 #include "objectinstance.h"
-#include "program.h"
-#include "programdata.h"
 #include "renderer.h"
 #include "resourcemanager.h"
 #include "technique.h"
@@ -17,22 +14,34 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Matrix Object::identity_matrix;
+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()
 {
@@ -64,24 +73,29 @@ 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;
-	for(vector<LevelOfDetail>::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;
@@ -97,8 +111,8 @@ void Object::update_bounding_sphere()
 		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], (three ? v[offset+2] : 0.0f)));
+			const float *v = reinterpret_cast<const float *>(vertices[j]+offset);
+			points.emplace_back(v[0], v[1], (three ? v[2] : 0.0f));
 		}
 	}
 
@@ -133,8 +147,8 @@ const Technique *Object::get_technique(unsigned i) const
 
 void Object::render(Renderer &renderer, Tag tag) const
 {
-	const RenderPass *pass = get_pass(tag, 0);
-	if(!pass)
+	const RenderMethod *method = get_method(tag, 0);
+	if(!method)
 		return;
 
 	const Mesh *mesh = lods.front().mesh;
@@ -142,7 +156,7 @@ void Object::render(Renderer &renderer, Tag tag) const
 		throw logic_error("no mesh");
 
 	Renderer::Push push(renderer);
-	pass->apply(renderer);
+	method->apply(renderer);
 
 	setup_render(renderer, tag);
 	mesh->draw(renderer);
@@ -152,8 +166,8 @@ void Object::render(Renderer &renderer, Tag tag) const
 void Object::render(Renderer &renderer, const ObjectInstance &inst, Tag tag) const
 {
 	unsigned lod = min<unsigned>(inst.get_level_of_detail(renderer), lods.size()-1);
-	const RenderPass *pass = get_pass(tag, lod);
-	if(!pass)
+	const RenderMethod *method = get_method(tag, lod);
+	if(!method)
 		return;
 
 	const Mesh *mesh = lods[lod].mesh;
@@ -161,7 +175,7 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, Tag tag) con
 		throw logic_error("no mesh");
 
 	Renderer::Push push(renderer);
-	pass->apply(renderer);
+	method->apply(renderer);
 
 	setup_render(renderer, tag);
 	inst.setup_render(renderer, tag);
@@ -170,12 +184,12 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, Tag tag) con
 	finish_render(renderer, tag);
 }
 
-const RenderPass *Object::get_pass(Tag tag, unsigned lod) const
+const RenderMethod *Object::get_method(Tag tag, unsigned lod) const
 {
 	const Technique *tech = lods[lod].technique;
 	if(!tech)
 		throw logic_error("no technique");
-	return tech->find_pass(tag);
+	return tech->find_method(tag);
 }
 
 void Object::resource_loaded(Resource &res)
@@ -191,19 +205,8 @@ void Object::resource_removed(Resource &res)
 }
 
 
-Object::Loader::Loader(Object &o):
-	LodLoader(o, 0, 0)
-{
-	init();
-}
-
 Object::Loader::Loader(Object &o, Collection &c):
-	LodLoader(o, 0, &c)
-{
-	init();
-}
-
-void Object::Loader::init()
+	LodLoader(o, 0, c)
 {
 	add("bounding_sphere_hint", &Loader::bounding_sphere_hint);
 	add("level_of_detail", &Loader::level_of_detail);
@@ -221,13 +224,13 @@ void Object::Loader::bounding_sphere_hint(float x, float y, float z, float r)
 
 void Object::Loader::level_of_detail(unsigned i)
 {
-	LodLoader ldr(obj, i, coll);
+	LodLoader ldr(obj, i, get_collection());
 	load_sub_with(ldr);
 }
 
 
-Object::LodLoader::LodLoader(Object &o, unsigned i, Collection *c):
-	DataFile::CollectionObjectLoader<Object>(o, c),
+Object::LodLoader::LodLoader(Object &o, unsigned i, Collection &c):
+	DataFile::CollectionObjectLoader<Object>(o, &c),
 	index(i),
 	lod(obj.get_lod(index, "Object::LodLoader::LodLoader"))
 {