X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.cpp;h=b588ff2dc8a119624bcf5297ad5483f8fef972dc;hb=53953f28255e782ed640a9e8d2d42c9b218943ad;hp=158e9fc8390206aea6025f7fae37ab844048068c;hpb=e7556941c41b1a0fc84fe7986c98ee79eccbf564;p=libs%2Fgl.git

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 158e9fc8..b588ff2d 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"
@@ -33,16 +32,28 @@ RenderPass::RenderPass(const RenderPass &other):
 	back_faces(other.back_faces)
 { }
 
+RenderPass &RenderPass::operator=(const RenderPass &other)
+{
+	shprog = other.shprog;
+	shdata = other.shdata ? new ProgramData(*other.shdata) : 0;
+	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;
+	delete shdata;
 }
 
 void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
 {
 	shprog = prog;
-	shdata = data;
-	shdata.keep();
+	delete shdata;
+	shdata = new ProgramData(*data);
 }
 
 void RenderPass::set_material(const Material *mat)
@@ -71,7 +82,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_shader_program(shprog, shdata);
 	renderer.set_reverse_winding(back_faces);
 }
 
@@ -93,6 +104,7 @@ 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);
@@ -102,7 +114,10 @@ void RenderPass::Loader::init()
 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;
 }
 
@@ -130,9 +145,9 @@ 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();
 }
 
 
@@ -148,22 +163,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);
@@ -173,7 +177,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