Skip to content

Commit 95743e3

Browse files
Merge pull request #10642 from godotengine/classref/sync-36d90c7
classref: Sync with current master branch (36d90c7)
2 parents cb0009a + 06119cd commit 95743e3

14 files changed

+201
-32
lines changed

classes/class_canvasitem.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ Returns ``true`` if the node is present in the :ref:`SceneTree<class_SceneTree>`
14941494

14951495
Visibility is checked only in parent nodes that inherit from **CanvasItem**, :ref:`CanvasLayer<class_CanvasLayer>`, and :ref:`Window<class_Window>`. If the parent is of any other type (such as :ref:`Node<class_Node>`, :ref:`AnimationPlayer<class_AnimationPlayer>`, or :ref:`Node3D<class_Node3D>`), it is assumed to be visible.
14961496

1497-
\ **Note:** This method does not take :ref:`visibility_layer<class_CanvasItem_property_visibility_layer>` into account, so even if this method returns ``true`` the node might end up not being rendered.
1497+
\ **Note:** This method does not take :ref:`visibility_layer<class_CanvasItem_property_visibility_layer>` into account, so even if this method returns ``true``, the node might end up not being rendered.
14981498

14991499
.. rst-class:: classref-item-separator
15001500

classes/class_charfxtransform.rst

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ For example, the opening BBCode tag ``[example foo=hello bar=true baz=42 color=#
143143
- |void| **set_font**\ (\ value\: :ref:`RID<class_RID>`\ )
144144
- :ref:`RID<class_RID>` **get_font**\ (\ )
145145

146-
Font resource used to render glyph.
146+
:ref:`TextServer<class_TextServer>` RID of the font used to render glyph, this value can be used with ``TextServer.font_*`` methods to retrieve font information.
147+
148+
\ **Note:** Read-only. Setting this property won't affect drawing.
147149

148150
.. rst-class:: classref-item-separator
149151

@@ -160,7 +162,9 @@ Font resource used to render glyph.
160162
- |void| **set_glyph_count**\ (\ value\: :ref:`int<class_int>`\ )
161163
- :ref:`int<class_int>` **get_glyph_count**\ (\ )
162164

163-
Number of glyphs in the grapheme cluster. This value is set in the first glyph of a cluster. Setting this property won't affect drawing.
165+
Number of glyphs in the grapheme cluster. This value is set in the first glyph of a cluster.
166+
167+
\ **Note:** Read-only. Setting this property won't affect drawing.
164168

165169
.. rst-class:: classref-item-separator
166170

@@ -177,7 +181,9 @@ Number of glyphs in the grapheme cluster. This value is set in the first glyph o
177181
- |void| **set_glyph_flags**\ (\ value\: :ref:`int<class_int>`\ )
178182
- :ref:`int<class_int>` **get_glyph_flags**\ (\ )
179183

180-
Glyph flags. See :ref:`GraphemeFlag<enum_TextServer_GraphemeFlag>` for more info. Setting this property won't affect drawing.
184+
Glyph flags. See :ref:`GraphemeFlag<enum_TextServer_GraphemeFlag>` for more info.
185+
186+
\ **Note:** Read-only. Setting this property won't affect drawing.
181187

182188
.. rst-class:: classref-item-separator
183189

@@ -194,7 +200,7 @@ Glyph flags. See :ref:`GraphemeFlag<enum_TextServer_GraphemeFlag>` for more info
194200
- |void| **set_glyph_index**\ (\ value\: :ref:`int<class_int>`\ )
195201
- :ref:`int<class_int>` **get_glyph_index**\ (\ )
196202

197-
Font specific glyph index.
203+
Glyph index specific to the :ref:`font<class_CharFXTransform_property_font>`. If you want to replace this glyph, use :ref:`TextServer.font_get_glyph_index<class_TextServer_method_font_get_glyph_index>` with :ref:`font<class_CharFXTransform_property_font>` to get a new glyph index for a single character.
198204

199205
.. rst-class:: classref-item-separator
200206

@@ -228,7 +234,9 @@ The position offset the character will be drawn with (in pixels).
228234
- |void| **set_outline**\ (\ value\: :ref:`bool<class_bool>`\ )
229235
- :ref:`bool<class_bool>` **is_outline**\ (\ )
230236

231-
If ``true``, FX transform is called for outline drawing. Setting this property won't affect drawing.
237+
If ``true``, FX transform is called for outline drawing.
238+
239+
\ **Note:** Read-only. Setting this property won't affect drawing.
232240

233241
.. rst-class:: classref-item-separator
234242

@@ -245,7 +253,9 @@ If ``true``, FX transform is called for outline drawing. Setting this property w
245253
- |void| **set_range**\ (\ value\: :ref:`Vector2i<class_Vector2i>`\ )
246254
- :ref:`Vector2i<class_Vector2i>` **get_range**\ (\ )
247255

248-
Absolute character range in the string, corresponding to the glyph. Setting this property won't affect drawing.
256+
Absolute character range in the string, corresponding to the glyph.
257+
258+
\ **Note:** Read-only. Setting this property won't affect drawing.
249259

250260
.. rst-class:: classref-item-separator
251261

@@ -262,7 +272,9 @@ Absolute character range in the string, corresponding to the glyph. Setting this
262272
- |void| **set_relative_index**\ (\ value\: :ref:`int<class_int>`\ )
263273
- :ref:`int<class_int>` **get_relative_index**\ (\ )
264274

265-
The character offset of the glyph, relative to the current :ref:`RichTextEffect<class_RichTextEffect>` custom block. Setting this property won't affect drawing.
275+
The character offset of the glyph, relative to the current :ref:`RichTextEffect<class_RichTextEffect>` custom block.
276+
277+
\ **Note:** Read-only. Setting this property won't affect drawing.
266278

267279
.. rst-class:: classref-item-separator
268280

classes/class_editorexportplatformios.rst

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ Properties
5050
+---------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
5151
| :ref:`bool<class_bool>` | :ref:`application/export_project_only<class_EditorExportPlatformIOS_property_application/export_project_only>` |
5252
+---------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
53-
| :ref:`bool<class_bool>` | :ref:`application/generate_simulator_library_if_missing<class_EditorExportPlatformIOS_property_application/generate_simulator_library_if_missing>` |
54-
+---------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
5553
| :ref:`int<class_int>` | :ref:`application/icon_interpolation<class_EditorExportPlatformIOS_property_application/icon_interpolation>` |
5654
+---------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
5755
| :ref:`String<class_String>` | :ref:`application/min_ios_version<class_EditorExportPlatformIOS_property_application/min_ios_version>` |
@@ -639,18 +637,6 @@ If ``true``, exports iOS project files without building an XCArchive or ``.ipa``
639637

640638
----
641639

642-
.. _class_EditorExportPlatformIOS_property_application/generate_simulator_library_if_missing:
643-
644-
.. rst-class:: classref-property
645-
646-
:ref:`bool<class_bool>` **application/generate_simulator_library_if_missing** :ref:`🔗<class_EditorExportPlatformIOS_property_application/generate_simulator_library_if_missing>`
647-
648-
If ``true``, and ARM64 simulator library is missing from the export template, it is automatically generated from ARM64 device library.
649-
650-
.. rst-class:: classref-item-separator
651-
652-
----
653-
654640
.. _class_EditorExportPlatformIOS_property_application/icon_interpolation:
655641

656642
.. rst-class:: classref-property

classes/class_editorsettings.rst

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3027,10 +3027,37 @@ Port used for file server when exporting project with remote file system.
30273027

30283028
:ref:`String<class_String>` **filesystem/import/blender/blender_path** :ref:`🔗<class_EditorSettings_property_filesystem/import/blender/blender_path>`
30293029

3030-
The path to the directory containing the Blender executable used for converting the Blender 3D scene files ``.blend`` to glTF 2.0 format during import. Blender 3.0 or later is required.
3030+
The path to the Blender executable used for converting the Blender 3D scene files ``.blend`` to glTF 2.0 format during import. Blender 3.0 or later is required.
30313031

30323032
To enable this feature for your specific project, use :ref:`ProjectSettings.filesystem/import/blender/enabled<class_ProjectSettings_property_filesystem/import/blender/enabled>`.
30333033

3034+
If this setting is empty, Blender's default paths will be detected and used automatically if present in this order:
3035+
3036+
\ **Windows:**\
3037+
3038+
::
3039+
3040+
- C:\Program Files\Blender Foundation\blender.exe
3041+
- C:\Program Files (x86)\Blender Foundation\blender.exe
3042+
3043+
\ **macOS:**\
3044+
3045+
::
3046+
3047+
- /opt/homebrew/bin/blender
3048+
- /opt/local/bin/blender
3049+
- /usr/local/bin/blender
3050+
- /usr/local/opt/blender
3051+
- /Applications/Blender.app/Contents/MacOS/Blender
3052+
3053+
\ **Linux/\*BSD:**\
3054+
3055+
::
3056+
3057+
- /usr/bin/blender
3058+
- /usr/local/bin/blender
3059+
- /opt/blender/bin/blender
3060+
30343061
.. rst-class:: classref-item-separator
30353062

30363063
----

classes/class_fileaccess.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ Returns ``true``, if file ``hidden`` attribute is set.
742742

743743
:ref:`int<class_int>` **get_length**\ (\ ) |const| :ref:`🔗<class_FileAccess_method_get_length>`
744744

745-
Returns the size of the file in bytes.
745+
Returns the size of the file in bytes. For a pipe, returns the number of bytes available for reading from the pipe.
746746

747747
.. rst-class:: classref-item-separator
748748

classes/class_gpuparticlescollisionheightfield3d.rst

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,29 @@ Properties
4040
+-----------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+----------------------+
4141
| :ref:`bool<class_bool>` | :ref:`follow_camera_enabled<class_GPUParticlesCollisionHeightField3D_property_follow_camera_enabled>` | ``false`` |
4242
+-----------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+----------------------+
43+
| :ref:`int<class_int>` | :ref:`heightfield_mask<class_GPUParticlesCollisionHeightField3D_property_heightfield_mask>` | ``1048575`` |
44+
+-----------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+----------------------+
4345
| :ref:`Resolution<enum_GPUParticlesCollisionHeightField3D_Resolution>` | :ref:`resolution<class_GPUParticlesCollisionHeightField3D_property_resolution>` | ``2`` |
4446
+-----------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+----------------------+
4547
| :ref:`Vector3<class_Vector3>` | :ref:`size<class_GPUParticlesCollisionHeightField3D_property_size>` | ``Vector3(2, 2, 2)`` |
4648
+-----------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+----------------------+
4749
| :ref:`UpdateMode<enum_GPUParticlesCollisionHeightField3D_UpdateMode>` | :ref:`update_mode<class_GPUParticlesCollisionHeightField3D_property_update_mode>` | ``0`` |
4850
+-----------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+----------------------+
4951

52+
.. rst-class:: classref-reftable-group
53+
54+
Methods
55+
-------
56+
57+
.. table::
58+
:widths: auto
59+
60+
+-------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
61+
| :ref:`bool<class_bool>` | :ref:`get_heightfield_mask_value<class_GPUParticlesCollisionHeightField3D_method_get_heightfield_mask_value>`\ (\ layer_number\: :ref:`int<class_int>`\ ) |const| |
62+
+-------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
63+
| |void| | :ref:`set_heightfield_mask_value<class_GPUParticlesCollisionHeightField3D_method_set_heightfield_mask_value>`\ (\ layer_number\: :ref:`int<class_int>`, value\: :ref:`bool<class_bool>`\ ) |
64+
+-------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
65+
5066
.. rst-class:: classref-section-separator
5167

5268
----
@@ -172,6 +188,27 @@ Following the camera has a performance cost, as it will force the heightmap to u
172188

173189
----
174190

191+
.. _class_GPUParticlesCollisionHeightField3D_property_heightfield_mask:
192+
193+
.. rst-class:: classref-property
194+
195+
:ref:`int<class_int>` **heightfield_mask** = ``1048575`` :ref:`🔗<class_GPUParticlesCollisionHeightField3D_property_heightfield_mask>`
196+
197+
.. rst-class:: classref-property-setget
198+
199+
- |void| **set_heightfield_mask**\ (\ value\: :ref:`int<class_int>`\ )
200+
- :ref:`int<class_int>` **get_heightfield_mask**\ (\ )
201+
202+
The visual layers to account for when updating the heightmap. Only :ref:`MeshInstance3D<class_MeshInstance3D>`\ s whose :ref:`VisualInstance3D.layers<class_VisualInstance3D_property_layers>` match with this :ref:`heightfield_mask<class_GPUParticlesCollisionHeightField3D_property_heightfield_mask>` will be included in the heightmap collision update. By default, all 20 user-visible layers are taken into account for updating the heightmap collision.
203+
204+
\ **Note:** Since the :ref:`heightfield_mask<class_GPUParticlesCollisionHeightField3D_property_heightfield_mask>` allows for 32 layers to be stored in total, there are an additional 12 layers that are only used internally by the engine and aren't exposed in the editor. Setting :ref:`heightfield_mask<class_GPUParticlesCollisionHeightField3D_property_heightfield_mask>` using a script allows you to toggle those reserved layers, which can be useful for editor plugins.
205+
206+
To adjust :ref:`heightfield_mask<class_GPUParticlesCollisionHeightField3D_property_heightfield_mask>` more easily using a script, use :ref:`get_heightfield_mask_value<class_GPUParticlesCollisionHeightField3D_method_get_heightfield_mask_value>` and :ref:`set_heightfield_mask_value<class_GPUParticlesCollisionHeightField3D_method_set_heightfield_mask_value>`.
207+
208+
.. rst-class:: classref-item-separator
209+
210+
----
211+
175212
.. _class_GPUParticlesCollisionHeightField3D_property_resolution:
176213

177214
.. rst-class:: classref-property
@@ -219,6 +256,35 @@ The collision heightmap's size in 3D units. To improve heightmap quality, :ref:`
219256

220257
The update policy to use for the generated heightmap.
221258

259+
.. rst-class:: classref-section-separator
260+
261+
----
262+
263+
.. rst-class:: classref-descriptions-group
264+
265+
Method Descriptions
266+
-------------------
267+
268+
.. _class_GPUParticlesCollisionHeightField3D_method_get_heightfield_mask_value:
269+
270+
.. rst-class:: classref-method
271+
272+
:ref:`bool<class_bool>` **get_heightfield_mask_value**\ (\ layer_number\: :ref:`int<class_int>`\ ) |const| :ref:`🔗<class_GPUParticlesCollisionHeightField3D_method_get_heightfield_mask_value>`
273+
274+
Returns ``true`` if the specified layer of the :ref:`heightfield_mask<class_GPUParticlesCollisionHeightField3D_property_heightfield_mask>` is enabled, given a ``layer_number`` between ``1`` and ``20``, inclusive.
275+
276+
.. rst-class:: classref-item-separator
277+
278+
----
279+
280+
.. _class_GPUParticlesCollisionHeightField3D_method_set_heightfield_mask_value:
281+
282+
.. rst-class:: classref-method
283+
284+
|void| **set_heightfield_mask_value**\ (\ layer_number\: :ref:`int<class_int>`, value\: :ref:`bool<class_bool>`\ ) :ref:`🔗<class_GPUParticlesCollisionHeightField3D_method_set_heightfield_mask_value>`
285+
286+
Based on ``value``, enables or disables the specified layer in the :ref:`heightfield_mask<class_GPUParticlesCollisionHeightField3D_property_heightfield_mask>`, given a ``layer_number`` between ``1`` and ``20``, inclusive.
287+
222288
.. |virtual| replace:: :abbr:`virtual (This method should typically be overridden by the user to have any effect.)`
223289
.. |const| replace:: :abbr:`const (This method has no side effects. It doesn't modify any of the instance's member variables.)`
224290
.. |vararg| replace:: :abbr:`vararg (This method accepts any number of arguments after the ones described here.)`

classes/class_javascriptbridge.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ Method Descriptions
9494

9595
Creates a reference to a :ref:`Callable<class_Callable>` that can be used as a callback by JavaScript. The reference must be kept until the callback happens, or it won't be called at all. See :ref:`JavaScriptObject<class_JavaScriptObject>` for usage.
9696

97+
\ **Note:** The callback function must take exactly one :ref:`Array<class_Array>` argument, which is going to be the JavaScript `arguments object <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/arguments>`__ converted to an array.
98+
9799
.. rst-class:: classref-item-separator
98100

99101
----

classes/class_node3d.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,10 @@ Returns whether the node notifies about its global and local transformation chan
784784

785785
Returns ``true`` if the node is present in the :ref:`SceneTree<class_SceneTree>`, its :ref:`visible<class_Node3D_property_visible>` property is ``true`` and all its ancestors are also visible. If any ancestor is hidden, this node will not be visible in the scene tree.
786786

787+
Visibility is checked only in parent nodes that inherit from **Node3D**. If the parent is of any other type (such as :ref:`Node<class_Node>`, :ref:`AnimationPlayer<class_AnimationPlayer>`, or :ref:`Node2D<class_Node2D>`), it is assumed to be visible.
788+
789+
\ **Note:** This method does not take :ref:`VisualInstance3D.layers<class_VisualInstance3D_property_layers>` into account, so even if this method returns ``true``, the node might end up not being rendered.
790+
787791
.. rst-class:: classref-item-separator
788792

789793
----

classes/class_packedstringarray.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ Sorts the elements of the array in ascending order.
440440

441441
:ref:`PackedByteArray<class_PackedByteArray>` **to_byte_array**\ (\ ) |const| :ref:`🔗<class_PackedStringArray_method_to_byte_array>`
442442

443-
Returns a :ref:`PackedByteArray<class_PackedByteArray>` with each string encoded as bytes.
443+
Returns a :ref:`PackedByteArray<class_PackedByteArray>` with each string encoded as UTF-8. Strings are ``null`` terminated.
444444

445445
.. rst-class:: classref-section-separator
446446

0 commit comments

Comments
 (0)