diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b53fd3cc72..e253c0bab72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -640,7 +640,7 @@ See the [release announcement](https://godotengine.org/article/maintenance-relea #### Editor -- Fix cancelling selection while gizmo editing making uncommitted changes ([GH-71156](https://github.com/godotengine/godot/pull/71156)). +- Fix canceling selection while gizmo editing making uncommitted changes ([GH-71156](https://github.com/godotengine/godot/pull/71156)). - Fix `EditorUndoRedoManager`'s handling of `MERGE_ENDS` ([GH-74460](https://github.com/godotengine/godot/pull/74460)). - Fix built-in scripts missing their methods on signal connection ([GH-74495](https://github.com/godotengine/godot/pull/74495)). - Fix "Download Project Source" for the Web Editor ([GH-75194](https://github.com/godotengine/godot/pull/75194)). @@ -1778,7 +1778,7 @@ See the [release announcement](https://godotengine.org/article/godot-3-4-is-rele - Fix reloading `tool` scripts in the editor ([GH-52883](https://github.com/godotengine/godot/pull/52883)). - Fix C# bindings generator for default value types ([GH-49702](https://github.com/godotengine/godot/pull/49702)). - Ignore paths with invalid chars in `PathWhich` ([GH-50918](https://github.com/godotengine/godot/pull/50918)). -- Fix `List` marshalling ([GH-53628](https://github.com/godotengine/godot/pull/53628)). +- Fix `List` marshaling ([GH-53628](https://github.com/godotengine/godot/pull/53628)). - Fix `hint_string` for enum arrays ([GH-53638](https://github.com/godotengine/godot/pull/53638)). - Keep order for C# exported members ([GH-54199](https://github.com/godotengine/godot/pull/54199)). @@ -2142,7 +2142,7 @@ See the [release announcement](https://godotengine.org/article/godot-3-3-has-arr #### Mono (C#) - [Fix targeting .NETFramework with .NET 5](https://github.com/godotengine/godot/pull/44135). -- [Fix System.Collections.Generic.List marshalling](https://github.com/godotengine/godot/pull/45029). +- [Fix System.Collections.Generic.List marshaling](https://github.com/godotengine/godot/pull/45029). - [Fix support for Unicode identifiers](https://github.com/godotengine/godot/pull/45310). - [Fixes to Mono on WebAssembly](https://github.com/godotengine/godot/pull/44374). diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index a0c7f9d2ecd..5062c3d97e7 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -839,7 +839,7 @@ Error ProjectSettings::_save_settings_binary(const String &p_file, const RBMapstore_32(count + 1); - //store how many properties are saved, add one for custom featuers, which must always go first + //store how many properties are saved, add one for custom features, which must always go first String key = CoreStringNames::get_singleton()->_custom_features; file->store_pascal_string(key); diff --git a/core/core_builders.py b/core/core_builders.py index b0a3b85d58c..e40ebbb14d4 100644 --- a/core/core_builders.py +++ b/core/core_builders.py @@ -239,7 +239,6 @@ def make_license_header(target, source, env): data_list += part["Copyright"] with open(dst, "w", encoding="utf-8") as f: - f.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") f.write("#ifndef LICENSE_GEN_H\n") f.write("#define LICENSE_GEN_H\n") diff --git a/core/math/delaunay_3d.h b/core/math/delaunay_3d.h index 55923e01332..b4f412152e7 100644 --- a/core/math/delaunay_3d.h +++ b/core/math/delaunay_3d.h @@ -141,7 +141,7 @@ class Delaunay3D { //Compute the determinant of said matrix R128 determinant = row1_x * (row2_y * row3_z - row3_y * row2_z) - row2_x * (row1_y * row3_z - row3_y * row1_z) + row3_x * (row1_y * row2_z - row2_y * row1_z); - // Compute the volume of the tetrahedron, and precompute a scalar quantity for re-use in the formula + // Compute the volume of the tetrahedron, and precompute a scalar quantity for reuse in the formula R128 volume = determinant / R128(6.f); R128 i12volume = R128(1.f) / (volume * R128(12.f)); diff --git a/core/object/make_virtuals.py b/core/object/make_virtuals.py index 18f27ae4a4a..5be9650b324 100644 --- a/core/object/make_virtuals.py +++ b/core/object/make_virtuals.py @@ -154,7 +154,6 @@ def generate_version(argcount, const=False, returns=False): def run(target, source, env): - max_versions = 12 txt = """ @@ -165,7 +164,6 @@ def run(target, source, env): """ for i in range(max_versions + 1): - txt += "/* " + str(i) + " Arguments */\n\n" txt += generate_version(i, False, False) txt += generate_version(i, False, True) diff --git a/doc/classes/BaseMaterial3D.xml b/doc/classes/BaseMaterial3D.xml index c42b796fc3e..f9411a4d764 100644 --- a/doc/classes/BaseMaterial3D.xml +++ b/doc/classes/BaseMaterial3D.xml @@ -88,7 +88,7 @@ The strength of the anisotropy effect. This is multiplied by [member anisotropy_flowmap]'s alpha channel if a texture is defined there and the texture contains an alpha channel. - If [code]true[/code], anisotropy is enabled. Anisotropy changes the shape of the specular blob and aligns it to tangent space. This is useful for brushed aluminium and hair reflections. + If [code]true[/code], anisotropy is enabled. Anisotropy changes the shape of the specular blob and aligns it to tangent space. This is useful for brushed aluminum and hair reflections. [b]Note:[/b] Mesh tangents are needed for anisotropy to work. If the mesh does not contain tangents, the anisotropy effect will appear broken. [b]Note:[/b] Material anisotropy should not to be confused with anisotropic texture filtering, which can be enabled by setting [member texture_filter] to [constant TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC]. diff --git a/doc/classes/Curve.xml b/doc/classes/Curve.xml index eec74380108..319109043e3 100644 --- a/doc/classes/Curve.xml +++ b/doc/classes/Curve.xml @@ -4,7 +4,7 @@ A mathematic curve. - A curve that can be saved and re-used for other objects. By default, it ranges between [code]0[/code] and [code]1[/code] on the Y axis and positions points relative to the [code]0.5[/code] Y position. + A curve that can be saved and reused for other objects. By default, it ranges between [code]0[/code] and [code]1[/code] on the Y axis and positions points relative to the [code]0.5[/code] Y position. See also [Gradient] which is designed for color interpolation. See also [Curve2D] and [Curve3D]. diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml index a30f7c1417d..c42c74980d6 100644 --- a/doc/classes/DisplayServer.xml +++ b/doc/classes/DisplayServer.xml @@ -1753,16 +1753,16 @@ [b]Note:[/b] This flag is implemented on macOS. - No vertical synchronization, which means the engine will display frames as fast as possible (tearing may be visible). Framerate is unlimited (nonwithstanding [member Engine.max_fps]). + No vertical synchronization, which means the engine will display frames as fast as possible (tearing may be visible). Framerate is unlimited (notwithstanding [member Engine.max_fps]). - Default vertical synchronization mode, the image is displayed only on vertical blanking intervals (no tearing is visible). Framerate is limited by the monitor refresh rate (nonwithstanding [member Engine.max_fps]). + Default vertical synchronization mode, the image is displayed only on vertical blanking intervals (no tearing is visible). Framerate is limited by the monitor refresh rate (notwithstanding [member Engine.max_fps]). - Behaves like [constant VSYNC_DISABLED] when the framerate drops below the screen's refresh rate to reduce stuttering (tearing may be visible). Otherwise, vertical synchronization is enabled to avoid tearing. Framerate is limited by the monitor refresh rate (nonwithstanding [member Engine.max_fps]). Behaves like [constant VSYNC_ENABLED] when using the Compatibility rendering method. + Behaves like [constant VSYNC_DISABLED] when the framerate drops below the screen's refresh rate to reduce stuttering (tearing may be visible). Otherwise, vertical synchronization is enabled to avoid tearing. Framerate is limited by the monitor refresh rate (notwithstanding [member Engine.max_fps]). Behaves like [constant VSYNC_ENABLED] when using the Compatibility rendering method. - Displays the most recent image in the queue on vertical blanking intervals, while rendering to the other images (no tearing is visible). Framerate is unlimited (nonwithstanding [member Engine.max_fps]). + Displays the most recent image in the queue on vertical blanking intervals, while rendering to the other images (no tearing is visible). Framerate is unlimited (notwithstanding [member Engine.max_fps]). Although not guaranteed, the images can be rendered as fast as possible, which may reduce input lag (also called "Fast" V-Sync mode). [constant VSYNC_MAILBOX] works best when at least twice as many frames as the display refresh rate are rendered. Behaves like [constant VSYNC_ENABLED] when using the Compatibility rendering method. diff --git a/doc/classes/EditorVCSInterface.xml b/doc/classes/EditorVCSInterface.xml index c30ed7ccd9e..ff96e5928db 100644 --- a/doc/classes/EditorVCSInterface.xml +++ b/doc/classes/EditorVCSInterface.xml @@ -240,7 +240,7 @@ - Pops up an error message in the edior which is shown as coming from the underlying VCS. Use this to show VCS specific error messages. + Pops up an error message in the editor which is shown as coming from the underlying VCS. Use this to show VCS specific error messages. diff --git a/doc/classes/NavigationMesh.xml b/doc/classes/NavigationMesh.xml index 85af44a13ec..e0220ee02bb 100644 --- a/doc/classes/NavigationMesh.xml +++ b/doc/classes/NavigationMesh.xml @@ -103,7 +103,7 @@ The maximum distance the detail mesh surface should deviate from heightfield, in cell unit. - The maximum distance a simplfied contour's border edges should deviate the original raw contour. + The maximum distance a simplified contour's border edges should deviate the original raw contour. The maximum allowed length for contour edges along the border of the mesh. diff --git a/doc/classes/Node3D.xml b/doc/classes/Node3D.xml index 07ab6a8b49a..a0be95a2530 100644 --- a/doc/classes/Node3D.xml +++ b/doc/classes/Node3D.xml @@ -287,7 +287,7 @@ Access to the node rotation as a [Quaternion]. This property is ideal for tweening complex rotations. - Rotation part of the local transformation in radians, specified in terms of Euler angles. The angles construct a rotaton in the order specified by the [member rotation_order] property. + Rotation part of the local transformation in radians, specified in terms of Euler angles. The angles construct a rotation in the order specified by the [member rotation_order] property. [b]Note:[/b] In the mathematical sense, rotation is a matrix and not a vector. The three Euler angles, which are the three independent parameters of the Euler-angle parametrization of the rotation matrix, are stored in a [Vector3] data structure not because the rotation is a vector, but only because [Vector3] exists as a convenient data-structure to store 3 floating-point numbers. Therefore, applying affine operations on the rotation "vector" is not meaningful. [b]Note:[/b] This property is edited in the inspector in degrees. If you want to use degrees in a script, use [member rotation_degrees]. diff --git a/doc/classes/OccluderInstance3D.xml b/doc/classes/OccluderInstance3D.xml index bc16fba5007..99edf7f5529 100644 --- a/doc/classes/OccluderInstance3D.xml +++ b/doc/classes/OccluderInstance3D.xml @@ -36,7 +36,7 @@ The simplification distance to use for simplifying the generated occluder polygon (in 3D units). Higher values result in a less detailed occluder mesh, which improves performance but reduces culling accuracy. - The occluder geometry is rendered on the CPU, so it is important to keep its geometry as simple as possible. Since the buffer is rendered at a low resolution, less detailed occluder meshes generally still work well. The default value is fairly aggressive, so you may have to decrase it if you run into false negatives (objects being occluded even though they are visible by the camera). A value of [code]0.01[/code] will act conservatively, and will keep geometry [i]perceptually[/i] unaffected in the occlusion culling buffer. Depending on the scene, a value of [code]0.01[/code] may still simplify the mesh noticeably compared to disabling simplification entirely. + The occluder geometry is rendered on the CPU, so it is important to keep its geometry as simple as possible. Since the buffer is rendered at a low resolution, less detailed occluder meshes generally still work well. The default value is fairly aggressive, so you may have to decrease it if you run into false negatives (objects being occluded even though they are visible by the camera). A value of [code]0.01[/code] will act conservatively, and will keep geometry [i]perceptually[/i] unaffected in the occlusion culling buffer. Depending on the scene, a value of [code]0.01[/code] may still simplify the mesh noticeably compared to disabling simplification entirely. Setting this to [code]0.0[/code] disables simplification entirely, but vertices in the exact same position will still be merged. The mesh will also be re-indexed to reduce both the number of vertices and indices. [b]Note:[/b] This uses the [url=https://meshoptimizer.org/]meshoptimizer[/url] library under the hood, similar to LOD generation. diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index 3935eea5921..5f85a29cf4b 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -2399,7 +2399,7 @@ Affects the final texture sharpness by reading from a lower or higher mipmap (also called "texture LOD bias"). Negative values make mipmapped textures sharper but grainier when viewed at a distance, while positive values make mipmapped textures blurrier (even when up close). - Enabling temporal antialiasing ([member rendering/anti_aliasing/quality/use_taa]) will automatically apply a [code]-0.5[/code] offset to this value, while enabling FXAA ([member rendering/anti_aliasing/quality/screen_space_aa]) will automatically apply a [code]-0.25[/code] offset to this value. If both TAA and FXAA are enbled at the same time, an offset of [code]-0.75[/code] is applied to this value. + Enabling temporal antialiasing ([member rendering/anti_aliasing/quality/use_taa]) will automatically apply a [code]-0.5[/code] offset to this value, while enabling FXAA ([member rendering/anti_aliasing/quality/screen_space_aa]) will automatically apply a [code]-0.25[/code] offset to this value. If both TAA and FXAA are enabled at the same time, an offset of [code]-0.75[/code] is applied to this value. [b]Note:[/b] If [member rendering/scaling_3d/scale] is lower than [code]1.0[/code] (exclusive), [member rendering/textures/default_filters/texture_mipmap_bias] is used to adjust the automatic mipmap bias which is calculated internally based on the scale factor. The formula for this is [code]log2(scaling_3d_scale) + mipmap_bias[/code]. [b]Note:[/b] This property is only read when the project starts. To change the mipmap LOD bias at run-time, set [member Viewport.texture_mipmap_bias] instead. diff --git a/doc/classes/TileMap.xml b/doc/classes/TileMap.xml index 7d3732904c1..f49dc03fa12 100644 --- a/doc/classes/TileMap.xml +++ b/doc/classes/TileMap.xml @@ -286,7 +286,7 @@ - Sets the tile indentifiers for the cell on layer [param layer] at coordinates [param coords]. Each tile of the [TileSet] is identified using three parts: + Sets the tile identifiers for the cell on layer [param layer] at coordinates [param coords]. Each tile of the [TileSet] is identified using three parts: - The source identifier [param source_id] identifies a [TileSetSource] identifier. See [method TileSet.set_source_id], - The atlas coordinates identifier [param atlas_coords] identifies a tile coordinates in the atlas (if the source is a [TileSetAtlasSource]). For [TileSetScenesCollectionSource] it should always be [code]Vector2i(0, 0)[/code]), - The alternative tile identifier [param alternative_tile] identifies a tile alternative in the atlas (if the source is a [TileSetAtlasSource]), and the scene for a [TileSetScenesCollectionSource]. diff --git a/doc/classes/TileMapPattern.xml b/doc/classes/TileMapPattern.xml index 30bb174313f..b514dd6e65a 100644 --- a/doc/classes/TileMapPattern.xml +++ b/doc/classes/TileMapPattern.xml @@ -71,7 +71,7 @@ - Sets the tile indentifiers for the cell at coordinates [param coords]. See [method TileMap.set_cell]. + Sets the tile identifiers for the cell at coordinates [param coords]. See [method TileMap.set_cell]. diff --git a/doc/classes/TileSet.xml b/doc/classes/TileSet.xml index 0038233baf9..667de03c091 100644 --- a/doc/classes/TileSet.xml +++ b/doc/classes/TileSet.xml @@ -331,7 +331,7 @@ - According to the configured proxies, maps the provided indentifiers to a new set of identifiers. The source ID, atlas coordinates ID and alternative tile ID are returned as a 3 elements Array. + According to the configured proxies, maps the provided identifiers to a new set of identifiers. The source ID, atlas coordinates ID and alternative tile ID are returned as a 3 elements Array. This function first look for matching alternative-level proxies, then coordinates-level proxies, then source-level proxies. If no proxy corresponding to provided identifiers are found, returns the same values the ones used as arguments. diff --git a/doc/classes/Tween.xml b/doc/classes/Tween.xml index 8a53afb692b..ef8e1215518 100644 --- a/doc/classes/Tween.xml +++ b/doc/classes/Tween.xml @@ -89,7 +89,7 @@ [/codeblocks] Some [Tweener]s use transitions and eases. The first accepts a [enum TransitionType] constant, and refers to the way the timing of the animation is handled (see [url=https://easings.net/]easings.net[/url] for some examples). The second accepts an [enum EaseType] constant, and controls where the [code]trans_type[/code] is applied to the interpolation (in the beginning, the end, or both). If you don't know which transition and easing to pick, you can try different [enum TransitionType] constants with [constant EASE_IN_OUT], and use the one that looks best. [url=https://raw.githubusercontent.com/godotengine/godot-docs/4.0/img/tween_cheatsheet.png]Tween easing and transition types cheatsheet[/url] - [b]Note:[/b] Tweens are not designed to be re-used and trying to do so results in an undefined behavior. Create a new Tween for each animation and every time you replay an animation from start. Keep in mind that Tweens start immediately, so only create a Tween when you want to start animating. + [b]Note:[/b] Tweens are not designed to be reused and trying to do so results in an undefined behavior. Create a new Tween for each animation and every time you replay an animation from start. Keep in mind that Tweens start immediately, so only create a Tween when you want to start animating. [b]Note:[/b] Tweens are processing after all of nodes in the current frame, i.e. after [method Node._process] or [method Node._physics_process] (depending on [enum TweenProcessMode]). diff --git a/doc/classes/Viewport.xml b/doc/classes/Viewport.xml index ca5eb6119bd..100be0482b9 100644 --- a/doc/classes/Viewport.xml +++ b/doc/classes/Viewport.xml @@ -325,7 +325,7 @@ Affects the final texture sharpness by reading from a lower or higher mipmap (also called "texture LOD bias"). Negative values make mipmapped textures sharper but grainier when viewed at a distance, while positive values make mipmapped textures blurrier (even when up close). - Enabling temporal antialiasing ([member use_taa]) will automatically apply a [code]-0.5[/code] offset to this value, while enabling FXAA ([member screen_space_aa]) will automatically apply a [code]-0.25[/code] offset to this value. If both TAA and FXAA are enbled at the same time, an offset of [code]-0.75[/code] is applied to this value. + Enabling temporal antialiasing ([member use_taa]) will automatically apply a [code]-0.5[/code] offset to this value, while enabling FXAA ([member screen_space_aa]) will automatically apply a [code]-0.25[/code] offset to this value. If both TAA and FXAA are enabled at the same time, an offset of [code]-0.75[/code] is applied to this value. [b]Note:[/b] If [member scaling_3d_scale] is lower than [code]1.0[/code] (exclusive), [member texture_mipmap_bias] is used to adjust the automatic mipmap bias which is calculated internally based on the scale factor. The formula for this is [code]log2(scaling_3d_scale) + mipmap_bias[/code]. To control this property on the root viewport, set the [member ProjectSettings.rendering/textures/default_filters/texture_mipmap_bias] project setting. diff --git a/doc/tools/make_rst.py b/doc/tools/make_rst.py index a6a664bed65..22613ef7937 100755 --- a/doc/tools/make_rst.py +++ b/doc/tools/make_rst.py @@ -1458,7 +1458,6 @@ def make_link(url: str, title: str) -> str: def make_rst_index(grouped_classes: Dict[str, List[str]], dry_run: bool, output_dir: str) -> None: - if dry_run: f = open(os.devnull, "w", encoding="utf-8") else: @@ -1884,9 +1883,9 @@ def format_text_block( post_text = text[endurl_pos + 6 :] if pre_text and pre_text[-1] not in MARKUP_ALLOWED_PRECEDENT: - pre_text += "\ " + pre_text += "\\ " if post_text and post_text[0] not in MARKUP_ALLOWED_SUBSEQUENT: - post_text = "\ " + post_text + post_text = "\\ " + post_text text = pre_text + tag_text + post_text pos = len(pre_text) + len(tag_text) @@ -1963,9 +1962,9 @@ def format_text_block( # Properly escape things like `[Node]s` if escape_pre and pre_text and pre_text[-1] not in MARKUP_ALLOWED_PRECEDENT: - pre_text += "\ " + pre_text += "\\ " if escape_post and post_text and post_text[0] not in MARKUP_ALLOWED_SUBSEQUENT: - post_text = "\ " + post_text + post_text = "\\ " + post_text next_brac_pos = post_text.find("[", 0) iter_pos = 0 @@ -1973,7 +1972,7 @@ def format_text_block( iter_pos = post_text.find("*", iter_pos, next_brac_pos) if iter_pos == -1: break - post_text = f"{post_text[:iter_pos]}\*{post_text[iter_pos + 1 :]}" + post_text = f"{post_text[:iter_pos]}\\*{post_text[iter_pos + 1 :]}" iter_pos += 2 iter_pos = 0 @@ -1982,7 +1981,7 @@ def format_text_block( if iter_pos == -1: break if not post_text[iter_pos + 1].isalnum(): # don't escape within a snake_case word - post_text = f"{post_text[:iter_pos]}\_{post_text[iter_pos + 1 :]}" + post_text = f"{post_text[:iter_pos]}\\_{post_text[iter_pos + 1 :]}" iter_pos += 2 else: iter_pos += 1 @@ -2023,7 +2022,7 @@ def escape_rst(text: str, until_pos: int = -1) -> str: pos = text.find("*", pos, until_pos) if pos == -1: break - text = f"{text[:pos]}\*{text[pos + 1 :]}" + text = f"{text[:pos]}\\*{text[pos + 1 :]}" pos += 2 # Escape _ character at the end of a word to avoid interpreting it as an inline hyperlink @@ -2033,7 +2032,7 @@ def escape_rst(text: str, until_pos: int = -1) -> str: if pos == -1: break if not text[pos + 1].isalnum(): # don't escape within a snake_case word - text = f"{text[:pos]}\_{text[pos + 1 :]}" + text = f"{text[:pos]}\\_{text[pos + 1 :]}" pos += 2 else: pos += 1 diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp index f3f8ceaf5dd..831cf4493ba 100644 --- a/drivers/vulkan/rendering_device_vulkan.cpp +++ b/drivers/vulkan/rendering_device_vulkan.cpp @@ -2090,7 +2090,7 @@ RID RenderingDeviceVulkan::texture_create_shared(const TextureView &p_view, RID VkImageViewUsageCreateInfo usage_info; if (context->is_device_extension_enabled(VK_KHR_MAINTENANCE_2_EXTENSION_NAME)) { - // May need to make VK_KHR_maintenance2 manditory and thus has Vulkan 1.1 be our minimum supported version + // May need to make VK_KHR_maintenance2 mandatory and thus has Vulkan 1.1 be our minimum supported version // if we require setting this information. Vulkan 1.0 may simply not care.. usage_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO; diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 89b9bf9ee3e..c643f75eee8 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -6253,7 +6253,7 @@ bool AnimationTrackEditor::is_grouping_tracks() { void AnimationTrackEditor::_selection_changed() { if (selected_filter->is_pressed()) { - _update_tracks(); // Needs updatin. + _update_tracks(); // Needs updating. } else { _redraw_tracks(); _redraw_groups(); diff --git a/editor/editor_builders.py b/editor/editor_builders.py index 2a4f79548ff..b712258a43d 100644 --- a/editor/editor_builders.py +++ b/editor/editor_builders.py @@ -14,7 +14,6 @@ from platform_methods import subprocess_main def make_doc_header(target, source, env): - dst = target[0] g = open(dst, "w", encoding="utf-8") buf = "" @@ -50,7 +49,6 @@ def make_doc_header(target, source, env): def make_fonts_header(target, source, env): - dst = target[0] g = open(dst, "w", encoding="utf-8") @@ -79,7 +77,6 @@ def make_fonts_header(target, source, env): def make_translations_header(target, source, env, category): - dst = target[0] g = open(dst, "w", encoding="utf-8") diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index 97c2eee0ea9..033ff9c8e78 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -968,7 +968,7 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const p_dir->modified_time = current_mtime; //ooooops, dir changed, see what's going on - //first mark everything as veryfied + //first mark everything as verified for (int i = 0; i < p_dir->files.size(); i++) { p_dir->files[i]->verified = false; diff --git a/editor/icons/editor_icons_builders.py b/editor/icons/editor_icons_builders.py index 2b621071ce7..ae25072a9ea 100644 --- a/editor/icons/editor_icons_builders.py +++ b/editor/icons/editor_icons_builders.py @@ -8,16 +8,15 @@ import os from io import StringIO from platform_methods import subprocess_main + # See also `scene/resources/default_theme/default_theme_icons_builders.py`. def make_editor_icons_action(target, source, env): - dst = target[0] svg_icons = source icons_string = StringIO() for f in svg_icons: - fname = str(f) icons_string.write('\t"') @@ -48,7 +47,6 @@ def make_editor_icons_action(target, source, env): thumb_big_indices = [] index = 0 for f in svg_icons: - fname = str(f) # Trim the `.svg` extension from the string. diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index e89e45fac2f..dead7fe6f40 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1285,7 +1285,7 @@ void CanvasItemEditor::_pan_callback(Vector2 p_scroll_vec, Ref p_eve void CanvasItemEditor::_zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref p_event) { Ref mb = p_event; if (mb.is_valid()) { - // Special behvior for scroll events, as the zoom_by_increment method can smartly end up on powers of two. + // Special behavior for scroll events, as the zoom_by_increment method can smartly end up on powers of two. int increment = p_zoom_factor > 1.0 ? 1 : -1; zoom_widget->set_zoom_by_increments(increment, mb->is_alt_pressed()); } else { diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index d3e0c7e64c9..85ebe3d2b4b 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -6954,7 +6954,7 @@ void Node3DEditor::_init_grid() { if (primary_grid_steps != 10) { // Log10 of 10 is 1. // Change of base rule, divide by ln(10). real_t div = Math::log((real_t)primary_grid_steps) / (real_t)2.302585092994045901094; - // Trucation (towards zero) is intentional. + // Truncation (towards zero) is intentional. division_level_max = (int)(division_level_max / div); division_level_min = (int)(division_level_min / div); } diff --git a/gles3_builders.py b/gles3_builders.py index 0d0037dea15..23b1280bc21 100644 --- a/gles3_builders.py +++ b/gles3_builders.py @@ -40,7 +40,6 @@ def include_file_in_gles3_header(filename: str, header_data: GLES3HeaderStruct, line = fs.readline() while line: - if line.find("=") != -1 and header_data.reading == "": # Mode eqpos = line.find("=") @@ -121,7 +120,6 @@ def include_file_in_gles3_header(filename: str, header_data: GLES3HeaderStruct, uline = uline.replace(";", "") lines = uline.split(",") for x in lines: - x = x.strip() x = x[x.rfind(" ") + 1 :] if x.find("[") != -1: @@ -143,7 +141,6 @@ def include_file_in_gles3_header(filename: str, header_data: GLES3HeaderStruct, uline = uline.replace("{", "").strip() lines = uline.split(",") for x in lines: - x = x.strip() x = x[x.rfind(" ") + 1 :] if x.find("[") != -1: @@ -159,7 +156,6 @@ def include_file_in_gles3_header(filename: str, header_data: GLES3HeaderStruct, uline = uline.replace(";", "") lines = uline.split(",") for x in lines: - x = x.strip() x = x[x.rfind(" ") + 1 :] if x.find("[") != -1: @@ -476,7 +472,6 @@ def build_gles3_header(filename: str, include: str, class_suffix: str, header_da fd.write("\tvirtual void _init() override {\n\n") if header_data.uniforms: - fd.write("\t\tstatic const char* _uniform_strings[]={\n") if header_data.uniforms: for x in header_data.uniforms: @@ -487,7 +482,6 @@ def build_gles3_header(filename: str, include: str, class_suffix: str, header_da variant_count = 1 if len(header_data.variant_defines) > 0: - fd.write("\t\tstatic const char* _variant_defines[]={\n") for x in header_data.variant_defines: fd.write('\t\t\t"' + x + '",\n') @@ -532,7 +526,6 @@ def build_gles3_header(filename: str, include: str, class_suffix: str, header_da feedback_count = 0 if header_data.feedbacks: - fd.write("\t\tstatic const Feedback _feedbacks[]={\n") for x in header_data.feedbacks: name = x[0] diff --git a/glsl_builders.py b/glsl_builders.py index 888f541cf4e..e6ea404140e 100644 --- a/glsl_builders.py +++ b/glsl_builders.py @@ -47,7 +47,6 @@ def include_file_in_rd_header(filename: str, header_data: RDHeaderStruct, depth: line = fs.readline() while line: - index = line.find("//") if index != -1: line = line[:index] @@ -178,7 +177,6 @@ def include_file_in_raw_header(filename: str, header_data: RAWHeaderStruct, dept line = fs.readline() while line: - while line.find("#include ") != -1: includeline = line.replace("#include ", "").strip()[1:-1] diff --git a/methods.py b/methods.py index 48ce590cefe..bf37e443006 100644 --- a/methods.py +++ b/methods.py @@ -179,14 +179,11 @@ const char *const VERSION_HASH = "{git_hash}"; def parse_cg_file(fname, uniforms, sizes, conditionals): - fs = open(fname, "r") line = fs.readline() while line: - if re.match(r"^\s*uniform", line): - res = re.match(r"uniform ([\d\w]*) ([\d\w]*)") type = res.groups(1) name = res.groups(2) @@ -427,7 +424,6 @@ def sort_module_list(env): def use_windows_spawn_fix(self, platform=None): - if os.name != "nt": return # not needed, only for windows @@ -442,7 +438,6 @@ def use_windows_spawn_fix(self, platform=None): self.Replace(ARFLAGS="q") def mySubProcess(cmdline, env): - startupinfo = subprocess.STARTUPINFO() startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW popen_args = { @@ -465,7 +460,6 @@ def use_windows_spawn_fix(self, platform=None): return rv def mySpawn(sh, escape, cmd, args, env): - newargs = " ".join(args[1:]) cmdline = cmd + " " + newargs @@ -486,7 +480,6 @@ def use_windows_spawn_fix(self, platform=None): def save_active_platforms(apnames, ap): - for x in ap: svg_names = [] if os.path.isfile(x + "/logo.svg"): @@ -514,7 +507,6 @@ def save_active_platforms(apnames, ap): def no_verbose(sys, env): - colors = {} # Colors are disabled in non-TTY environments such as pipes. This means @@ -628,7 +620,6 @@ def detect_visual_c_compiler_version(tools_env): # and for VS 2017 and newer we check VCTOOLSINSTALLDIR: if "VCTOOLSINSTALLDIR" in tools_env: - # Newer versions have a different path available vc_amd64_compiler_detection_index = ( tools_env["PATH"].upper().find(tools_env["VCTOOLSINSTALLDIR"].upper() + "BIN\\HOSTX64\\X64;") diff --git a/misc/scripts/codespell.sh b/misc/scripts/codespell.sh index 55b18ec6c61..4c97c9a4e05 100755 --- a/misc/scripts/codespell.sh +++ b/misc/scripts/codespell.sh @@ -3,6 +3,6 @@ SKIP_LIST="./.*,./**/.*,./bin,./thirdparty,*.desktop,*.gen.*,*.po,*.pot,*.rc,./A SKIP_LIST+="./core/input/gamecontrollerdb.txt,./core/string/locales.h,./editor/renames_map_3_to_4.cpp,./misc/scripts/codespell.sh," SKIP_LIST+="./platform/android/java/lib/src/com,./platform/web/node_modules,./platform/web/package-lock.json," -IGNORE_LIST="curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,mis,nd,numer,ot,te,vai" +IGNORE_LIST="breaked,checkin,curvelinear,doubleclick,expct,findn,gird,hel,inout,labelin,lod,mis,nd,numer,ot,outin,pointin,reduct,requestor,te,textin,thirdparty,vai" codespell -w -q 3 -S "${SKIP_LIST}" -L "${IGNORE_LIST}" --builtin "clear,rare,en-GB_to_en-US" diff --git a/modules/denoise/resource_to_cpp.py b/modules/denoise/resource_to_cpp.py index 6c832773559..a89eda91175 100644 --- a/modules/denoise/resource_to_cpp.py +++ b/modules/denoise/resource_to_cpp.py @@ -19,9 +19,9 @@ import os from array import array + # Generates a C++ file from the specified binary resource file def generate(in_path, out_path): - namespace = "oidn::weights" scopes = namespace.split("::") diff --git a/modules/enet/enet_connection.cpp b/modules/enet/enet_connection.cpp index 804263186f4..5b433626954 100644 --- a/modules/enet/enet_connection.cpp +++ b/modules/enet/enet_connection.cpp @@ -142,7 +142,7 @@ ENetConnection::EventType ENetConnection::_parse_event(const ENetEvent &p_event, return EVENT_ERROR; } break; case ENET_EVENT_TYPE_RECEIVE: { - // Packet reveived. + // Packet received. if (p_event.peer->data != nullptr) { Ref pp = Ref((ENetPacketPeer *)p_event.peer->data); r_event.peer = Ref((ENetPacketPeer *)p_event.peer->data); diff --git a/modules/gdscript/language_server/godot_lsp.h b/modules/gdscript/language_server/godot_lsp.h index b9a54cf818a..3782945e070 100644 --- a/modules/gdscript/language_server/godot_lsp.h +++ b/modules/gdscript/language_server/godot_lsp.h @@ -1566,7 +1566,7 @@ struct SignatureHelp { /** * The active signature. If omitted or the value lies outside the * range of `signatures` the value defaults to zero or is ignored if - * `signatures.length === 0`. Whenever possible implementors should + * `signatures.length === 0`. Whenever possible implementers should * make an active decision about the active signature and shouldn't * rely on a default value. * In future version of the protocol this property might become diff --git a/modules/gdscript/tests/scripts/analyzer/errors/typed_array_init_with_unconvertable_in_literal.gd b/modules/gdscript/tests/scripts/analyzer/errors/typed_array_init_with_unconvertable_in_literal.gd index 25cde1d40b7..7cc5aaf44fa 100644 --- a/modules/gdscript/tests/scripts/analyzer/errors/typed_array_init_with_unconvertable_in_literal.gd +++ b/modules/gdscript/tests/scripts/analyzer/errors/typed_array_init_with_unconvertable_in_literal.gd @@ -1,4 +1,4 @@ func test(): - var unconvertable := 1 - var typed: Array[Object] = [unconvertable] + var unconvertible := 1 + var typed: Array[Object] = [unconvertible] print('not ok') diff --git a/modules/mono/editor/bindings_generator.cpp b/modules/mono/editor/bindings_generator.cpp index 7feb46604ec..18556602c7c 100644 --- a/modules/mono/editor/bindings_generator.cpp +++ b/modules/mono/editor/bindings_generator.cpp @@ -3740,7 +3740,7 @@ void BindingsGenerator::_populate_builtin_type_interfaces() { builtin_types.insert(itype.cname, itype); // Array_@generic - // Re-use Array's itype + // Reuse Array's itype itype.name = "Array_@generic"; itype.cname = itype.name; itype.cs_out = "%5return new %2(%0(%1));"; @@ -3767,7 +3767,7 @@ void BindingsGenerator::_populate_builtin_type_interfaces() { builtin_types.insert(itype.cname, itype); // Dictionary_@generic - // Re-use Dictionary's itype + // Reuse Dictionary's itype itype.name = "Dictionary_@generic"; itype.cname = itype.name; itype.cs_out = "%5return new %2(%0(%1));"; diff --git a/modules/openxr/extensions/openxr_opengl_extension.cpp b/modules/openxr/extensions/openxr_opengl_extension.cpp index 20ccfe39069..83d31036a43 100644 --- a/modules/openxr/extensions/openxr_opengl_extension.cpp +++ b/modules/openxr/extensions/openxr_opengl_extension.cpp @@ -37,7 +37,7 @@ #include "servers/rendering/rendering_server_globals.h" #include "servers/rendering_server.h" -// OpenXR requires us to submit sRGB textures so that it recognises the content +// OpenXR requires us to submit sRGB textures so that it recognizes the content // as being in sRGB color space. We do fall back on "normal" textures but this // will likely result in incorrect colors as OpenXR will double the sRGB conversion. // All major XR runtimes support sRGB textures. diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp index af59fe7ddef..857d1faba0c 100644 --- a/modules/openxr/openxr_api.cpp +++ b/modules/openxr/openxr_api.cpp @@ -310,7 +310,7 @@ bool OpenXRAPI::create_instance() { for (auto &requested_extension : requested_extensions) { if (!is_extension_supported(requested_extension.key)) { if (requested_extension.value == nullptr) { - // nullptr means this is a manditory extension so we fail + // nullptr means this is a mandatory extension so we fail ERR_FAIL_V_MSG(false, String("OpenXR: OpenXR Runtime does not support ") + requested_extension.key + String(" extension!")); } else { // set this extension as not supported @@ -788,7 +788,7 @@ bool OpenXRAPI::create_swapchains() { Also Godot only creates a swapchain for the main output. OpenXR will require us to create swapchains as the render target for additional viewports if we want to use the layer system - to optimize text rendering and background rendering as OpenXR may choose to re-use the results for reprojection while we're + to optimize text rendering and background rendering as OpenXR may choose to reuse the results for reprojection while we're already rendering the next frame. Finally an area we need to expand upon is that Foveated rendering is only enabled for the swap chain we create, @@ -1660,7 +1660,7 @@ bool OpenXRAPI::process() { } bool OpenXRAPI::acquire_image(OpenXRSwapChainInfo &p_swapchain) { - ERR_FAIL_COND_V(p_swapchain.image_acquired, true); // this was not released when it should be, error out and re-use... + ERR_FAIL_COND_V(p_swapchain.image_acquired, true); // this was not released when it should be, error out and reuse... XrResult result; XrSwapchainImageAcquireInfo swapchain_image_acquire_info = { diff --git a/modules/openxr/openxr_api.h b/modules/openxr/openxr_api.h index 8c642c4ff43..494d35bd649 100644 --- a/modules/openxr/openxr_api.h +++ b/modules/openxr/openxr_api.h @@ -287,7 +287,7 @@ private: bool on_state_loss_pending(); bool on_state_exiting(); - // convencience + // convenience void copy_string_to_char_buffer(const String p_string, char *p_buffer, int p_buffer_len); public: diff --git a/modules/text_server_adv/gdextension_build/methods.py b/modules/text_server_adv/gdextension_build/methods.py index 3c5229462c7..e58bc3abecb 100644 --- a/modules/text_server_adv/gdextension_build/methods.py +++ b/modules/text_server_adv/gdextension_build/methods.py @@ -99,8 +99,8 @@ def make_icu_data(target, source, env): def write_macos_plist(target, binary_name, identifier, name): - os.makedirs(f"{target}/Resourece/", exist_ok=True) - f = open(f"{target}/Resourece/Info.plist", "w") + os.makedirs(f"{target}/Resource/", exist_ok=True) + f = open(f"{target}/Resource/Info.plist", "w") f.write(f'\n') f.write(f'\n') diff --git a/modules/text_server_fb/gdextension_build/methods.py b/modules/text_server_fb/gdextension_build/methods.py index 3c5229462c7..e58bc3abecb 100644 --- a/modules/text_server_fb/gdextension_build/methods.py +++ b/modules/text_server_fb/gdextension_build/methods.py @@ -99,8 +99,8 @@ def make_icu_data(target, source, env): def write_macos_plist(target, binary_name, identifier, name): - os.makedirs(f"{target}/Resourece/", exist_ok=True) - f = open(f"{target}/Resourece/Info.plist", "w") + os.makedirs(f"{target}/Resource/", exist_ok=True) + f = open(f"{target}/Resource/Info.plist", "w") f.write(f'\n') f.write(f'\n') diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java b/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java index 8449c08b88d..56397bb2c24 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java +++ b/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java @@ -867,7 +867,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback */ public interface EGLConfigChooser { /** - * Choose a configuration from the list. Implementors typically + * Choose a configuration from the list. Implementers typically * implement this method by calling * {@link EGL10#eglChooseConfig} and iterating through the results. Please consult the * EGL specification available from The Khronos Group to learn how to call eglChooseConfig. diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java index 317344f2a53..47d1795e120 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java @@ -306,7 +306,7 @@ public class GodotInputHandler implements InputManager.InputDeviceListener { return; } - // Assign first available number. Re-use numbers where possible. + // Assign first available number. Reuse numbers where possible. final int id = assignJoystickIdNumber(deviceId); final Joystick joystick = new Joystick(); diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index 7f7a2bcfcdd..4d6fb05e047 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -4235,7 +4235,7 @@ void DisplayServerX11::process_events() { XSync(x11_display, False); XGetWindowAttributes(x11_display, wd.x11_window, &xwa); - // Set focus when menu window is re-used. + // Set focus when menu window is reused. // RevertToPointerRoot is used to make sure we don't lose all focus in case // a subwindow and its parent are both destroyed. if ((xwa.map_state == IsViewable) && !wd.no_focus && !wd.is_popup) { diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index 95d9e32e173..fb24bce71d8 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -2027,7 +2027,7 @@ void DisplayServerMacOS::warp_mouse(const Point2i &p_position) { NSRect pointInWindowRect = NSMakeRect(p_position.x / scale, contentRect.size.height - (p_position.y / scale), scale, scale); NSPoint pointOnScreen = [[wd.window_view window] convertRectToScreen:pointInWindowRect].origin; - // Point in scren coords. + // Point in screen coords. CGPoint lMouseWarpPos = { pointOnScreen.x, CGDisplayBounds(CGMainDisplayID()).size.height - pointOnScreen.y }; // Do the warping. diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py index 64fe5bc4a2f..03c4fd547ee 100644 --- a/platform/uwp/detect.py +++ b/platform/uwp/detect.py @@ -21,7 +21,6 @@ def can_build(): if os.name == "nt": # building natively on windows! if os.getenv("VSINSTALLDIR"): - if os.getenv("ANGLE_SRC_PATH") is None: return False diff --git a/platform/web/js/libs/library_godot_audio.js b/platform/web/js/libs/library_godot_audio.js index 1993d66310f..cc86c810960 100644 --- a/platform/web/js/libs/library_godot_audio.js +++ b/platform/web/js/libs/library_godot_audio.js @@ -88,7 +88,7 @@ const GodotAudio = { GodotAudio.input = GodotAudio.ctx.createMediaStreamSource(stream); callback(GodotAudio.input); } catch (e) { - GodotRuntime.error('Failed creaating input.', e); + GodotRuntime.error('Failed creating input.', e); } } if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) { diff --git a/platform/web/js/libs/library_godot_display.js b/platform/web/js/libs/library_godot_display.js index 23cbc67c165..98198586e71 100644 --- a/platform/web/js/libs/library_godot_display.js +++ b/platform/web/js/libs/library_godot_display.js @@ -289,11 +289,11 @@ const GodotDisplayScreen = { const isFullscreen = GodotDisplayScreen.isFullscreen(); const wantsFullWindow = GodotConfig.canvas_resize_policy === 2; const noResize = GodotConfig.canvas_resize_policy === 0; - const wwidth = GodotDisplayScreen.desired_size[0]; - const wheight = GodotDisplayScreen.desired_size[1]; + const dWidth = GodotDisplayScreen.desired_size[0]; + const dHeight = GodotDisplayScreen.desired_size[1]; const canvas = GodotConfig.canvas; - let width = wwidth; - let height = wheight; + let width = dWidth; + let height = dHeight; if (noResize) { // Don't resize canvas, just update GL if needed. if (canvas.width !== width || canvas.height !== height) { diff --git a/platform/web/js/libs/library_godot_input.js b/platform/web/js/libs/library_godot_input.js index 1b221e78b37..4d1605aa074 100644 --- a/platform/web/js/libs/library_godot_input.js +++ b/platform/web/js/libs/library_godot_input.js @@ -137,7 +137,7 @@ const GodotInputGamepads = { const id = pad.id; // Chrom* style: NAME (Vendor: xxxx Product: xxxx) const exp1 = /vendor: ([0-9a-f]{4}) product: ([0-9a-f]{4})/i; - // Firefox/Safari style (safari may remove leading zeores) + // Firefox/Safari style (safari may remove leading zeroes) const exp2 = /^([0-9a-f]+)-([0-9a-f]+)-/i; let vendor = ''; let product = ''; diff --git a/platform_methods.py b/platform_methods.py index 1a2520794cd..ed0ab980d07 100644 --- a/platform_methods.py +++ b/platform_methods.py @@ -14,7 +14,6 @@ JSON_SERIALIZABLE_TYPES = (bool, int, float, str) def run_in_subprocess(builder_function): @functools.wraps(builder_function) def wrapper(target, source, env): - # Convert SCons Node instances to absolute paths target = [node.srcnode().abspath for node in target] source = [node.srcnode().abspath for node in source] diff --git a/scene/2d/line_builder.cpp b/scene/2d/line_builder.cpp index 0970325502b..c9b80ae2573 100644 --- a/scene/2d/line_builder.cpp +++ b/scene/2d/line_builder.cpp @@ -367,7 +367,7 @@ void LineBuilder::build() { } if (intersection_result != SEGMENT_INTERSECT) { - // In this case the joint is too corrupted to be re-used, + // In this case the joint is too corrupted to be reused, // start again the strip with fallback points strip_begin(pos_up0, pos_down0, color1, uvx1); } diff --git a/scene/3d/lightmap_gi.cpp b/scene/3d/lightmap_gi.cpp index 3ee08fd5485..cb229d88c78 100644 --- a/scene/3d/lightmap_gi.cpp +++ b/scene/3d/lightmap_gi.cpp @@ -551,7 +551,7 @@ int32_t LightmapGI::_compute_bsp_tree(const Vector &p_points, const Loc // Luckily, because we are using tetrahedrons, we can resort to // less precise but still working ways to generate the separating plane // this will most likely look bad when interpolating, but at least it will not crash. - // and the arctifact will most likely also be very small, so too difficult to notice. + // and the artifact will most likely also be very small, so too difficult to notice. //find the longest axis diff --git a/scene/3d/vehicle_body_3d.cpp b/scene/3d/vehicle_body_3d.cpp index 36c00665fce..546fe820f87 100644 --- a/scene/3d/vehicle_body_3d.cpp +++ b/scene/3d/vehicle_body_3d.cpp @@ -532,7 +532,7 @@ void VehicleBody3D::_resolve_single_bilateral(PhysicsDirectBodyState3D *s, const if (body2) { rel_pos2 = pos2 - body2->get_global_transform().origin; } - //this jacobian entry could be re-used for all iterations + //this jacobian entry could be reused for all iterations Vector3 vel1 = s->get_linear_velocity() + (s->get_angular_velocity()).cross(rel_pos1); // * mPos); Vector3 vel2; diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp index d3207c1a3db..77720d724b3 100644 --- a/scene/animation/animation_blend_tree.cpp +++ b/scene/animation/animation_blend_tree.cpp @@ -146,7 +146,7 @@ double AnimationNodeAnimation::process(double p_time, bool p_seek, bool p_is_ext } // Emit start & finish signal. Internally, the detections are the same for backward. - // We should use call_deferred since the track keys are still being prosessed. + // We should use call_deferred since the track keys are still being processed. if (state->tree) { // AnimationTree uses seek to 0 "internally" to process the first key of the animation, which is used as the start detection. if (p_seek && !p_is_external_seeking && cur_time == 0) { diff --git a/scene/gui/code_edit.cpp b/scene/gui/code_edit.cpp index ca5e9b401cd..62e9b322225 100644 --- a/scene/gui/code_edit.cpp +++ b/scene/gui/code_edit.cpp @@ -2920,7 +2920,7 @@ void CodeEdit::_filter_code_completion_candidates_impl() { } /* Filter Options. */ - /* For now handle only tradional quoted strings. */ + /* For now handle only traditional quoted strings. */ bool single_quote = in_string != -1 && first_quote_col > 0 && delimiters[in_string].start_key == "'"; code_completion_options.clear(); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index cf7b6cf6081..270af05e5e2 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -963,7 +963,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o int gl_size = TS->shaped_text_get_glyph_count(rid); Vector2 gloff = off; - // Draw oulines and shadow. + // Draw outlines and shadow. int processed_glyphs_ol = r_processed_glyphs; for (int i = 0; i < gl_size; i++) { Item *it = _get_item_at_pos(it_from, it_to, glyphs[i].start); diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index bfbc92a8d48..d91d29d417f 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -4438,7 +4438,7 @@ struct AnimationCompressionDataState { void commit_temp_packets() { if (temp_packets.size() == 0) { - return; //nohing to do + return; //nothing to do } //#define DEBUG_PACKET_PUSH #ifdef DEBUG_PACKET_PUSH diff --git a/scene/resources/default_theme/default_theme_icons_builders.py b/scene/resources/default_theme/default_theme_icons_builders.py index 4dd5819a23e..c4d132294c5 100644 --- a/scene/resources/default_theme/default_theme_icons_builders.py +++ b/scene/resources/default_theme/default_theme_icons_builders.py @@ -11,14 +11,12 @@ from platform_methods import subprocess_main # See also `editor/icons/editor_icons_builders.py`. def make_default_theme_icons_action(target, source, env): - dst = target[0] svg_icons = source icons_string = StringIO() for f in svg_icons: - fname = str(f) icons_string.write('\t"') @@ -49,7 +47,6 @@ def make_default_theme_icons_action(target, source, env): index = 0 for f in svg_icons: - fname = str(f) # Trim the `.svg` extension from the string. diff --git a/servers/audio/effects/audio_effect_record.cpp b/servers/audio/effects/audio_effect_record.cpp index e82f6e518e9..e6b8a5adb3f 100644 --- a/servers/audio/effects/audio_effect_record.cpp +++ b/servers/audio/effects/audio_effect_record.cpp @@ -133,7 +133,7 @@ Ref AudioEffectRecord::instantiate() { ins->base = Ref(this); ins->is_recording = false; - //Re-using the buffer size calculations from audio_effect_delay.cpp + //Reusing the buffer size calculations from audio_effect_delay.cpp float ring_buffer_max_size = IO_BUFFER_SIZE_MS; ring_buffer_max_size /= 1000.0; //convert to seconds ring_buffer_max_size *= AudioServer::get_singleton()->get_mix_rate(); diff --git a/servers/physics_3d/godot_space_3d.cpp b/servers/physics_3d/godot_space_3d.cpp index 35f6fa023d2..b5ea32fc126 100644 --- a/servers/physics_3d/godot_space_3d.cpp +++ b/servers/physics_3d/godot_space_3d.cpp @@ -464,7 +464,7 @@ static void _rest_cbk_result(const Vector3 &p_point_A, int p_index_A, const Vect real_t tested_len = is_best_result ? rd->best_result.len : len; for (; result_index < prev_result_count - 1; ++result_index) { if (tested_len > rd->other_results[result_index].len) { - // Re-using a previous result. + // Reusing a previous result. rd->result_count--; break; } diff --git a/servers/physics_3d/joints/godot_pin_joint_3d.cpp b/servers/physics_3d/joints/godot_pin_joint_3d.cpp index 05ae0839e4f..304c05f59d5 100644 --- a/servers/physics_3d/joints/godot_pin_joint_3d.cpp +++ b/servers/physics_3d/joints/godot_pin_joint_3d.cpp @@ -96,7 +96,7 @@ void GodotPinJoint3D::solve(real_t p_step) { Vector3 rel_pos1 = pivotAInW - A->get_transform().origin; Vector3 rel_pos2 = pivotBInW - B->get_transform().origin; - //this jacobian entry could be re-used for all iterations + //this jacobian entry could be reused for all iterations Vector3 vel1 = A->get_velocity_in_local_point(rel_pos1); Vector3 vel2 = B->get_velocity_in_local_point(rel_pos2); diff --git a/servers/rendering/renderer_rd/effects/ss_effects.cpp b/servers/rendering/renderer_rd/effects/ss_effects.cpp index 96e36835609..19006087c01 100644 --- a/servers/rendering/renderer_rd/effects/ss_effects.cpp +++ b/servers/rendering/renderer_rd/effects/ss_effects.cpp @@ -1430,7 +1430,7 @@ void SSEffects::screen_space_reflection(Ref p_render_buffe push_constant.camera_z_far = p_projections[v].get_z_far(); push_constant.camera_z_near = p_projections[v].get_z_near(); push_constant.orthogonal = p_projections[v].is_orthogonal(); - push_constant.filter = false; //enabling causes arctifacts + push_constant.filter = false; //enabling causes artifacts push_constant.screen_size[0] = p_ssr_buffers.size.x; push_constant.screen_size[1] = p_ssr_buffers.size.y; diff --git a/servers/rendering/renderer_rd/environment/gi.cpp b/servers/rendering/renderer_rd/environment/gi.cpp index 964d4d9adf0..19cf73f7f82 100644 --- a/servers/rendering/renderer_rd/environment/gi.cpp +++ b/servers/rendering/renderer_rd/environment/gi.cpp @@ -2215,7 +2215,7 @@ void GI::SDFGI::render_region(Ref p_render_buffers, int p_ RD::get_singleton()->compute_list_dispatch_threads(compute_list, cascade_size, cascade_size, cascade_size); RD::get_singleton()->compute_list_add_barrier(compute_list); - //run one pass of fullsize jumpflood to fix up half size arctifacts + //run one pass of fullsize jumpflood to fix up half size artifacts push_constant.half_size = false; push_constant.step_size = 1; diff --git a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp index b9edc46aeee..68bc6ae47f2 100644 --- a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp +++ b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp @@ -200,7 +200,7 @@ RID RenderForwardMobile::RenderBufferDataForwardMobile::get_color_fbs(Framebuffe // Now define our subpasses Vector passes; - // Define our base pass, we'll be re-using this + // Define our base pass, we'll be reusing this RD::FramebufferPass pass; pass.color_attachments.push_back(0); pass.depth_attachment = 1; @@ -307,7 +307,7 @@ RID RenderForwardMobile::reflection_probe_create_framebuffer(RID p_color, RID p_ Vector passes; RD::FramebufferPass pass; - // re-using the same attachments + // reusing the same attachments pass.color_attachments.push_back(0); pass.depth_attachment = 1; diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp index 16bc36f4b83..4297b7dd630 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp @@ -368,7 +368,7 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende buffers.base_texture = rb->get_internal_texture(i); buffers.depth_texture = rb->get_depth_texture(i); - // In stereo p_render_data->z_near and p_render_data->z_far can be offset for our combined frustrum + // In stereo p_render_data->z_near and p_render_data->z_far can be offset for our combined frustum float z_near = p_render_data->scene_data->view_projection[i].get_z_near(); float z_far = p_render_data->scene_data->view_projection[i].get_z_far(); bokeh_dof->bokeh_dof_compute(buffers, p_render_data->camera_attributes, z_near, z_far, p_render_data->scene_data->cam_orthogonal); @@ -391,7 +391,7 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende buffers.depth_texture = rb->get_depth_texture(i); buffers.base_fb = FramebufferCacheRD::get_singleton()->get_cache(buffers.base_texture); // TODO move this into bokeh_dof_raster, we can do this internally - // In stereo p_render_data->z_near and p_render_data->z_far can be offset for our combined frustrum + // In stereo p_render_data->z_near and p_render_data->z_far can be offset for our combined frustum float z_near = p_render_data->scene_data->view_projection[i].get_z_near(); float z_far = p_render_data->scene_data->view_projection[i].get_z_far(); bokeh_dof->bokeh_dof_raster(buffers, p_render_data->camera_attributes, z_near, z_far, p_render_data->scene_data->cam_orthogonal); diff --git a/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_scale.glsl b/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_scale.glsl index a7da0812df9..4df74b86268 100644 --- a/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_scale.glsl +++ b/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_scale.glsl @@ -36,7 +36,7 @@ void main() { if (any(greaterThanEqual(ssC.xy, params.screen_size))) { //too large, do nothing return; } - //do not filter, SSR will generate arctifacts if this is done + //do not filter, SSR will generate artifacts if this is done float divisor = 0.0; vec4 color; diff --git a/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl b/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl index 9dda62c28de..24ef0a03b01 100644 --- a/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl +++ b/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl @@ -567,7 +567,7 @@ void light_process_omni(uint idx, vec3 vertex, vec3 eye_vec, vec3 normal, vec3 v { vec4 clamp_rect = omni_lights.data[idx].atlas_rect; - //redo shadowmapping, but shrink the model a bit to avoid arctifacts + //redo shadowmapping, but shrink the model a bit to avoid artifacts vec4 splane = (omni_lights.data[idx].shadow_matrix * vec4(vertex - normalize(normal_interp) * omni_lights.data[idx].transmittance_bias, 1.0)); float shadow_len = length(splane.xyz); diff --git a/servers/rendering/renderer_scene_cull.cpp b/servers/rendering/renderer_scene_cull.cpp index c5eabba326c..efd2a9fc947 100644 --- a/servers/rendering/renderer_scene_cull.cpp +++ b/servers/rendering/renderer_scene_cull.cpp @@ -1970,7 +1970,7 @@ void RendererSceneCull::_update_instance_aabb(Instance *p_instance) { } } - // This is why I didn't re-use Instance::aabb to implement custom AABBs + // This is why I didn't reuse Instance::aabb to implement custom AABBs if (p_instance->extra_margin) { new_aabb.grow_by(p_instance->extra_margin); } diff --git a/servers/rendering/rendering_device.cpp b/servers/rendering/rendering_device.cpp index 5b78b1a7439..17a45b7f2d6 100644 --- a/servers/rendering/rendering_device.cpp +++ b/servers/rendering/rendering_device.cpp @@ -521,15 +521,15 @@ Error RenderingDevice::_reflect_spirv(const Vector &p_spir if (r_reflection_data.uniforms[set][k].binding == (uint32_t)info.binding) { // Already exists, verify that it's the same type. ERR_FAIL_COND_V_MSG(r_reflection_data.uniforms[set][k].type != info.type, FAILED, - "On shader stage '" + String(shader_stage_names[stage]) + "', uniform '" + binding.name + "' trying to re-use location for set=" + itos(set) + ", binding=" + itos(info.binding) + " with different uniform type."); + "On shader stage '" + String(shader_stage_names[stage]) + "', uniform '" + binding.name + "' trying to reuse location for set=" + itos(set) + ", binding=" + itos(info.binding) + " with different uniform type."); // Also, verify that it's the same size. ERR_FAIL_COND_V_MSG(r_reflection_data.uniforms[set][k].length != info.length, FAILED, - "On shader stage '" + String(shader_stage_names[stage]) + "', uniform '" + binding.name + "' trying to re-use location for set=" + itos(set) + ", binding=" + itos(info.binding) + " with different uniform size."); + "On shader stage '" + String(shader_stage_names[stage]) + "', uniform '" + binding.name + "' trying to reuse location for set=" + itos(set) + ", binding=" + itos(info.binding) + " with different uniform size."); // Also, verify that it has the same writability. ERR_FAIL_COND_V_MSG(r_reflection_data.uniforms[set][k].writable != info.writable, FAILED, - "On shader stage '" + String(shader_stage_names[stage]) + "', uniform '" + binding.name + "' trying to re-use location for set=" + itos(set) + ", binding=" + itos(info.binding) + " with different writability."); + "On shader stage '" + String(shader_stage_names[stage]) + "', uniform '" + binding.name + "' trying to reuse location for set=" + itos(set) + ", binding=" + itos(info.binding) + " with different writability."); // Just append stage mask and return. r_reflection_data.uniforms.write[set].write[k].stages_mask.set_flag(stage_flag); diff --git a/tests/scene/test_text_edit.h b/tests/scene/test_text_edit.h index f3f2b4cb342..fe4ac81b769 100644 --- a/tests/scene/test_text_edit.h +++ b/tests/scene/test_text_edit.h @@ -406,7 +406,7 @@ TEST_CASE("[SceneTree][TextEdit] text entry") { CHECK(text_edit->get_selection_to_line() == 1); SIGNAL_CHECK("caret_changed", empty_signal_args); - // insert before should move caret and selecion, and works when not editable. + // insert before should move caret and selection, and works when not editable. text_edit->set_editable(false); lines_edited_args.remove_at(0); text_edit->insert_line_at(0, "new");