X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.cpp;h=f23f66584880d0bd18a4bf55d9eaf6cc0dba3e7e;hb=ab83db6f1e31d44ced585119a57fd10896e469cb;hp=938e83f911211cd75b2e50302b6ad00d67345005;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index 938e83f9..f23f6658 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -1,22 +1,14 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/datafile/collection.h>
-#include <msp/strings/formatter.h>
-#include "except.h"
+#include <msp/strings/format.h>
 #include "material.h"
 #include "mesh.h"
 #include "object.h"
 #include "objectinstance.h"
 #include "program.h"
 #include "programdata.h"
+#include "renderer.h"
 #include "technique.h"
-#include "texture.h"
-#include "texunit.h"
+#include "texturing.h"
 
 using namespace std;
 
@@ -24,18 +16,43 @@ namespace Msp {
 namespace GL {
 
 Object::Object():
-	meshes(1),
-	technique(0),
-	own_mesh(false),
-	own_technique(false)
+	meshes(1)
 { }
 
+Object::Object(const Mesh *m, const Technique *t)
+{
+	set_mesh(m);
+	set_technique(t);
+}
+
 Object::~Object()
 {
-	if(own_technique)
-		delete technique;
-	if(own_mesh)
-		delete meshes[0];
+}
+
+void Object::set_mesh(unsigned i, const Mesh *m)
+{
+	if(i>meshes.size())
+		throw invalid_argument("Object::set_mesh");
+
+	if(i==meshes.size())
+		meshes.push_back(m);
+	else
+		meshes[i] = m;
+	meshes[i].keep();
+}
+
+const Mesh *Object::get_mesh(unsigned i) const
+{
+	if(i>=meshes.size())
+		return 0;
+
+	return meshes[i].get();
+}
+
+void Object::set_technique(const Technique *t)
+{
+	technique = t;
+	technique.keep();
 }
 
 void Object::render(const Tag &tag) const
@@ -44,34 +61,51 @@ void Object::render(const Tag &tag) const
 	if(!pass)
 		return;
 
-	Bind bind(*pass);
-	meshes[0]->draw();
+	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());
+
+	meshes.front()->draw();
 }
 
-void Object::render(const ObjectInstance &inst, const Tag &tag) const
+void Object::render(Renderer &renderer, const Tag &tag) const
 {
 	const RenderPass *pass = get_pass(tag);
 	if(!pass)
 		return;
 
-	Bind bind(*pass);
-	render_instance(inst, tag);
-	meshes[0]->draw();
+	Renderer::Push push(renderer);
+	renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
+	renderer.set_material(pass->get_material());
+	renderer.set_texturing(pass->get_texturing());
+
+	meshes.front()->draw(renderer);
 }
 
-const RenderPass *Object::get_pass(const Tag &tag) const
+void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &tag) const
 {
-	if(!technique->has_pass(tag))
-		return 0;
-	return &technique->get_pass(tag);
+	const RenderPass *pass = get_pass(tag);
+	if(!pass)
+		return;
+
+	Renderer::Push push(renderer);
+	renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
+	renderer.set_material(pass->get_material());
+	renderer.set_texturing(pass->get_texturing());
+
+	inst.setup_render(renderer, tag);
+	unsigned lod = min<unsigned>(inst.get_level_of_detail(), meshes.size()-1);
+	meshes[lod]->draw(renderer);
+	inst.finish_render(renderer, tag);
 }
 
-void Object::render_instance(const ObjectInstance &inst, const Tag &tag) const
+const RenderPass *Object::get_pass(const Tag &tag) const
 {
-	inst.setup_render(tag);
-	unsigned lod = min<unsigned>(inst.get_level_of_detail(), meshes.size()-1);
-	meshes[lod]->draw();
-	inst.finish_render(tag);
+	if(!technique || !technique->has_pass(tag))
+		return 0;
+	return &technique->get_pass(tag);
 }
 
 
@@ -89,49 +123,60 @@ Object::Loader::Loader(Object &o, Collection &c):
 
 void Object::Loader::init()
 {
-	allow_pointer_reload = false;
-
-	add("lod_mesh", &Loader::lod_mesh);
-	add("mesh",     static_cast<void (Loader::*)()>(&Loader::mesh));
-	add("mesh",     static_cast<void (Loader::*)(const std::string &)>(&Loader::mesh));
+	add("mesh",     &Loader::mesh_inline);
+	add("mesh",     &Loader::mesh_inline_lod);
+	add("mesh",     &Loader::mesh);
+	add("mesh",     &Loader::mesh_lod);
+	add("technique", &Loader::technique_inline);
 	add("technique", &Loader::technique);
-	add("technique", &Object::technique);
+
+	// Deprecated alias, will be removed
+	add("lod_mesh", &Loader::mesh_lod);
 }
 
-void Object::Loader::lod_mesh(unsigned l, const string &n)
+void Object::Loader::mesh_inline()
 {
-	obj.meshes.resize(l+1, 0);
-	obj.meshes[l] = get_collection().get<Mesh>(n);
+	RefPtr<Mesh> msh = new Mesh;
+	load_sub(*msh);
+	obj.meshes.front() = msh;
 }
 
-void Object::Loader::mesh()
+void Object::Loader::mesh_inline_lod(unsigned l)
 {
-	if(obj.meshes[0])
-		throw InvalidState("A mesh is already loaded");
+	if(l>obj.meshes.size())
+		throw invalid_argument("Object::Loader::mesh_inline_lod");
 
 	RefPtr<Mesh> msh = new Mesh;
 	load_sub(*msh);
-	obj.meshes[0] = msh.release();
-	obj.own_mesh = true;
+	if(l==obj.meshes.size())
+		obj.meshes.push_back(msh);
+	else
+		obj.meshes[l] = msh;
 }
 
 void Object::Loader::mesh(const std::string &n)
 {
-	if(obj.meshes[0])
-		throw InvalidState("A mesh is already loaded");
+	obj.set_mesh(&get_collection().get<Mesh>(n));
+}
 
-	obj.meshes[0] = get_collection().get<Mesh>(n);
+void Object::Loader::mesh_lod(unsigned l, const string &n)
+{
+	obj.set_mesh(l, &get_collection().get<Mesh>(n));
 }
 
-void Object::Loader::technique()
+void Object::Loader::technique_inline()
 {
 	RefPtr<Technique> tech = new Technique;
 	if(coll)
 		load_sub(*tech, get_collection());
 	else
 		load_sub(*tech);
-	obj.technique = tech.release();
-	obj.own_technique = true;
+	obj.technique = tech;
+}
+
+void Object::Loader::technique(const std::string &n)
+{
+	obj.set_technique(&get_collection().get<Technique>(n));
 }
 
 } // namespace GL