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

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 158e9fc8..4063df5f 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,6 +32,17 @@ 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;
@@ -102,7 +112,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;
 }
 
@@ -148,22 +161,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 +175,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