Check the flat qualifier from the correct member

[libs/gl.git] / source / materials / material.cpp

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index d8665537bcbe6097187628a23363b1e975f6f342..39ddec1d56b3ebc351aed7565e570a8fb440e076 100644 (file)
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -4,6 +4,7 @@
 #include "pbrmaterial.h"
 #include "program.h"
 #include "resources.h"
+#include "splatmaterial.h"
 #include "unlitmaterial.h"
 
 using namespace std;
@@ -11,21 +12,33 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+Material::Material()
+{
+       set_alpha_cutoff(0.0f);
+       set_alpha_feather(1.0f);
+}
+
 const Program *Material::create_compatible_shader(const map<string, int> &extra_spec) const
 {
        string module_name;
        map<string, int> spec_values;
+       if(alpha_cutoff>0.0f)
+               spec_values["use_alpha_cutoff"] = true;
+
        fill_program_info(module_name, spec_values);
 
        for(const auto &kvp: extra_spec)
                spec_values[kvp.first] = kvp.second;
 
-       string info = module_name;
+       uint64_t info_hash = hash<64>(module_name);
        for(const auto &kvp: spec_values)
-               info += format(",%s:%d", kvp.first, kvp.second);
+       {
+               info_hash = hash_update<64>(info_hash, kvp.first);
+               info_hash = hash_update<64>(info_hash, kvp.second);
+       }
 
        Resources &res = Resources::get_global();
-       string name = format("_material_%016x.shader", hash64(info));
+       string name = format("_material_%016x.shader", info_hash);
        Program *shprog = res.find<Program>(name);
        if(shprog)
                return shprog;
@@ -45,6 +58,18 @@ const Program *Material::create_compatible_shader(const map<string, int> &extra_
        return shprog;
 }
 
+void Material::set_alpha_cutoff(float a)
+{
+       alpha_cutoff = a;
+       shdata.uniform("alpha_cutoff.cutoff", a);
+}
+
+void Material::set_alpha_feather(float f)
+{
+       alpha_feather = f;
+       shdata.uniform("alpha_cutoff.feather", f);
+}
+
 void Material::set_debug_name(const string &name)
 {
 #ifdef DEBUG
@@ -54,64 +79,47 @@ void Material::set_debug_name(const string &name)
 #endif
 }
 
-Material::MaterialRegistry &Material::get_material_registry()
+Material::GenericLoader::TypeRegistry &Material::get_material_registry()
 {
-       static MaterialRegistry registry;
+       static GenericLoader::TypeRegistry registry;
        static bool initialized = false;
        if(!initialized)
        {
                initialized = true;
                registry.register_type<BasicMaterial>("basic");
                registry.register_type<PbrMaterial>("pbr");
+               registry.register_type<SplatMaterial>("splat");
                registry.register_type<UnlitMaterial>("unlit");
        }
        return registry;
 }
 
 
-Material::Loader::Loader(Material &m):
-       CollectionObjectLoader(m, 0)
-{ }
-
 Material::Loader::Loader(Material &m, Collection &c):
        CollectionObjectLoader(m, &c)
 { }
 
 void Material::Loader::init_actions()
 {
+       add("alpha_cutoff", &Loader::alpha_cutoff);
+       add("alpha_cutoff", &Loader::alpha_cutoff_feather);
        add("sampler", &Loader::sampler);
 }
 
-void Material::Loader::sampler(const string &name)
+void Material::Loader::alpha_cutoff(float a)
 {
-       obj.sampler = &get_collection().get<Sampler>(name);
+       obj.set_alpha_cutoff(a);
 }
 
-
-DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
-
-Material::GenericLoader::GenericLoader(DataFile::Collection *c):
-       coll(c),
-       material(0),
-       mat_loader(0)
+void Material::Loader::alpha_cutoff_feather(float a, float f)
 {
-       set_actions(shared_actions);
+       obj.set_alpha_cutoff(a);
+       obj.set_alpha_feather(f);
 }
 
-Material::GenericLoader::~GenericLoader()
-{
-       delete material;
-       delete mat_loader;
-}
-
-void Material::GenericLoader::init_actions()
-{
-       add("type", &GenericLoader::type);
-}
-
-void Material::GenericLoader::type(const DataFile::Symbol &sym)
+void Material::Loader::sampler(const string &name)
 {
-       get_material_registry().invoke(sym.name, *this);
+       obj.sampler = &get_collection().get<Sampler>(name);
 }
 
 } // namespace GL