Skip to content

Commit b0d8ae2

Browse files
authored
Merge pull request #11229 from godotengine/classref/sync-3defc85
classref: Sync with current master branch (3defc85)
2 parents a1632ef + 0588ed7 commit b0d8ae2

14 files changed

+71
-53
lines changed

β€Žclasses/class_astar2d.rstβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ Returns an array with the points that are in the path found by AStar2D between t
477477

478478
If there is no valid path to the target, and ``allow_partial_path`` is ``true``, returns a path to the point closest to the target that can be reached.
479479

480-
\ **Note:** This method is not thread-safe. If called from a :ref:`Thread<class_Thread>`, it will return an empty array and will print an error message.
480+
\ **Note:** This method is not thread-safe; it can only be used from a single :ref:`Thread<class_Thread>` at a given time. Consider using :ref:`Mutex<class_Mutex>` to ensure exclusive access to one thread to avoid race conditions.
481481

482482
Additionally, when ``allow_partial_path`` is ``true`` and ``to_id`` is disabled the search may take an unusually long time to finish.
483483

β€Žclasses/class_astar3d.rstβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ Returns an array with the points that are in the path found by AStar3D between t
519519

520520
If there is no valid path to the target, and ``allow_partial_path`` is ``true``, returns a path to the point closest to the target that can be reached.
521521

522-
\ **Note:** This method is not thread-safe. If called from a :ref:`Thread<class_Thread>`, it will return an empty array and will print an error message.
522+
\ **Note:** This method is not thread-safe; it can only be used from a single :ref:`Thread<class_Thread>` at a given time. Consider using :ref:`Mutex<class_Mutex>` to ensure exclusive access to one thread to avoid race conditions.
523523

524524
Additionally, when ``allow_partial_path`` is ``true`` and ``to_id`` is disabled the search may take an unusually long time to finish.
525525

β€Žclasses/class_astargrid2d.rstβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ Returns an array with the points that are in the path found by **AStarGrid2D** b
580580

581581
If there is no valid path to the target, and ``allow_partial_path`` is ``true``, returns a path to the point closest to the target that can be reached.
582582

583-
\ **Note:** This method is not thread-safe. If called from a :ref:`Thread<class_Thread>`, it will return an empty array and will print an error message.
583+
\ **Note:** This method is not thread-safe; it can only be used from a single :ref:`Thread<class_Thread>` at a given time. Consider using :ref:`Mutex<class_Mutex>` to ensure exclusive access to one thread to avoid race conditions.
584584

585585
Additionally, when ``allow_partial_path`` is ``true`` and ``to_id`` is solid the search may take an unusually long time to finish.
586586

β€Žclasses/class_control.rstβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,7 @@ Right-to-left layout direction.
11341134

11351135
:ref:`LayoutDirection<enum_Control_LayoutDirection>` **LAYOUT_DIRECTION_SYSTEM_LOCALE** = ``4``
11361136

1137-
Automatic layout direction, determined from the system locale. Right-to-left layout direction is automatically used for languages that require it such as Arabic and Hebrew, but only if a valid translation file is loaded for the given language.. For all other languages (or if no valid translation file is found by Godot), left-to-right layout direction is used. If using :ref:`TextServerFallback<class_TextServerFallback>` (:ref:`ProjectSettings.internationalization/rendering/text_driver<class_ProjectSettings_property_internationalization/rendering/text_driver>`), left-to-right layout direction is always used regardless of the language.
1137+
Automatic layout direction, determined from the system locale. Right-to-left layout direction is automatically used for languages that require it such as Arabic and Hebrew, but only if a valid translation file is loaded for the given language. For all other languages (or if no valid translation file is found by Godot), left-to-right layout direction is used. If using :ref:`TextServerFallback<class_TextServerFallback>` (:ref:`ProjectSettings.internationalization/rendering/text_driver<class_ProjectSettings_property_internationalization/rendering/text_driver>`), left-to-right layout direction is always used regardless of the language.
11381138

11391139
.. _class_Control_constant_LAYOUT_DIRECTION_MAX:
11401140

β€Žclasses/class_displayserver.rstβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -808,15 +808,15 @@ The display server supports initiating window drag and resize operations on dema
808808

809809
:ref:`Feature<enum_DisplayServer_Feature>` **FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE** = ``28``
810810

811-
Display server supports :ref:`WINDOW_FLAG_EXCLUDE_FROM_CAPTURE<class_DisplayServer_constant_WINDOW_FLAG_EXCLUDE_FROM_CAPTURE>` window flag.
811+
Display server supports :ref:`WINDOW_FLAG_EXCLUDE_FROM_CAPTURE<class_DisplayServer_constant_WINDOW_FLAG_EXCLUDE_FROM_CAPTURE>` window flag. **Windows, macOS**
812812

