Merge branch 'develop'v1.0.0-beta1

Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4

1 files changed, 3 insertions, 2 deletions

diff --git a/src/datavisualization/engine/shaders/default.frag b/src/datavisualization/engine/shaders/default.frag
index fba1ce4a..ca6fefb9 100644
--- a/src/datavisualization/engine/shaders/default.frag
+++ b/src/datavisualization/engine/shaders/default.frag
@@ -11,11 +11,12 @@ uniform highp vec3 lightPosition_wrld;
 uniform highp vec3 color_mdl;
 uniform highp float lightStrength;
 uniform highp float ambientStrength;
+uniform highp vec3 lightColor;
 
 void main() {
     highp vec3 materialDiffuseColor = color_mdl.rgb;
-    highp vec3 materialAmbientColor = vec3(ambientStrength, ambientStrength, ambientStrength) * materialDiffuseColor;
-    highp vec3 materialSpecularColor = vec3(1.0, 1.0, 1.0);
+    highp vec3 materialAmbientColor = lightColor * ambientStrength * materialDiffuseColor;
+    highp vec3 materialSpecularColor = lightColor;
 
     highp float distance = length(lightPosition_wrld - position_wrld);