X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.cpp;h=d15a70983637f876de06a12bc3a0b9a8a393b4f8;hb=ccbcce1d5c7fae8ec644e465ac936f5c39000e57;hp=5b5f72984b3bbfdbfe293d594ba68b3c17b4bd43;hpb=d51a234320449909eb34c802faa1f0c516ef70a0;p=libs%2Fgl.git

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 5b5f7298..d15a7098 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -30,7 +30,6 @@ RenderPass::RenderPass():
 { }
 
 RenderPass::RenderPass(const RenderPass &other):
-	Bindable<RenderPass>(other),
 	shprog(other.shprog),
 	shdata(other.shdata ? new ProgramData(*other.shdata) : 0),
 	material(other.material),
@@ -57,47 +56,6 @@ void RenderPass::set_texture(unsigned index, const Texture *tex)
 	texturing->attach(index, *tex);
 }
 
-void RenderPass::bind() const
-{
-	const RenderPass *old = current();
-	if(!set_current(this))
-		return;
-
-	if(shprog)
-	{
-		shprog->bind();
-		shdata->apply();
-	}
-	else if(old && old->shprog)
-		Program::unbind();
-
-	if(material)
-		material->bind();
-	else if(old && old->material)
-		Material::unbind();
-
-	if(texturing)
-		texturing->bind();
-	else if(old && old->texturing)
-		Texturing::unbind();
-}
-
-void RenderPass::unbind()
-{
-	const RenderPass *old = current();
-	if(!set_current(0))
-		return;
-
-	if(old->shprog)
-		Program::unbind();
-
-	if(old->material)
-		Material::unbind();
-
-	if(old->texturing)
-		Texturing::unbind();
-}
-
 
 RenderPass::Loader::Loader(RenderPass &p):
 	DataFile::CollectionObjectLoader<RenderPass>(p, 0)
@@ -116,20 +74,13 @@ void RenderPass::Loader::init()
 	allow_pointer_reload = false;
 
 	add("shader",   &RenderPass::shprog);
-	add("material", static_cast<void (Loader::*)()>(&Loader::material));
-	add("material", static_cast<void (Loader::*)(const string &)>(&Loader::material));
+	add("material", &Loader::material_inline);
+	add("material", &Loader::material);
 	add("texunit",  &Loader::texunit);
 	add("uniforms", &Loader::uniforms);
 }
 
-void RenderPass::Loader::finish()
-{
-	// XXX Make shdata optional
-	if(obj.shprog && !obj.shdata)
-		obj.shdata = new ProgramData;
-}
-
-void RenderPass::Loader::material()
+void RenderPass::Loader::material_inline()
 {
 	RefPtr<Material> mat = new Material;
 	load_sub(*mat);
@@ -155,8 +106,8 @@ void RenderPass::Loader::uniforms()
 	if(!obj.shprog)
 		throw InvalidState("Can't load uniforms without a shader program");
 	if(!obj.shdata)
-		obj.shdata = new ProgramData;
-	load_sub(*obj.shdata, *obj.shprog);
+		obj.shdata = new ProgramData(*obj.shprog);
+	load_sub(*obj.shdata);
 }