813813
.. _class_DisplayServer_constant_FEATURE_WINDOW_EMBEDDING:
814814

815815
.. rst-class:: classref-enumeration-constant
816816

817817
:ref:`Feature<enum_DisplayServer_Feature>` **FEATURE_WINDOW_EMBEDDING** = ``29``
818818

819-
Display server supports embedding a window from another process. **Windows, Linux (X11)**
819+
Display server supports embedding a window from another process. **Windows, Linux (X11), macOS**
820820

821821
.. _class_DisplayServer_constant_FEATURE_NATIVE_DIALOG_FILE_MIME:
822822

@@ -2272,7 +2272,7 @@ Window style is overridden, forcing sharp corners.
22722272

22732273
Window is excluded from screenshots taken by :ref:`screen_get_image()<class_DisplayServer_method_screen_get_image>`, :ref:`screen_get_image_rect()<class_DisplayServer_method_screen_get_image_rect>`, and :ref:`screen_get_pixel()<class_DisplayServer_method_screen_get_pixel>`.
22742274

2275-
\ **Note:** This flag is implemented on macOS and Windows.
2275+
\ **Note:** This flag is implemented on macOS and Windows (10, 20H1).
22762276

22772277
\ **Note:** Setting this flag will prevent standard screenshot methods from capturing a window image, but does **NOT** guarantee that other apps won't be able to capture an image. It should not be used as a DRM or security measure.
22782278

β€Žclasses/class_svgtexture.rstβ€Ž renamed to β€Žclasses/class_dpitexture.rstβ€Ž

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@
33
.. DO NOT EDIT THIS FILE!!!
44
.. Generated automatically from Godot engine sources.
55
.. Generator: https://github.com/godotengine/godot/tree/master/doc/tools/make_rst.py.
6-
.. XML source: https://github.com/godotengine/godot/tree/master/doc/classes/SVGTexture.xml.
6+
.. XML source: https://github.com/godotengine/godot/tree/master/doc/classes/DPITexture.xml.
77
8-
.. _class_SVGTexture:
8+
.. _class_DPITexture:
99

10-
SVGTexture
10+
DPITexture
1111
==========
1212

13+
**Experimental:** This class may be changed or removed in future versions.
14+
1315
**Inherits:** :ref:`Texture2D<class_Texture2D>` **<** :ref:`Texture<class_Texture>` **<** :ref:`Resource<class_Resource>` **<** :ref:`RefCounted<class_RefCounted>` **<** :ref:`Object<class_Object>`
1416

15-
A scalable :ref:`Texture2D<class_Texture2D>` based on an SVG image.
17+
An automatically scalable :ref:`Texture2D<class_Texture2D>` based on an SVG image.
1618

1719
.. rst-class:: classref-introduction-group
1820

1921
Description
2022
-----------
2123

22-
A scalable :ref:`Texture2D<class_Texture2D>` based on an SVG image. **SVGTexture**\ s are automatically re-rasterized to match font oversampling.
24+
An automatically scalable :ref:`Texture2D<class_Texture2D>` based on an SVG image. **DPITexture**\ s are used to automatically re-rasterize icons and other texture based UI theme elements to match viewport scale and font oversampling. See also :ref:`ProjectSettings.display/window/stretch/mode<class_ProjectSettings_property_display/window/stretch/mode>` ("canvas_items" mode) and :ref:`Viewport.oversampling_override<class_Viewport_property_oversampling_override>`.
2325

2426
.. rst-class:: classref-reftable-group
2527

@@ -30,13 +32,13 @@ Properties
3032
:widths: auto
3133

3234
+-------------------------------------+---------------------------------------------------------+----------------------------------------------------------------------------------------+
33-
| :ref:`float<class_float>` | :ref:`base_scale<class_SVGTexture_property_base_scale>` | ``1.0`` |
35+
| :ref:`float<class_float>` | :ref:`base_scale<class_DPITexture_property_base_scale>` | ``1.0`` |
3436
+-------------------------------------+---------------------------------------------------------+----------------------------------------------------------------------------------------+
35-
| :ref:`Dictionary<class_Dictionary>` | :ref:`color_map<class_SVGTexture_property_color_map>` | ``{}`` |
37+
| :ref:`Dictionary<class_Dictionary>` | :ref:`color_map<class_DPITexture_property_color_map>` | ``{}`` |
3638
+-------------------------------------+---------------------------------------------------------+----------------------------------------------------------------------------------------+
3739
| :ref:`bool<class_bool>` | resource_local_to_scene | ``false`` (overrides :ref:`Resource<class_Resource_property_resource_local_to_scene>`) |
3840
+-------------------------------------+---------------------------------------------------------+----------------------------------------------------------------------------------------+
39-
| :ref:`float<class_float>` | :ref:`saturation<class_SVGTexture_property_saturation>` | ``1.0`` |
41+
| :ref:`float<class_float>` | :ref:`saturation<class_DPITexture_property_saturation>` | ``1.0`` |
4042
+-------------------------------------+---------------------------------------------------------+----------------------------------------------------------------------------------------+
4143

