X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Frenderpass.cpp;h=7c7cf2c4a2022cbb1da62c84c385914d543c2edf;hb=ed7ca8892daceebb963950945fed5e75bd96a8a1;hp=4e3b1f1332bbd0dcda294940821d61be091604f3;hpb=47431fab6676ce5c4cd1ba994da73b1edac2d3e4;p=libs%2Fgl.git

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 4e3b1f13..7c7cf2c4 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -52,6 +52,15 @@ RenderPass::~RenderPass()
 	delete texturing;
 }
 
+void RenderPass::finalize_material()
+{
+	ensure_private_shader_data();
+
+	if(!texturing)
+		texturing = new Texturing;
+	material->attach_textures_to(*texturing, *shdata);
+}
+
 void RenderPass::ensure_private_shader_data()
 {
 	if(!shprog)
@@ -84,6 +93,7 @@ void RenderPass::set_material(const Material *mat)
 {
 	material = mat;
 	material.keep();
+	finalize_material();
 }
 
 void RenderPass::set_texture(unsigned index, const Texture *tex)
@@ -125,12 +135,13 @@ RenderPass::Loader::Loader(RenderPass &p, Collection &c):
 
 void RenderPass::Loader::init()
 {
-	add("shader",   &RenderPass::shprog);
+	add("shader",   &Loader::shader);
 	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_auto);
 	add("texunit",  &Loader::texunit_named);
 	add("uniforms", &Loader::uniforms);
 	add("uniform_slot", &Loader::uniform_slot);
@@ -138,18 +149,26 @@ void RenderPass::Loader::init()
 
 void RenderPass::Loader::material_inline()
 {
-	RefPtr<Material> mat = new Material;
-	if(coll)
-		load_sub(*mat, get_collection());
-	else
-		load_sub(*mat);
-	obj.material = mat;
+	Material::GenericLoader ldr(coll);
+	load_sub_with(ldr);
+	obj.material = ldr.get_material();
+	obj.finalize_material();
 }
 
 void RenderPass::Loader::material(const string &name)
 {
 	obj.material = &get_collection().get<Material>(name);
 	obj.material.keep();
+	obj.finalize_material();
+}
+
+void RenderPass::Loader::shader(const string &n)
+{
+	obj.shprog = &get_collection().get<Program>(n);
+	if(obj.shdata)
+		obj.shdata = new ProgramData(*obj.shdata, obj.shprog);
+	if(obj.material)
+		obj.finalize_material();
 }
 
 void RenderPass::Loader::texunit(unsigned i)
@@ -160,6 +179,16 @@ void RenderPass::Loader::texunit(unsigned i)
 	load_sub_with(ldr);
 }
 
+void RenderPass::Loader::texunit_auto(const string &n)
+{
+	if(!obj.texturing)
+		obj.texturing = new Texturing;
+	int i = obj.texturing->find_free_unit(n);
+	if(i<0)
+		throw runtime_error("no free texunit");
+	texunit_named(i, n);
+}
+
 void RenderPass::Loader::texunit_named(unsigned i, const string &n)
 {
 	texunit(i);
@@ -171,9 +200,7 @@ void RenderPass::Loader::texunit_named(unsigned i, const string &n)
 void RenderPass::Loader::uniforms()
 {
 	obj.ensure_private_shader_data();
-	RefPtr<ProgramData> shd = new ProgramData(obj.shprog);
-	load_sub(*shd);
-	obj.shdata = shd.release();
+	load_sub(*obj.shdata);
 }
 
 void RenderPass::Loader::uniform_slot(const string &name)