Use correct shader variable names for PBR materials

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index 1e00e1f5f6c426ef9fce488e3c92d9c80fed00ac..e23f12190b5f77da6a425842a15986a44801b876 100644 (file)
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -49,7 +49,7 @@ vec3 get_emission_color()
        if(use_emission_map)
                return texture(emission_map, texcoord.xy).rgb;
        else
-               return basic_material.emission.rgb;
+               return pbr_material.emission.rgb;
 }
 
 /* Computes the diffuse reflection of the macrosurface */

diff --git a/source/pbrmaterial.cpp b/source/pbrmaterial.cpp
index 130c4bf3a403d1b4097f9dae62269331008c5d56..8406d4e253e41492afcbd8a0bcda92a830c9e31c 100644 (file)
--- 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)