4244
.. rst-class:: classref-reftable-group
@@ -48,15 +50,15 @@ Methods
4850
:widths: auto
4951

5052
+-------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
51-
| :ref:`SVGTexture<class_SVGTexture>` | :ref:`create_from_string<class_SVGTexture_method_create_from_string>`\ (\ source\: :ref:`String<class_String>`, scale\: :ref:`float<class_float>` = 1.0, saturation\: :ref:`float<class_float>` = 1.0, color_map\: :ref:`Dictionary<class_Dictionary>` = {}\ ) |static| |
53+
| :ref:`DPITexture<class_DPITexture>` | :ref:`create_from_string<class_DPITexture_method_create_from_string>`\ (\ source\: :ref:`String<class_String>`, scale\: :ref:`float<class_float>` = 1.0, saturation\: :ref:`float<class_float>` = 1.0, color_map\: :ref:`Dictionary<class_Dictionary>` = {}\ ) |static| |
5254
+-------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
53-
| :ref:`RID<class_RID>` | :ref:`get_scaled_rid<class_SVGTexture_method_get_scaled_rid>`\ (\ ) |const| |
55+
| :ref:`RID<class_RID>` | :ref:`get_scaled_rid<class_DPITexture_method_get_scaled_rid>`\ (\ ) |const| |
5456
+-------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
55-
| :ref:`String<class_String>` | :ref:`get_source<class_SVGTexture_method_get_source>`\ (\ ) |const| |
57+
| :ref:`String<class_String>` | :ref:`get_source<class_DPITexture_method_get_source>`\ (\ ) |const| |
5658
+-------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
57-
| |void| | :ref:`set_size_override<class_SVGTexture_method_set_size_override>`\ (\ size\: :ref:`Vector2i<class_Vector2i>`\ ) |
59+
| |void| | :ref:`set_size_override<class_DPITexture_method_set_size_override>`\ (\ size\: :ref:`Vector2i<class_Vector2i>`\ ) |
5860
+-------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
59-
| |void| | :ref:`set_source<class_SVGTexture_method_set_source>`\ (\ source\: :ref:`String<class_String>`\ ) |
61+
| |void| | :ref:`set_source<class_DPITexture_method_set_source>`\ (\ source\: :ref:`String<class_String>`\ ) |
6062
+-------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
6163

6264
.. rst-class:: classref-section-separator
@@ -68,45 +70,45 @@ Methods
6870
Property Descriptions
6971
---------------------
7072

71-
.. _class_SVGTexture_property_base_scale:
73+
.. _class_DPITexture_property_base_scale:
7274

7375
.. rst-class:: classref-property
7476

75-
:ref:`float<class_float>` **base_scale** = ``1.0`` :ref:`πŸ”—<class_SVGTexture_property_base_scale>`
77+
:ref:`float<class_float>` **base_scale** = ``1.0`` :ref:`πŸ”—<class_DPITexture_property_base_scale>`
7678

7779
.. rst-class:: classref-property-setget
7880

7981
- |void| **set_base_scale**\ (\ value\: :ref:`float<class_float>`\ )
8082
- :ref:`float<class_float>` **get_base_scale**\ (\ )
8183

82-
SVG texture scale. ``1.0`` is the original SVG size. Higher values result in a larger image.
84+
Texture scale. ``1.0`` is the original SVG size. Higher values result in a larger image.
8385

8486
.. rst-class:: classref-item-separator
8587

8688
----
8789

88-
.. _class_SVGTexture_property_color_map:
90+
.. _class_DPITexture_property_color_map:
8991

9092
.. rst-class:: classref-property
9193

92-
:ref:`Dictionary<class_Dictionary>` **color_map** = ``{}`` :ref:`πŸ”—<class_SVGTexture_property_color_map>`
94+
:ref:`Dictionary<class_Dictionary>` **color_map** = ``{}`` :ref:`πŸ”—<class_DPITexture_property_color_map>`
9395

9496
.. rst-class:: classref-property-setget
9597

9698
- |void| **set_color_map**\ (\ value\: :ref:`Dictionary<class_Dictionary>`\ )
9799
- :ref:`Dictionary<class_Dictionary>` **get_color_map**\ (\ )
98100

