X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=a34c0457384025f2af87f91ed45fac78dd042835;hp=6d9c0571f429f37e8c2ce265ca8c88e92bfaf70c;hb=HEAD;hpb=9813f8711628a0fbe786406e974dc33546dc9cee

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 6d9c0571..39ddec1d 100644
--- 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
@@ -63,6 +88,7 @@ Material::GenericLoader::TypeRegistry &Material::get_material_registry()
 		initialized = true;
 		registry.register_type<BasicMaterial>("basic");
 		registry.register_type<PbrMaterial>("pbr");
+		registry.register_type<SplatMaterial>("splat");
 		registry.register_type<UnlitMaterial>("unlit");
 	}
 	return registry;
@@ -75,9 +101,22 @@ Material::Loader::Loader(Material &m, Collection &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::alpha_cutoff(float a)
+{
+	obj.set_alpha_cutoff(a);
+}
+
+void Material::Loader::alpha_cutoff_feather(float a, float f)
+{
+	obj.set_alpha_cutoff(a);
+	obj.set_alpha_feather(f);
+}
+
 void Material::Loader::sampler(const string &name)
 {
 	obj.sampler = &get_collection().get<Sampler>(name);