diff options
Diffstat (limited to 'src/datavisualization/engine/shaders/default_ES2.frag')
-rw-r--r-- | src/datavisualization/engine/shaders/default_ES2.frag | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualization/engine/shaders/default_ES2.frag b/src/datavisualization/engine/shaders/default_ES2.frag index bc5c18b6..73d66d5b 100644 --- a/src/datavisualization/engine/shaders/default_ES2.frag +++ b/src/datavisualization/engine/shaders/default_ES2.frag @@ -4,19 +4,19 @@ varying highp vec3 position_wrld; varying highp vec3 normal_cmr; varying highp vec3 eyeDirection_cmr; varying highp vec3 lightDirection_cmr; +varying highp vec3 lightPosition_wrld_frag; -uniform highp vec3 lightPosition_wrld; -uniform highp vec3 color_mdl; +uniform highp vec4 color_mdl; uniform highp float lightStrength; uniform highp float ambientStrength; -uniform highp vec3 lightColor; +uniform highp vec4 lightColor; void main() { highp vec3 materialDiffuseColor = color_mdl.rgb; - highp vec3 materialAmbientColor = lightColor * ambientStrength * materialDiffuseColor; - highp vec3 materialSpecularColor = lightColor; + highp vec3 materialAmbientColor = lightColor.rgb * ambientStrength * materialDiffuseColor; + highp vec3 materialSpecularColor = lightColor.rgb; - highp float distance = length(lightPosition_wrld - position_wrld); + highp float distance = length(lightPosition_wrld_frag - position_wrld); highp vec3 n = normalize(normal_cmr); highp vec3 l = normalize(lightDirection_cmr); |