Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 11 additions & 2 deletions tutorials/assets_pipeline/importing_images.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,21 @@ It is possible to choose other types of imported resources in the Import dock:
texture applied onto a 3D surface. Texture3D is similar to a texture array, but
with interpolation between layers. Texture3D is typically used for
:ref:`class_FogMaterial` density maps in :ref:`volumetric fog
<doc_volumetric_fog>`, :ref:`class_Environment` 3D LUT color correction and
custom shaders.
<doc_volumetric_fog>`, :ref:`particle attractor <doc_3d_particles_attractors>`
vector fields, :ref:`class_Environment` 3D LUT color correction, and custom shaders.
- **TextureAtlas:** Import the image as an *atlas* of different textures. Can be
used to reduce memory usage for animated 2D sprites. Only supported in 2D due
to missing support in built-in 3D shaders.

For **Cubemap**, the expected image order is X+, X-, Y+, Y-, Z+, Z-
(in Godot's coordinate system, so Y+ is "up" and Z- is "forward").
Here are templates you can use for cubemap images (right-click > **Save Link As…**):

- :download:`2×3 cubemap template (default layout option) <img/cubemap_template_2x3.webp>`
- :download:`3×2 cubemap template <img/cubemap_template_3x2.webp>`
- :download:`1×6 cubemap template <img/cubemap_template_1x6.webp>`
- :download:`6×1 cubemap template <img/cubemap_template_6x1.webp>`

Detect 3D
^^^^^^^^^

Expand Down
6 changes: 4 additions & 2 deletions tutorials/shaders/shader_reference/shading_language.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ Most GLSL ES 3.0 datatypes are supported:
| **samplerCube** | Sampler type for binding Cubemaps, which are read as float. |
+----------------------+---------------------------------------------------------------------------------+
| **samplerCubeArray** | Sampler type for binding Cubemap arrays, which are read as float. |
| | Only supported in Forward+ and Mobile, not Compatibility. |
+----------------------+---------------------------------------------------------------------------------+

Comments
Expand Down Expand Up @@ -927,9 +928,10 @@ table of the corresponding types:
+----------------------+-------------------------+------------------------------------------------------------+
| **usampler3D** | **Texture3D** | |
+----------------------+-------------------------+------------------------------------------------------------+
| **samplerCube** | **Cubemap** | |
| **samplerCube** | **Cubemap** | See :ref:`doc_importing_images_changing_import_type` for |
| | | instructions on importing cubemaps for use in Godot. |
+----------------------+-------------------------+------------------------------------------------------------+
| **samplerCubeArray** | **CubemapArray** | |
| **samplerCubeArray** | **CubemapArray** | Only supported in Forward+ and Mobile, not Compatibility. |
+----------------------+-------------------------+------------------------------------------------------------+

.. note:: Be careful when setting shader uniforms from GDScript, no error will
Expand Down