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

diff --git a/source/object.cpp b/source/object.cpp
index c4787d9f..f710a7a9 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -14,9 +14,9 @@ Distributed under the LGPL
 #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;
 
@@ -55,18 +55,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 +102,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)