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

diff --git a/source/object.cpp b/source/object.cpp
index c4787d9f..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;
 
@@ -27,6 +19,12 @@ Object::Object():
 	meshes(1)
 { }
 
+Object::Object(const Mesh *m, const Technique *t)
+{
+	set_mesh(m);
+	set_technique(t);
+}
+
 Object::~Object()
 {
 }
@@ -34,7 +32,7 @@ Object::~Object()
 void Object::set_mesh(unsigned i, const Mesh *m)
 {
 	if(i>meshes.size())
-		throw InvalidParameterValue("LODs must be continuous");
+		throw invalid_argument("Object::set_mesh");
 
 	if(i==meshes.size())
 		meshes.push_back(m);
@@ -43,6 +41,14 @@ void Object::set_mesh(unsigned i, const Mesh *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;
@@ -55,18 +61,44 @@ void Object::render(const Tag &tag) const
 	if(!pass)
 		return;
 
-	Bind bind(pass);
+	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);
+	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);
+}
+
+void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &tag) const
+{
+	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);
 }
 
 const RenderPass *Object::get_pass(const Tag &tag) const
@@ -76,14 +108,6 @@ const RenderPass *Object::get_pass(const Tag &tag) const
 	return &technique->get_pass(tag);
 }
 
-void Object::render_instance(const ObjectInstance &inst, 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);
-}
-
 
 Object::Loader::Loader(Object &o):
 	DataFile::CollectionObjectLoader<Object>(o, 0)
@@ -99,29 +123,28 @@ Object::Loader::Loader(Object &o, Collection &c):
 
 void Object::Loader::init()
 {
-	allow_pointer_reload = false;
+	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("mesh",     static_cast<void (Loader::*)()>(&Loader::mesh));
-	add("mesh",     static_cast<void (Loader::*)(unsigned)>(&Loader::mesh));
-	add("mesh",     static_cast<void (Loader::*)(const std::string &)>(&Loader::mesh));
-	add("mesh",     static_cast<void (Loader::*)(unsigned, const std::string &)>(&Loader::mesh));
 	// Deprecated alias, will be removed
-	add("lod_mesh", static_cast<void (Loader::*)(unsigned, const std::string &)>(&Loader::mesh));
-	add("technique", static_cast<void (Loader::*)()>(&Loader::technique));
-	add("technique", static_cast<void (Loader::*)(const std::string &)>(&Loader::technique));
+	add("lod_mesh", &Loader::mesh_lod);
 }
 
-void Object::Loader::mesh()
+void Object::Loader::mesh_inline()
 {
 	RefPtr<Mesh> msh = new Mesh;
 	load_sub(*msh);
 	obj.meshes.front() = msh;
 }
 
-void Object::Loader::mesh(unsigned l)
+void Object::Loader::mesh_inline_lod(unsigned l)
 {
 	if(l>obj.meshes.size())
-		throw InvalidParameterValue("LODs must be continuous");
+		throw invalid_argument("Object::Loader::mesh_inline_lod");
 
 	RefPtr<Mesh> msh = new Mesh;
 	load_sub(*msh);
@@ -133,15 +156,15 @@ void Object::Loader::mesh(unsigned l)
 
 void Object::Loader::mesh(const std::string &n)
 {
-	obj.set_mesh(get_collection().get<Mesh>(n));
+	obj.set_mesh(&get_collection().get<Mesh>(n));
 }
 
-void Object::Loader::mesh(unsigned l, const string &n)
+void Object::Loader::mesh_lod(unsigned l, const string &n)
 {
-	obj.set_mesh(l, get_collection().get<Mesh>(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)
@@ -153,7 +176,7 @@ void Object::Loader::technique()
 
 void Object::Loader::technique(const std::string &n)
 {
-	obj.set_technique(get_collection().get<Technique>(n));
+	obj.set_technique(&get_collection().get<Technique>(n));
 }
 
 } // namespace GL