Skip to content

Close #7690 (add info for shader hints and default values) #8117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2023
Merged

Close #7690 (add info for shader hints and default values) #8117

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe22c8d
add comment for default values
Hex-4 Oct 1, 2023
74dcf18
Add a line telling where the default value goes
Hex-4 Oct 1, 2023
a294e3f
Fix comment syntax
Hex-4 Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tutorials/shaders/shader_reference/shading_language.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down