X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderpass.cpp;h=eb4ae1f93ba145b029ff5a23847b02e557f56c37;hp=9ee79d4bb464340e438945c5aba50d843ed1ed0d;hb=42c1534d95e1551c37e64a1dae288e8b75e8d8ba;hpb=72790b3aba8ddc1a6d020646fb7312959729777b

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 9ee79d4b..eb4ae1f9 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -6,7 +6,6 @@
 #include "program.h"
 #include "programdata.h"
 #include "renderer.h"
-#include "texenv.h"
 #include "texture.h"
 #include "texture2d.h"
 #include "texturing.h"
@@ -20,17 +19,32 @@ RenderPass::RenderPass():
 	shprog(0),
 	shdata(0),
 	material(0),
-	texturing(0)
+	texturing(0),
+	back_faces(false)
 { }
 
 RenderPass::RenderPass(const RenderPass &other):
 	shprog(other.shprog),
-	shdata(other.shdata ? new ProgramData(*other.shdata) : 0),
+	shdata(other.shdata),
+	uniform_slots(other.uniform_slots),
 	material(other.material),
 	texturing(other.texturing ? new Texturing(*other.texturing) : 0),
-	tex_names(other.tex_names)
+	tex_names(other.tex_names),
+	back_faces(other.back_faces)
 { }
 
+RenderPass &RenderPass::operator=(const RenderPass &other)
+{
+	shprog = other.shprog;
+	shdata = other.shdata;
+	uniform_slots = other.uniform_slots;
+	material = other.material;
+	texturing = other.texturing ? new Texturing(*other.texturing) : 0;
+	tex_names = other.tex_names;
+	back_faces = other.back_faces;
+	return *this;
+}
+
 RenderPass::~RenderPass()
 {
 	delete texturing;
@@ -39,8 +53,18 @@ RenderPass::~RenderPass()
 void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
 {
 	shprog = prog;
-	shdata = data;
-	shdata.keep();
+	shdata = new ProgramData(*data);
+}
+
+const string &RenderPass::get_slotted_uniform_name(const string &slot) const
+{
+	map<string, string>::const_iterator i = uniform_slots.find(slot);
+	if(i==uniform_slots.end())
+	{
+		static string empty;
+		return empty;
+	}
+	return i->second;
 }
 
 void RenderPass::set_material(const Material *mat)
@@ -70,6 +94,7 @@ void RenderPass::apply(Renderer &renderer) const
 	renderer.set_texturing(texturing);
 	renderer.set_material(material.get());
 	renderer.set_shader_program(shprog, shdata.get());
+	renderer.set_reverse_winding(back_faces);
 }
 
 
@@ -90,15 +115,21 @@ void RenderPass::Loader::init()
 	add("shader",   &RenderPass::shprog);
 	add("material", &Loader::material_inline);
 	add("material", &Loader::material);
+	add("material_slot", &RenderPass::material_slot);
+	add("back_faces",&RenderPass::back_faces);
 	add("texunit",  &Loader::texunit);
 	add("texunit",  &Loader::texunit_named);
 	add("uniforms", &Loader::uniforms);
+	add("uniform_slot", &Loader::uniform_slot);
 }
 
 void RenderPass::Loader::material_inline()
 {
 	RefPtr<Material> mat = new Material;
-	load_sub(*mat);
+	if(coll)
+		load_sub(*mat, get_collection());
+	else
+		load_sub(*mat);
 	obj.material = mat;
 }
 
@@ -126,9 +157,19 @@ void RenderPass::Loader::uniforms()
 {
 	if(!obj.shprog)
 		throw invalid_operation("RenderPass::Loader::uniforms");
-	RefPtr<ProgramData> shd = new ProgramData;
+	RefPtr<ProgramData> shd = new ProgramData(obj.shprog);
 	load_sub(*shd);
-	obj.shdata = shd;
+	obj.shdata = shd.release();
+}
+
+void RenderPass::Loader::uniform_slot(const string &name)
+{
+	uniform_slot2(name, name);
+}
+
+void RenderPass::Loader::uniform_slot2(const string &name, const string &slot)
+{
+	obj.uniform_slots[slot] = name;
 }
 
 
@@ -144,22 +185,11 @@ void RenderPass::TextureLoader::finish()
 {
 	if(tex)
 	{
-		if(env)
-			obj.attach(index, *tex, *env);
-		else
-			obj.attach(index, *tex);
+		obj.attach(index, *tex);
 		tex.release();
-		env.release();
 	}
 }
 
-void RenderPass::TextureLoader::texenv()
-{
-	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);
@@ -169,7 +199,10 @@ void RenderPass::TextureLoader::texture(const string &name)
 void RenderPass::TextureLoader::texture2d()
 {
 	tex = new Texture2D;
-	load_sub(static_cast<Texture2D &>(*tex));
+	if(coll)
+		load_sub(static_cast<Texture2D &>(*tex), get_collection());
+	else
+		load_sub(static_cast<Texture2D &>(*tex));
 }
 
 } // namespace GL