Add a texunit statement which automatically determines the unit number

[libs/gl.git] / source / renderpass.cpp

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 3f63ec47a8c382b058bd3321df01161290e387f2..d2ce1652fa682138bd5592dd7698e7b4b01060d5 100644 (file)
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -25,9 +25,10 @@ RenderPass::RenderPass():
 
 RenderPass::RenderPass(const RenderPass &other):
        shprog(other.shprog),
-       shdata(other.shdata ? new ProgramData(*other.shdata) : 0),
+       shdata(other.shdata),
        uniform_slots(other.uniform_slots),
        material(other.material),
+       material_slot(other.material_slot),
        texturing(other.texturing ? new Texturing(*other.texturing) : 0),
        tex_names(other.tex_names),
        back_faces(other.back_faces)
@@ -36,9 +37,10 @@ RenderPass::RenderPass(const RenderPass &other):
 RenderPass &RenderPass::operator=(const RenderPass &other)
 {
        shprog = other.shprog;
-       shdata = other.shdata ? new ProgramData(*other.shdata) : 0;
+       shdata = other.shdata;
        uniform_slots = other.uniform_slots;
        material = other.material;
+       material_slot = other.material_slot;
        texturing = other.texturing ? new Texturing(*other.texturing) : 0;
        tex_names = other.tex_names;
        back_faces = other.back_faces;
@@ -48,14 +50,23 @@ RenderPass &RenderPass::operator=(const RenderPass &other)
 RenderPass::~RenderPass()
 {
        delete texturing;
-       delete shdata;
+}
+
+void RenderPass::ensure_private_shader_data()
+{
+       if(!shprog)
+               throw invalid_operation("RenderPass::ensure_private_shader_data");
+
+       if(!shdata)
+               shdata = new ProgramData(shprog);
+       else if(shdata.refcount() > 1)
+               shdata = new ProgramData(*shdata);
 }
 
 void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
 {
        shprog = prog;
-       delete shdata;
-       shdata = new ProgramData(*data);
+       shdata = (data ? new ProgramData(*data) : 0);
 }
 
 const string &RenderPass::get_slotted_uniform_name(const string &slot) const
@@ -95,7 +106,7 @@ void RenderPass::apply(Renderer &renderer) const
 {
        renderer.set_texturing(texturing);
        renderer.set_material(material.get());
-       renderer.set_shader_program(shprog, shdata);
+       renderer.set_shader_program(shprog, shdata.get());
        renderer.set_reverse_winding(back_faces);
 }
 
@@ -120,6 +131,7 @@ void RenderPass::Loader::init()
        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);
@@ -149,16 +161,27 @@ 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);
        obj.tex_names[n] = i;
+       obj.ensure_private_shader_data();
+       obj.shdata->uniform(n, static_cast<int>(i));
 }
 
 void RenderPass::Loader::uniforms()
 {
-       if(!obj.shprog)
-               throw invalid_operation("RenderPass::Loader::uniforms");
+       obj.ensure_private_shader_data();
        RefPtr<ProgramData> shd = new ProgramData(obj.shprog);
        load_sub(*shd);
        obj.shdata = shd.release();