99-
If set, remaps SVG texture colors according to :ref:`Color<class_Color>`-:ref:`Color<class_Color>` map.
101+
If set, remaps texture colors according to :ref:`Color<class_Color>`-:ref:`Color<class_Color>` map.
100102

101103
.. rst-class:: classref-item-separator
102104

103105
----
104106

105-
.. _class_SVGTexture_property_saturation:
107+
.. _class_DPITexture_property_saturation:
106108

107109
.. rst-class:: classref-property
108110

109-
:ref:`float<class_float>` **saturation** = ``1.0`` :ref:`πŸ”—<class_SVGTexture_property_saturation>`
111+
:ref:`float<class_float>` **saturation** = ``1.0`` :ref:`πŸ”—<class_DPITexture_property_saturation>`
110112

111113
.. rst-class:: classref-property-setget
112114

@@ -124,59 +126,59 @@ Overrides texture saturation.
124126
Method Descriptions
125127
-------------------
126128

127-
.. _class_SVGTexture_method_create_from_string:
129+
.. _class_DPITexture_method_create_from_string:
128130

129131
.. rst-class:: classref-method
130132

131-
:ref:`SVGTexture<class_SVGTexture>` **create_from_string**\ (\ source\: :ref:`String<class_String>`, scale\: :ref:`float<class_float>` = 1.0, saturation\: :ref:`float<class_float>` = 1.0, color_map\: :ref:`Dictionary<class_Dictionary>` = {}\ ) |static| :ref:`πŸ”—<class_SVGTexture_method_create_from_string>`
133+
:ref:`DPITexture<class_DPITexture>` **create_from_string**\ (\ source\: :ref:`String<class_String>`, scale\: :ref:`float<class_float>` = 1.0, saturation\: :ref:`float<class_float>` = 1.0, color_map\: :ref:`Dictionary<class_Dictionary>` = {}\ ) |static| :ref:`πŸ”—<class_DPITexture_method_create_from_string>`
132134

133-
Creates a new **SVGTexture** and initializes it by allocating and setting the SVG data from string.
135+
Creates a new **DPITexture** and initializes it by allocating and setting the SVG data from string.
134136

135137
.. rst-class:: classref-item-separator
136138

137139
----
138140

139-
.. _class_SVGTexture_method_get_scaled_rid:
141+
.. _class_DPITexture_method_get_scaled_rid:
140142

141143
.. rst-class:: classref-method
142144

143-
:ref:`RID<class_RID>` **get_scaled_rid**\ (\ ) |const| :ref:`πŸ”—<class_SVGTexture_method_get_scaled_rid>`
145+
:ref:`RID<class_RID>` **get_scaled_rid**\ (\ ) |const| :ref:`πŸ”—<class_DPITexture_method_get_scaled_rid>`
144146

145147
Returns the :ref:`RID<class_RID>` of the texture rasterized to match the oversampling of the currently drawn canvas item.
146148

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

149151
----
150152

151-
.. _class_SVGTexture_method_get_source:
153+
.. _class_DPITexture_method_get_source:
152154

153155
.. rst-class:: classref-method
154156

155-
:ref:`String<class_String>` **get_source**\ (\ ) |const| :ref:`πŸ”—<class_SVGTexture_method_get_source>`
157+
:ref:`String<class_String>` **get_source**\ (\ ) |const| :ref:`πŸ”—<class_DPITexture_method_get_source>`
156158

157159
Returns SVG source code.
158160

159161
.. rst-class:: classref-item-separator
160162

161163
----
162164

163-
.. _class_SVGTexture_method_set_size_override:
165+
.. _class_DPITexture_method_set_size_override:
164166

165167
.. rst-class:: classref-method
166168

167-
|void| **set_size_override**\ (\ size\: :ref:`Vector2i<class_Vector2i>`\ ) :ref:`πŸ”—<class_SVGTexture_method_set_size_override>`
169+
|void| **set_size_override**\ (\ size\: :ref:`Vector2i<class_Vector2i>`\ ) :ref:`πŸ”—<class_DPITexture_method_set_size_override>`
168170

169171
Resizes the texture to the specified dimensions.
170172

171173
.. rst-class:: classref-item-separator
172174

173175
----
174176

175-
.. _class_SVGTexture_method_set_source:
177+
.. _class_DPITexture_method_set_source:
176178

177179
.. rst-class:: classref-method
178180

179-
|void| **set_source**\ (\ source\: :ref:`String<class_String>`\ ) :ref:`πŸ”—<class_SVGTexture_method_set_source>`
181+
|void| **set_source**\ (\ source\: :ref:`String<class_String>`\ ) :ref:`πŸ”—<class_DPITexture_method_set_source>`
180182

181183
Sets SVG source code.
182184

0 commit comments

Comments
Β (0)