X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=39ddec1d56b3ebc351aed7565e570a8fb440e076;hb=HEAD;hp=b2ee973ad11c0b8d55fc4d6ea14dabaebf31a3a8;hpb=fe2fc291a4fc618425c64112c9ffd3519f0b8a3e;p=libs%2Fgl.git

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index b2ee973a..39ddec1d 100644
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -1,11 +1,10 @@
 #include <msp/core/hash.h>
 #include <msp/strings/format.h>
 #include "basicmaterial.h"
-#include "gl.h"
 #include "pbrmaterial.h"
+#include "program.h"
 #include "resources.h"
-#include "texturing.h"
-#include "uniform.h"
+#include "splatmaterial.h"
 #include "unlitmaterial.h"
 
 using namespace std;
@@ -13,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(map<string, int>::const_iterator i=extra_spec.begin(); i!=extra_spec.end(); ++i)
-		spec_values[i->first] = i->second;
+	for(const auto &kvp: extra_spec)
+		spec_values[kvp.first] = kvp.second;
 
-	string info = module_name;
-	for(map<string, int>::const_iterator i=spec_values.begin(); i!=spec_values.end(); ++i)
-		info += format(",%s:%d", i->first, i->second);
+	uint64_t info_hash = hash<64>(module_name);
+	for(const auto &kvp: spec_values)
+	{
+		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;
@@ -47,28 +58,17 @@ const Program *Material::create_compatible_shader(const map<string, int> &extra_
 	return shprog;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
+void Material::set_alpha_cutoff(float a)
 {
-	if(!tex)
-		return;
-
-	int unit = -1;
-
-	if(const Uniform *uni = tex_shdata.find_uniform(name))
-		if(const Uniform1i *uni_int = dynamic_cast<const Uniform1i *>(uni))
-			unit = uni_int->get();
-
-	if(unit<0)
-		unit = texturing.find_free_unit(name);
-	if(unit<0)
-		throw runtime_error("no free texunit");
+	alpha_cutoff = a;
+	shdata.uniform("alpha_cutoff.cutoff", a);
+}
 
-	texturing.attach(unit, *tex, sampler);
-	tex_shdata.uniform(name, unit);
+void Material::set_alpha_feather(float f)
+{
+	alpha_feather = f;
+	shdata.uniform("alpha_cutoff.feather", f);
 }
-#pragma GCC diagnostic pop
 
 void Material::set_debug_name(const string &name)
 {
@@ -79,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)
-{
-	obj.sampler = &get_collection().get<Sampler>(name);
-}
-
-
-DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
-
-Material::GenericLoader::GenericLoader(DataFile::Collection *c):
-	coll(c),
-	material(0),
-	mat_loader(0)
-{
-	set_actions(shared_actions);
-}
-
-Material::GenericLoader::~GenericLoader()
+void Material::Loader::alpha_cutoff(float a)
 {
-	delete material;
-	delete mat_loader;
+	obj.set_alpha_cutoff(a);
 }
 
-void Material::GenericLoader::init_actions()
+void Material::Loader::alpha_cutoff_feather(float a, float f)
 {
-	add("type", &GenericLoader::type);
+	obj.set_alpha_cutoff(a);
+	obj.set_alpha_feather(f);
 }
 
-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