X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.cpp;h=810ecd174d81fb407730b33b0488b456dcee4f86;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=13f2d1d9d9f785ddefa152a22ad3f4dd0fed3a01;hpb=e37851b98dde5082ee92570354746f2f92e21940;p=libs%2Fgl.git diff --git a/source/material.cpp b/source/material.cpp index 13f2d1d9..810ecd17 100644 --- a/source/material.cpp +++ b/source/material.cpp @@ -1,135 +1,108 @@ +#include +#include +#include "basicmaterial.h" #include "gl.h" -#include "material.h" +#include "pbrmaterial.h" #include "resources.h" +#include "texturing.h" +#include "uniform.h" + +using namespace std; namespace Msp { namespace GL { -Material::Material() +Program *Material::create_compatible_shader() const { - set_ambient(0.2); - set_diffuse(0.8); - set_specular(0); - set_emission(0); - set_shininess(0); + return new Program(create_program_source()); } -void Material::update_parameter(int mask) const +const Program *Material::create_compatible_shader(DataFile::Collection &coll) const { - if(cur_obj!=this) - return; + string source = create_program_source(); + string name = format("_material_%016x.glsl", hash64(source)); + Program *shprog = coll.find(name); + if(shprog) + return shprog; - if(mask&AMBIENT) - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, &ambient.r); - if(mask&DIFFUSE) - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, &diffuse.r); - if(mask&SPECULAR) - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &specular.r); - if(mask&EMISSION) - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, &emission.r); - if(mask&SHININESS) - glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess); -} + shprog = new Program(create_program_source()); + try + { + coll.add(name, shprog); + } + catch(...) + { + delete shprog; + throw; + } -void Material::set_ambient(const Color &a) -{ - ambient = a; - shdata.uniform("material.ambient", ambient); - update_parameter(AMBIENT); + return shprog; } -void Material::set_diffuse(const Color &d) +void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const { - diffuse = d; - shdata.uniform("material.diffuse", diffuse); - update_parameter(DIFFUSE); -} + if(!tex) + return; -void Material::set_specular(const Color &s) -{ - specular = s; - shdata.uniform("material.specular", specular); - update_parameter(SPECULAR); -} + int unit = -1; -void Material::set_emission(const Color &e) -{ - emission = e; - shdata.uniform("material.emission", emission); - update_parameter(EMISSION); -} + if(const Uniform *uni = tex_shdata.find_uniform(name)) + if(const Uniform1i *uni_int = dynamic_cast(uni)) + unit = uni_int->get(); -void Material::set_shininess(float s) -{ - shininess = s; - shdata.uniform("material.shininess", shininess); - update_parameter(SHININESS); + if(unit<0) + unit = texturing.find_free_unit(name); + if(unit<0) + throw runtime_error("no free texunit"); + + texturing.attach(unit, *tex, sampler); + tex_shdata.uniform(name, unit); } -void Material::bind() const +Material::MaterialRegistry &Material::get_material_registry() { - if(set_current(this)) - update_parameter(-1); + static MaterialRegistry registry; + static bool initialized = false; + if(!initialized) + { + initialized = true; + registry.register_type("basic"); + registry.register_type("pbr"); + } + return registry; } Material::Loader::Loader(Material &m): - DataFile::CollectionObjectLoader(m, 0) -{ - init(); -} + CollectionObjectLoader(m, 0) +{ } Material::Loader::Loader(Material &m, Collection &c): - DataFile::CollectionObjectLoader(m, &c) -{ - init(); -} + CollectionObjectLoader(m, &c) +{ } -void Material::Loader::init() +void Material::Loader::init_actions() { - if(Resources *res = dynamic_cast(coll)) - srgb = res->get_srgb_conversion(); - else - srgb = false; - - add("ambient", &Loader::ambient); - add("diffuse", &Loader::diffuse); - add("specular", &Loader::specular); - add("emission", &Loader::emission); - add("shininess", &Loader::shininess); + add("sampler", &Loader::sampler); } -Color Material::Loader::make_color(float r, float g, float b, float a) +void Material::Loader::sampler(const std::string &name) { - Color c(r, g, b, a); - if(srgb) - c = c.to_linear(); - return c; + obj.sampler = &get_collection().get(name); } -void Material::Loader::ambient(float r, float g, float b, float a) -{ - obj.set_ambient(make_color(r, g, b, a)); -} -void Material::Loader::diffuse(float r, float g, float b, float a) -{ - obj.set_diffuse(make_color(r, g, b, a)); -} - -void Material::Loader::specular(float r, float g, float b, float a) -{ - obj.set_specular(make_color(r, g, b, a)); -} +DataFile::Loader::ActionMap Material::GenericLoader::shared_actions; -void Material::Loader::emission(float r, float g, float b, float a) +Material::GenericLoader::GenericLoader(DataFile::Collection *c): + coll(c) { - obj.set_emission(make_color(r, g, b, a)); + set_actions(shared_actions); } -void Material::Loader::shininess(float s) +void Material::GenericLoader::init_actions() { - obj.set_shininess(s); + get_material_registry().add_all(*this); } } // namespace GL