X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.cpp;h=de5ac07f8f6bcf34356eab49bb693c6c26d3ecde;hb=619aae12e01f25e79626a94c973927e5599e99a5;hp=82ca7a3972f28e1d11bd1fde2a4ffb5bf19cbd28;hpb=48d253c9f19c04c6940bfc932a78c51ea24e2e75;p=libs%2Fgl.git

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 82ca7a39..de5ac07f 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -1,6 +1,6 @@
-#include <msp/core/refptr.h>
 #include <msp/datafile/collection.h>
 #include <msp/strings/format.h>
+#include "error.h"
 #include "material.h"
 #include "renderpass.h"
 #include "program.h"
@@ -32,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;
@@ -73,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);
@@ -92,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();
 }
 
@@ -113,10 +117,10 @@ void RenderPass::Loader::texunit_named(unsigned i, const string &n)
 void RenderPass::Loader::uniforms()
 {
 	if(!obj.shprog)
-		throw InvalidState("Can't load uniforms without a shader program");
-	if(!obj.shdata)
-		obj.shdata = new ProgramData(*obj.shprog);
-	load_sub(*obj.shdata);
+		throw invalid_operation("RenderPass::Loader::uniforms");
+	RefPtr<ProgramData> shd = new ProgramData;
+	load_sub(*shd);
+	obj.shdata = shd;
 }
 
 
@@ -143,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();
 }