Skip to content

Document support for 2D per-instance uniforms in Shading language #10749

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 2 commits into from
Apr 5, 2025
Merged

Document support for 2D per-instance uniforms in Shading language #10749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b823a2
Document support for 2D per-instance uniforms in Shading language
Calinou Mar 6, 2025
273206f
Update tutorials/shaders/shader_reference/shading_language.rst
skyace65 Apr 5, 2025
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
6 changes: 3 additions & 3 deletions tutorials/shaders/shader_reference/shading_language.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Most GLSL ES 3.0 datatypes are supported:
Comments
~~~~~~~~

The shading language supports the same comment syntax as used in C# and C++,
The shading language supports the same comment syntax as used in C# and C++,
using ``//`` for single-line comments and ``/* */`` for multi-line comments:

.. code-block:: glsl
Expand Down Expand Up @@ -912,7 +912,7 @@ You can access ``int`` values as a readable dropdown widget using the ``hint_enu
You can assign explicit values to the ``hint_enum`` uniform using colon syntax similar to GDScript:

.. code-block::

uniform int character_speed: hint_enum("Slow:30", "Average:60", "Very Fast:200") = 60;

The value will be stored as an integer, corresponding to the index of the selected
Expand Down Expand Up @@ -1058,7 +1058,7 @@ Per-instance uniforms

.. note::

Per-instance uniforms are only available in ``spatial`` (3D) shaders.
Per-instance uniforms are available in both ``canvas_item`` (2D) and ``spatial`` (3D) shaders.

Sometimes, you want to modify a parameter on each node using the material. As an
example, in a forest full of trees, when you want each tree to have a slightly
Expand Down