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

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 5b5f7298..4ab07347 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/core/refptr.h>
 #include <msp/datafile/collection.h>
 #include <msp/strings/formatter.h>
@@ -30,11 +23,11 @@ RenderPass::RenderPass():
 { }
 
 RenderPass::RenderPass(const RenderPass &other):
-	Bindable<RenderPass>(other),
 	shprog(other.shprog),
 	shdata(other.shdata ? new ProgramData(*other.shdata) : 0),
 	material(other.material),
-	texturing(other.texturing ? new Texturing(*other.texturing) : 0)
+	texturing(other.texturing ? new Texturing(*other.texturing) : 0),
+	tex_names(other.tex_names)
 { }
 
 RenderPass::~RenderPass()
@@ -57,45 +50,12 @@ void RenderPass::set_texture(unsigned index, const Texture *tex)
 	texturing->attach(index, *tex);
 }
 
-void RenderPass::bind() const
+int RenderPass::get_texture_index(const string &n) 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();
+	map<string, unsigned>::const_iterator i = tex_names.find(n);
+	if(i==tex_names.end())
+		return -1;
+	return i->second;
 }
 
 
@@ -116,20 +76,14 @@ 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("texunit",  &Loader::texunit_named);
 	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);
@@ -150,13 +104,19 @@ void RenderPass::Loader::texunit(unsigned i)
 	load_sub_with(ldr);
 }
 
+void RenderPass::Loader::texunit_named(unsigned i, const string &n)
+{
+	texunit(i);
+	obj.tex_names[n] = i;
+}
+
 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);
 }