X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpbrmaterial.cpp;h=bc7104cc652d485350614b5737b32e6a42771f80;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=130c4bf3a403d1b4097f9dae62269331008c5d56;hpb=f7d6481be3511153ded018e119bcac852faa0766;p=libs%2Fgl.git

diff --git a/source/pbrmaterial.cpp b/source/pbrmaterial.cpp
index 130c4bf3..bc7104cc 100644
--- a/source/pbrmaterial.cpp
+++ b/source/pbrmaterial.cpp
@@ -51,7 +51,7 @@ void PbrMaterial::attach_textures_to(Texturing &texturing, ProgramData &tex_shda
 void PbrMaterial::set_base_color(const Color &color)
 {
 	base_color.value = color;
-	shdata.uniform("material.base_color", color);
+	shdata.uniform("pbr_material.base_color", color);
 }
 
 void PbrMaterial::set_base_color_map(const Texture *tex)
@@ -67,7 +67,7 @@ void PbrMaterial::set_normal_map(const Texture *tex)
 void PbrMaterial::set_metalness(float value)
 {
 	metalness.value = value;
-	shdata.uniform("material.metalness", value);
+	shdata.uniform("pbr_material.metalness", value);
 }
 
 void PbrMaterial::set_metalness_map(const Texture *tex)
@@ -78,7 +78,7 @@ void PbrMaterial::set_metalness_map(const Texture *tex)
 void PbrMaterial::set_roughness(float value)
 {
 	roughness.value = value;
-	shdata.uniform("material.roughness", value);
+	shdata.uniform("pbr_material.roughness", value);
 }
 
 void PbrMaterial::set_roughness_map(const Texture *tex)
@@ -94,7 +94,7 @@ void PbrMaterial::set_occlusion_map(const Texture *tex)
 void PbrMaterial::set_emission(const Color &color)
 {
 	emission.value = color;
-	shdata.uniform("material.emission", color);
+	shdata.uniform("pbr_material.emission", color);
 }
 
 void PbrMaterial::set_emission_map(const Texture *tex)
@@ -111,19 +111,20 @@ void PbrMaterial::set_receive_shadows(bool s)
 DataFile::Loader::ActionMap PbrMaterial::Loader::shared_actions;
 
 PbrMaterial::Loader::Loader(PbrMaterial &m):
-	DerivedObjectLoader<PbrMaterial, Material::LoaderBase<PbrMaterial> >(m)
+	DerivedObjectLoader<PbrMaterial, Material::PropertyLoader<PbrMaterial> >(m)
 {
 	set_actions(shared_actions);
 }
 
 PbrMaterial::Loader::Loader(PbrMaterial &m, Collection &c):
-	DerivedObjectLoader<PbrMaterial, Material::LoaderBase<PbrMaterial> >(m, c)
+	DerivedObjectLoader<PbrMaterial, Material::PropertyLoader<PbrMaterial> >(m, c)
 {
 	set_actions(shared_actions);
 }
 
 void PbrMaterial::Loader::init_actions()
 {
+	Material::PropertyLoader<PbrMaterial>::init_actions();
 	add_property("base_color", &PbrMaterial::set_base_color, &PbrMaterial::set_base_color_map, true);
 	add_property("normal", &PbrMaterial::set_normal_map);
 	add_property("metalness", &PbrMaterial::set_metalness, &PbrMaterial::set_metalness_map);