Skip to content

Commit 7b26368

Browse files
authored
Merge pull request #9719 from Calinou/importing-images-cubemap-templates
Add cubemap template images to Importing images
2 parents 4c3c39c + 48df572 commit 7b26368

File tree

6 files changed

+15
-4
lines changed

6 files changed

+15
-4
lines changed
25 KB
Loading
26.2 KB
Loading
26.8 KB
Loading
27.3 KB
Loading

tutorials/assets_pipeline/importing_images.rst

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,21 @@ It is possible to choose other types of imported resources in the Import dock:
9797
texture applied onto a 3D surface. Texture3D is similar to a texture array, but
9898
with interpolation between layers. Texture3D is typically used for
9999
:ref:`class_FogMaterial` density maps in :ref:`volumetric fog
100-
<doc_volumetric_fog>`, :ref:`class_Environment` 3D LUT color correction and
101-
custom shaders.
100+
<doc_volumetric_fog>`, :ref:`particle attractor <doc_3d_particles_attractors>`
101+
vector fields, :ref:`class_Environment` 3D LUT color correction, and custom shaders.
102102
- **TextureAtlas:** Import the image as an *atlas* of different textures. Can be
103103
used to reduce memory usage for animated 2D sprites. Only supported in 2D due
104104
to missing support in built-in 3D shaders.
105105

106+
For **Cubemap**, the expected image order is X+, X-, Y+, Y-, Z+, Z-
107+
(in Godot's coordinate system, so Y+ is "up" and Z- is "forward").
108+
Here are templates you can use for cubemap images (right-click > **Save Link As…**):
109+
110+
- :download:`2×3 cubemap template (default layout option) <img/cubemap_template_2x3.webp>`
111+
- :download:`3×2 cubemap template <img/cubemap_template_3x2.webp>`
112+
- :download:`1×6 cubemap template <img/cubemap_template_1x6.webp>`
113+
- :download:`6×1 cubemap template <img/cubemap_template_6x1.webp>`
114+
106115
Detect 3D
107116
^^^^^^^^^
108117

tutorials/shaders/shader_reference/shading_language.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Most GLSL ES 3.0 datatypes are supported:
8383
| **samplerCube** | Sampler type for binding Cubemaps, which are read as float. |
8484
+----------------------+---------------------------------------------------------------------------------+
8585
| **samplerCubeArray** | Sampler type for binding Cubemap arrays, which are read as float. |
86+
| | Only supported in Forward+ and Mobile, not Compatibility. |
8687
+----------------------+---------------------------------------------------------------------------------+
8788

8889
Comments
@@ -927,9 +928,10 @@ table of the corresponding types:
927928
+----------------------+-------------------------+------------------------------------------------------------+
928929
| **usampler3D** | **Texture3D** | |
929930
+----------------------+-------------------------+------------------------------------------------------------+
930-
| **samplerCube** | **Cubemap** | |
931+
| **samplerCube** | **Cubemap** | See :ref:`doc_importing_images_changing_import_type` for |
932+
| | | instructions on importing cubemaps for use in Godot. |
931933
+----------------------+-------------------------+------------------------------------------------------------+
932-
| **samplerCubeArray** | **CubemapArray** | |
934+
| **samplerCubeArray** | **CubemapArray** | Only supported in Forward+ and Mobile, not Compatibility. |
933935
+----------------------+-------------------------+------------------------------------------------------------+
934936

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

0 commit comments

Comments
 (0)