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

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 6af833e6..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;
@@ -14,6 +15,7 @@ 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
@@ -59,7 +61,13 @@ const Program *Material::create_compatible_shader(const map<string, int> &extra_
 void Material::set_alpha_cutoff(float a)
 {
 	alpha_cutoff = a;
-	shdata.uniform("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)
@@ -80,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;
@@ -93,6 +102,7 @@ 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);
 }
 
@@ -101,6 +111,12 @@ 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);