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

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 5b5f7298..de5ac07f 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -1,13 +1,6 @@
-/* $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>
+#include <msp/strings/format.h>
+#include "error.h"
 #include "material.h"
 #include "renderpass.h"
 #include "program.h"
@@ -30,19 +23,25 @@ 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()
 {
-	delete shdata;
 	delete texturing;
 }
 
+void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
+{
+	shprog = prog;
+	shdata = data;
+	shdata.keep();
+}
+
 void RenderPass::set_material(const Material *mat)
 {
 	material = mat;
@@ -57,45 +56,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;
 }
 
 
@@ -113,23 +79,15 @@ RenderPass::Loader::Loader(RenderPass &p, Collection &c):
 
 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);
@@ -138,7 +96,7 @@ void RenderPass::Loader::material()
 
 void RenderPass::Loader::material(const string &name)
 {
-	obj.material = get_collection().get<Material>(name);
+	obj.material = &get_collection().get<Material>(name);
 	obj.material.keep();
 }
 
@@ -150,13 +108,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);
+		throw invalid_operation("RenderPass::Loader::uniforms");
+	RefPtr<ProgramData> shd = new ProgramData;
+	load_sub(*shd);
+	obj.shdata = shd;
 }
 
 
@@ -183,14 +147,14 @@ void RenderPass::TextureLoader::finish()
 
 void RenderPass::TextureLoader::texenv()
 {
-	throw Exception("TexEnvs can't be loaded yet");
+	throw runtime_error("TexEnvs can't be loaded yet");
 	/*env = new TexEnv;
 	load_sub(*env);*/
 }
 
 void RenderPass::TextureLoader::texture(const string &name)
 {
-	tex = get_collection().get<Texture>(name);
+	tex = &get_collection().get<Texture>(name);
 	tex.keep();
 }