From fe22c8d4c2891e55c7f0dfa2c8600b3172fc8664 Mon Sep 17 00:00:00 2001 From: Hex-4 <121138331+Hex-4@users.noreply.github.com> Date: Sun, 1 Oct 2023 10:00:26 -0600 Subject: [PATCH 1/3] add comment for default values --- tutorials/shaders/shader_reference/shading_language.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/shaders/shader_reference/shading_language.rst b/tutorials/shaders/shader_reference/shading_language.rst index 7437398ea74..370556688a4 100644 --- a/tutorials/shaders/shader_reference/shading_language.rst +++ b/tutorials/shaders/shader_reference/shading_language.rst @@ -757,7 +757,7 @@ used, and how the editor should allow users to modify it. uniform vec4 color : source_color; uniform float amount : hint_range(0, 1); - uniform vec4 other_color : source_color = vec4(1.0); + uniform vec4 other_color : source_color = vec4(1.0); # Default values go after the hint uniform sampler2D image : source_color; It's important to understand that textures that are supplied as color require From 74dcf181229631d3f46415e2f66a3fec57de1683 Mon Sep 17 00:00:00 2001 From: Hex-4 <121138331+Hex-4@users.noreply.github.com> Date: Sun, 1 Oct 2023 10:09:17 -0600 Subject: [PATCH 2/3] Add a line telling where the default value goes --- tutorials/shaders/shader_reference/shading_language.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tutorials/shaders/shader_reference/shading_language.rst b/tutorials/shaders/shader_reference/shading_language.rst index 370556688a4..45fd25ff126 100644 --- a/tutorials/shaders/shader_reference/shading_language.rst +++ b/tutorials/shaders/shader_reference/shading_language.rst @@ -899,6 +899,8 @@ Uniforms can also be assigned default values: uniform vec4 some_vector = vec4(0.0); uniform vec4 some_color : source_color = vec4(1.0); +Note that when adding a default value and a hint, the default value goes after the hint. + If you need to make multiple uniforms to be grouped in the specific category of an inspector, you can use a `group_uniform` keyword like: .. code-block:: glsl From a294e3fad68a94ec40b5b7783abb343eb0b7510b Mon Sep 17 00:00:00 2001 From: Hex-4 <121138331+Hex-4@users.noreply.github.com> Date: Sun, 1 Oct 2023 10:35:41 -0600 Subject: [PATCH 3/3] Fix comment syntax Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> --- tutorials/shaders/shader_reference/shading_language.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/shaders/shader_reference/shading_language.rst b/tutorials/shaders/shader_reference/shading_language.rst index 45fd25ff126..40afc2af081 100644 --- a/tutorials/shaders/shader_reference/shading_language.rst +++ b/tutorials/shaders/shader_reference/shading_language.rst @@ -757,7 +757,7 @@ used, and how the editor should allow users to modify it. uniform vec4 color : source_color; uniform float amount : hint_range(0, 1); - uniform vec4 other_color : source_color = vec4(1.0); # Default values go after the hint + uniform vec4 other_color : source_color = vec4(1.0); // Default values go after the hint. uniform sampler2D image : source_color; It's important to understand that textures that are supplied as color require