X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Frenderpass.cpp;h=62056ff9f56c63f103edb920ee8b546c7b13fe91;hp=35692a4eaa69d49e54666e5684ff46b04f03c324;hb=3ac3a51c623271da815c8ee60c484445871753bf;hpb=cb7db94f7837e6a3be037d07575dc248177d9426

diff --git a/source/materials/renderpass.cpp b/source/materials/renderpass.cpp
index 35692a4e..62056ff9 100644
--- a/source/materials/renderpass.cpp
+++ b/source/materials/renderpass.cpp
@@ -23,7 +23,8 @@ RenderPass::RenderPass():
 	shdata(0),
 	material(0),
 	back_faces(false),
-	receive_shadows(false)
+	receive_shadows(false),
+	image_based_lighting(false)
 { }
 
 void RenderPass::set_material_textures()
@@ -33,7 +34,7 @@ void RenderPass::set_material_textures()
 		set_texture(*tag, material->get_texture(*tag), material->get_sampler());
 }
 
-void RenderPass::maybe_create_material_shader(DataFile::Collection *coll)
+void RenderPass::maybe_create_material_shader()
 {
 	if(shprog && !shprog_from_material)
 		return;
@@ -41,17 +42,13 @@ void RenderPass::maybe_create_material_shader(DataFile::Collection *coll)
 	map<string, int> extra_spec;
 	if(receive_shadows)
 		extra_spec["use_shadow_map"] = true;
+	if(image_based_lighting)
+		extra_spec["use_image_based_lighting"] = true;
 
-	if(coll)
-	{
-		shprog = material->create_compatible_shader(*coll, extra_spec);
-		shprog.keep();
-	}
-	else
-		throw invalid_operation("RenderPass::maybe_create_material_shader");
+	shprog = material->create_compatible_shader(extra_spec);
 
 	if(shdata)
-		shdata = new ProgramData(*shdata, shprog.get());
+		shdata = new ProgramData(*shdata, shprog);
 
 	shprog_from_material = true;
 }
@@ -59,7 +56,6 @@ void RenderPass::maybe_create_material_shader(DataFile::Collection *coll)
 void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
 {
 	shprog = prog;
-	shprog.keep();
 	shprog_from_material = false;
 	shdata = (data ? new ProgramData(*data) : 0);
 }
@@ -72,11 +68,10 @@ Tag RenderPass::get_slotted_uniform_tag(Tag slot) const
 	return i->second;
 }
 
-void RenderPass::set_material(const Material *mat, DataFile::Collection *coll)
+void RenderPass::set_material(const Material *mat)
 {
 	material = mat;
-	material.keep();
-	maybe_create_material_shader(coll);
+	maybe_create_material_shader();
 	set_material_textures();
 }
 
@@ -130,6 +125,11 @@ int RenderPass::get_texture_index(const string &n) const
 	return (shprog && i!=textures.end() ? shprog->get_uniform_binding(i->tag) : -1);
 }
 
+void RenderPass::set_back_faces(bool bf)
+{
+	back_faces = bf;
+}
+
 void RenderPass::set_receive_shadows(bool rs)
 {
 	receive_shadows = rs;
@@ -139,11 +139,21 @@ void RenderPass::apply(Renderer &renderer) const
 {
 	for(vector<TextureSlot>::const_iterator i=textures.begin(); i!=textures.end(); ++i)
 		renderer.set_texture(i->tag, i->texture, i->sampler);
-	renderer.set_material(material.get());
-	renderer.set_shader_program(shprog.get(), shdata.get());
+	renderer.set_material(material);
+	renderer.set_shader_program(shprog, shdata.get());
 	renderer.set_reverse_winding(back_faces);
 }
 
+void RenderPass::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	if(shdata.refcount()==1)
+		shdata->set_debug_name(name+" [UBO]");
+#else
+	(void)name;
+#endif
+}
+
 
 DataFile::Loader::ActionMap RenderPass::Loader::shared_actions;
 
@@ -162,6 +172,7 @@ RenderPass::Loader::Loader(RenderPass &p, Collection &c):
 void RenderPass::Loader::init_actions()
 {
 	add("shader",   &Loader::shader);
+	add("image_based_lighting", &RenderPass::image_based_lighting);
 	add("material", &Loader::material_inline);
 	add("material", &Loader::material);
 	add("material_slot", &RenderPass::material_slot);
@@ -178,10 +189,15 @@ void RenderPass::Loader::init_actions()
 	add("texunit",  &Loader::texunit_named);
 }
 
+void RenderPass::Loader::set_inline_base_name(const string &n)
+{
+	inline_base_name = n;
+}
+
 void RenderPass::Loader::finish()
 {
 	if(obj.material)
-		obj.maybe_create_material_shader(coll);
+		obj.maybe_create_material_shader();
 }
 
 // Temporary compatibility feature
@@ -199,24 +215,24 @@ void RenderPass::Loader::material_inline()
 {
 	Material::GenericLoader ldr(coll);
 	load_sub_with(ldr);
-	obj.material = ldr.get_material();
+	RefPtr<Material> mat = ldr.get_material();
+	get_collection().add(inline_base_name+".mat", mat.get());
+	obj.material = mat.release();
 	obj.set_material_textures();
 }
 
 void RenderPass::Loader::material(const string &name)
 {
 	obj.material = &get_collection().get<Material>(name);
-	obj.material.keep();
 	obj.set_material_textures();
 }
 
 void RenderPass::Loader::shader(const string &n)
 {
 	obj.shprog = &get_collection().get<Program>(get_shader_name(n));
-	obj.shprog.keep();
 	obj.shprog_from_material = false;
 	if(obj.shdata)
-		obj.shdata = new ProgramData(*obj.shdata, obj.shprog.get());
+		obj.shdata = new ProgramData(*obj.shdata, obj.shprog);
 }
 
 void RenderPass::Loader::texture(const string &n)
@@ -266,7 +282,7 @@ void RenderPass::Loader::uniforms()
 	if(!obj.shprog || obj.shprog_from_material)
 		throw runtime_error("Shader is required for uniforms");
 	if(!obj.shdata)
-		obj.shdata = new ProgramData(obj.shprog.get());
+		obj.shdata = new ProgramData(obj.shprog);
 	else if(obj.shdata.refcount()>1)
 		obj.shdata = new ProgramData(*obj.shdata);
 	load_sub(*obj.shdata);