X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Frenderpass.cpp;h=499a521f1dc8ff17fb3270cfedfd4a370e90c62a;hb=729a477b47e97aea41f3f0b5db551f02bf70d1ee;hp=3fbec4822607ec0f1bceec0e3bd62ca34314547b;hpb=66636f876635ee283594c15a7dbd47d5bb639366;p=libs%2Fgl.git diff --git a/source/materials/renderpass.cpp b/source/materials/renderpass.cpp index 3fbec482..499a521f 100644 --- a/source/materials/renderpass.cpp +++ b/source/materials/renderpass.cpp @@ -9,8 +9,6 @@ #include "renderer.h" #include "texture.h" #include "texture2d.h" -#include "texturing.h" -#include "uniform.h" using namespace std; @@ -22,15 +20,16 @@ RenderPass::RenderPass(): shprog_from_material(false), shdata(0), material(0), - back_faces(false), - receive_shadows(false) + face_cull(CULL_BACK), + receive_shadows(false), + image_based_lighting(false) { } void RenderPass::set_material_textures() { const Tag *material_texture_tags = material->get_texture_tags(); for(const Tag *tag=material_texture_tags; tag->id; ++tag) - set_texture(*tag, material->get_texture(*tag), material->get_sampler()); + set_texture(*tag, material->get_texture(*tag), material->get_sampler(*tag)); } void RenderPass::maybe_create_material_shader() @@ -41,12 +40,13 @@ void RenderPass::maybe_create_material_shader() map extra_spec; if(receive_shadows) extra_spec["use_shadow_map"] = true; + if(image_based_lighting) + extra_spec["use_image_based_lighting"] = true; shprog = material->create_compatible_shader(extra_spec); - shprog.keep(); if(shdata) - shdata = new ProgramData(*shdata, shprog.get()); + shdata = new ProgramData(*shdata, shprog); shprog_from_material = true; } @@ -54,14 +54,13 @@ void RenderPass::maybe_create_material_shader() 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); } Tag RenderPass::get_slotted_uniform_tag(Tag slot) const { - map::const_iterator i = uniform_slots.find(slot); + auto i = uniform_slots.find(slot); if(i==uniform_slots.end()) return Tag(); return i->second; @@ -70,14 +69,13 @@ Tag RenderPass::get_slotted_uniform_tag(Tag slot) const void RenderPass::set_material(const Material *mat) { material = mat; - material.keep(); maybe_create_material_shader(); set_material_textures(); } void RenderPass::set_texture(Tag tag, const Texture *tex, const Sampler *samp) { - vector::iterator i = find_member(textures, tag, &TextureSlot::tag); + auto i = find_member(textures, tag, &TextureSlot::tag); if(i==textures.end()) { textures.push_back(TextureSlot(tag)); @@ -90,44 +88,13 @@ void RenderPass::set_texture(Tag tag, const Texture *tex, const Sampler *samp) Tag RenderPass::get_texture_tag(const string &slot) const { - vector::const_iterator i = find_member(textures, slot, &TextureSlot::slot_name); + auto i = find_member(textures, slot, &TextureSlot::slot_name); return (i!=textures.end() ? i->tag : Tag()); } -void RenderPass::set_texture(unsigned index, const Texture *tex, const Sampler *samp) +void RenderPass::set_face_cull(CullMode fc) { - if(!shprog) - throw invalid_operation("RenderPass::set_texture"); - - const vector &uniforms = shprog->get_uniforms(); - for(vector::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i) - if(is_image(i->type) && i->binding==static_cast(index)) - return set_texture(i->tag, tex, samp); - - if(shdata) - { - const vector &tags = shdata->get_uniform_tags(); - for(vector::const_iterator i=tags.begin(); i!=tags.end(); ++i) - { - vector::const_iterator j = find_member(uniforms, *i, &Program::UniformInfo::tag); - if(j==uniforms.end() || !is_image(j->type)) - continue; - if(const Uniform1i *uni1i = dynamic_cast(shdata->find_uniform(*i))) - if(uni1i->get()==static_cast(index)) - return set_texture(*i, tex, samp); - } - } -} - -int RenderPass::get_texture_index(const string &n) const -{ - vector::const_iterator i = find_member(textures, n, &TextureSlot::slot_name); - return (shprog && i!=textures.end() ? shprog->get_uniform_binding(i->tag) : -1); -} - -void RenderPass::set_back_faces(bool bf) -{ - back_faces = bf; + face_cull = fc; } void RenderPass::set_receive_shadows(bool rs) @@ -137,11 +104,12 @@ void RenderPass::set_receive_shadows(bool rs) void RenderPass::apply(Renderer &renderer) const { - for(vector::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_reverse_winding(back_faces); + for(const TextureSlot &t: textures) + renderer.set_texture(t.tag, t.texture, t.sampler); + renderer.set_shader_program(shprog, shdata.get()); + if(material) + renderer.add_shader_data(material->get_shader_data()); + renderer.set_face_cull(face_cull); } void RenderPass::set_debug_name(const string &name) @@ -171,21 +139,22 @@ RenderPass::Loader::Loader(RenderPass &p, Collection &c): void RenderPass::Loader::init_actions() { + add("face_cull", &RenderPass::face_cull); 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); - add("back_faces",&RenderPass::back_faces); add("receive_shadows", &RenderPass::receive_shadows); add("texture", &Loader::texture); add("uniforms", &Loader::uniforms); add("uniform_slot", &Loader::uniform_slot); add("uniform_slot", &Loader::uniform_slot2); +} - // Deprecated - add("texunit", &Loader::texunit); - add("texunit", &Loader::texture); - add("texunit", &Loader::texunit_named); +void RenderPass::Loader::set_inline_base_name(const string &n) +{ + inline_base_name = n; } void RenderPass::Loader::finish() @@ -209,29 +178,29 @@ void RenderPass::Loader::material_inline() { Material::GenericLoader ldr(coll); load_sub_with(ldr); - obj.material = ldr.get_material(); + RefPtr 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(name); - obj.material.keep(); obj.set_material_textures(); } void RenderPass::Loader::shader(const string &n) { obj.shprog = &get_collection().get(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) { - vector::iterator i = find_member(obj.textures, Tag(n), &TextureSlot::tag); + auto i = find_member(obj.textures, Tag(n), &TextureSlot::tag); if(i==obj.textures.end()) { obj.textures.push_back(TextureSlot(n)); @@ -241,42 +210,12 @@ void RenderPass::Loader::texture(const string &n) load_sub_with(ldr); } -void RenderPass::Loader::texunit(unsigned) -{ - IO::print(IO::cerr, "Warning: specifying textures by unit number is deprecated and may not produce expected results"); - string name; - if(obj.shprog) - { - const vector &uniforms = obj.shprog->get_uniforms(); - for(vector::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i) - if(is_image(i->type) && i->binding>=0) - { - if(!name.empty()) - { - name.clear(); - break; - } - name = i->name; - } - } - - if(name.empty()) - throw runtime_error("Could not determine name for texture"); - - texture(name); -} - -void RenderPass::Loader::texunit_named(unsigned, const string &n) -{ - texture(n); -} - 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);