From 96e83e3ed496fa582fcf2483fd094ca0d9c0d855 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 23 Jul 2015 14:11:28 -0700 Subject: [PATCH] remove gl_FrontMaterial --- libraries/render-utils/src/simple.slf | 6 +++--- libraries/render-utils/src/simple_textured.slf | 8 ++++---- libraries/render-utils/src/simple_textured_emisive.slf | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/render-utils/src/simple.slf b/libraries/render-utils/src/simple.slf index 8d49de4e46..1d77dde0d3 100644 --- a/libraries/render-utils/src/simple.slf +++ b/libraries/render-utils/src/simple.slf @@ -21,7 +21,7 @@ void main(void) { packDeferredFragment( normalize(interpolatedNormal.xyz), glowIntensity, - vec3(0,0,1), //gl_Color.rgb, - vec3(0,0,1), //gl_FrontMaterial.specular.rgb, - 1); //gl_FrontMaterial.shininess); + gl_Color.rgb, + vec3(0.1), + 10); } diff --git a/libraries/render-utils/src/simple_textured.slf b/libraries/render-utils/src/simple_textured.slf index 814854e169..88b196543c 100644 --- a/libraries/render-utils/src/simple_textured.slf +++ b/libraries/render-utils/src/simple_textured.slf @@ -25,8 +25,8 @@ void main(void) { packDeferredFragment( normalize(interpolatedNormal.xyz), - glowIntensity, // glowIntensity * texel.a, - gl_Color.rgb, // gl_Color.rgb * texel.rgb, - gl_FrontMaterial.specular.rgb, - gl_FrontMaterial.shininess); + glowIntensity * texel.a, + gl_Color.rgb * texel.rgb, + vec3(0.1), + 10); } \ No newline at end of file diff --git a/libraries/render-utils/src/simple_textured_emisive.slf b/libraries/render-utils/src/simple_textured_emisive.slf index 643dcde190..c5749114f3 100644 --- a/libraries/render-utils/src/simple_textured_emisive.slf +++ b/libraries/render-utils/src/simple_textured_emisive.slf @@ -27,7 +27,7 @@ void main(void) { normalize(interpolatedNormal.xyz), glowIntensity * texel.a, gl_Color.rgb, - gl_FrontMaterial.specular.rgb, - gl_FrontMaterial.shininess, + vec3(0.1), + 10, texel.rgb); } \ No newline at end of file