X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.cpp;h=de5ac07f8f6bcf34356eab49bb693c6c26d3ecde;hb=8eb9a8d90e5597154dab666481037b306b7bbca2;hp=93538d48d64e013f948c33cee22eee989adc0c3b;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 93538d48..de5ac07f 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -1,4 +1,3 @@
-#include <msp/core/refptr.h>
 #include <msp/datafile/collection.h>
 #include <msp/strings/format.h>
 #include "error.h"
@@ -33,10 +32,16 @@ RenderPass::RenderPass(const RenderPass &other):
 
 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;
@@ -74,8 +79,6 @@ RenderPass::Loader::Loader(RenderPass &p, Collection &c):
 
 void RenderPass::Loader::init()
 {
-	allow_pointer_reload = false;
-
 	add("shader",   &RenderPass::shprog);
 	add("material", &Loader::material_inline);
 	add("material", &Loader::material);
@@ -93,7 +96,7 @@ void RenderPass::Loader::material_inline()
 
 void RenderPass::Loader::material(const string &name)
 {
-	obj.material = get_collection().get<Material>(name);
+	obj.material = &get_collection().get<Material>(name);
 	obj.material.keep();
 }
 
@@ -115,9 +118,9 @@ void RenderPass::Loader::uniforms()
 {
 	if(!obj.shprog)
 		throw invalid_operation("RenderPass::Loader::uniforms");
-	if(!obj.shdata)
-		obj.shdata = new ProgramData(*obj.shprog);
-	load_sub(*obj.shdata);
+	RefPtr<ProgramData> shd = new ProgramData;
+	load_sub(*shd);
+	obj.shdata = shd;
 }
 
 
@@ -151,7 +154,7 @@ void RenderPass::TextureLoader::texenv()
 
 void RenderPass::TextureLoader::texture(const string &name)
 {
-	tex = get_collection().get<Texture>(name);
+	tex = &get_collection().get<Texture>(name);
 	tex.keep();
 }