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),
texturing(other.texturing ? new Texturing(*other.texturing) : 0),
tex_names(other.tex_names),
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;
texturing = other.texturing ? new Texturing(*other.texturing) : 0;
tex_names = other.tex_names;
RenderPass::~RenderPass()
{
delete texturing;
- delete shdata;
}
void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
{
shprog = prog;
- delete shdata;
shdata = new ProgramData(*data);
}
+const string &RenderPass::get_slotted_uniform_name(const string &slot) const
+{
+ map<string, string>::const_iterator i = uniform_slots.find(slot);
+ if(i==uniform_slots.end())
+ {
+ static string empty;
+ return empty;
+ }
+ return i->second;
+}
+
void RenderPass::set_material(const Material *mat)
{
material = mat;
{
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);
}
add("texunit", &Loader::texunit);
add("texunit", &Loader::texunit_named);
add("uniforms", &Loader::uniforms);
+ add("uniform_slot", &Loader::uniform_slot);
}
void RenderPass::Loader::material_inline()
obj.shdata = shd.release();
}
+void RenderPass::Loader::uniform_slot(const string &name)
+{
+ uniform_slot2(name, name);
+}
+
+void RenderPass::Loader::uniform_slot2(const string &name, const string &slot)
+{
+ obj.uniform_slots[slot] = name;
+}
+
RenderPass::TextureLoader::TextureLoader(Texturing &t, unsigned i, Collection *c):
DataFile::CollectionObjectLoader<Texturing>(t, c),