From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 25 Nov 2022 11:13:16 +0000 (+0000)
Subject: Merge "DALi Version 2.2.3" into devel/master
X-Git-Tag: dali_2.2.4~7
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=d3b38f90723a61a6fdeaf2ee526240ecbc78e66f;hp=789e575c9c1eafff8138a046055b9ee1189181d3

Merge "DALi Version 2.2.3" into devel/master
---

diff --git a/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag b/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
index a55e9c3..ee7eeff 100644
--- a/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
+++ b/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
@@ -33,7 +33,8 @@ precision mediump float;
 #endif //GLTF_CHANNELS
 #endif //THREE_TEX
 
-uniform lowp vec4 uColorFactor;
+uniform lowp vec4 uColor; // Color from SceneGraph
+uniform lowp vec4 uColorFactor; // Color from material
 uniform lowp float uMetallicFactor;
 uniform lowp float uRoughnessFactor;
 
@@ -221,5 +222,5 @@ void main()
   color += emissive;
 #endif // EMISSIVE
 
-  FragColor = vec4(pow(color, vec3(1.0 / 2.2)), baseColor.a);
+  FragColor = vec4(pow(color, vec3(1.0 / 2.2)), baseColor.a) * uColor;
 }
diff --git a/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag b/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag
index a1153c9..633e91c 100644
--- a/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag
+++ b/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag
@@ -1,11 +1,12 @@
 #version 300 es
 
 precision mediump float;
+uniform lowp vec4 uColor;
 flat in float vColor;
 out vec4 FragColor;
 
 void main()
 {
   vec3 rgb = vec3(fract(vColor), fract(vColor * 0.00390625), fract(vColor * 0.00390625 * 0.00390625));
-  FragColor = vec4(rgb, 1.);
+  FragColor = vec4(rgb, 1.) * uColor;
 }
\ No newline at end of file
diff --git a/dali-scene3d/internal/graphics/shaders/skybox-shader.frag b/dali-scene3d/internal/graphics/shaders/skybox-shader.frag
index 2a6024d..7bf6e42 100644
--- a/dali-scene3d/internal/graphics/shaders/skybox-shader.frag
+++ b/dali-scene3d/internal/graphics/shaders/skybox-shader.frag
@@ -1,9 +1,10 @@
 uniform samplerCube   uSkyBoxTexture;
+uniform lowp    vec4  uColor;
 uniform mediump float uIntensity;
 varying mediump vec3  vTexCoord;
 
 void main()
 {
   mediump vec4 texColor = textureCube(uSkyBoxTexture, vTexCoord) * uIntensity;
-  gl_FragColor = texColor;
+  gl_FragColor = texColor * uColor;
 }
\ No newline at end of file