diff options
149 files changed, 490 insertions, 559 deletions
diff --git a/core/image.cpp b/core/image.cpp index 41d70e6df6..07e705265d 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -775,7 +775,7 @@ void Image::crop_from_point(int p_x, int p_y, int p_width, int p_height) { ERR_FAIL_COND(p_y + p_height > MAX_HEIGHT); /* to save memory, cropping should be done in-place, however, since this function - will most likely either not be used much, or in critical areas, for now it wont, because + will most likely either not be used much, or in critical areas, for now it won't, because it's a waste of time. */ if (p_width == width && p_height == height && p_x == 0 && p_y == 0) diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 35b9a8610c..9e21287780 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -333,7 +333,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int len -= 12; buf += 12; - if (flags & 2) // Obsolete format with property seperate from subpath + if (flags & 2) // Obsolete format with property separate from subpath subnamecount++; uint32_t total = namecount + subnamecount; diff --git a/core/list.h b/core/list.h index a00372e39f..f977df4634 100644 --- a/core/list.h +++ b/core/list.h @@ -388,7 +388,7 @@ public: }; /** - * return wether the list is empty + * return whether the list is empty */ _FORCE_INLINE_ bool empty() const { diff --git a/core/math/octree.h b/core/math/octree.h index 7411e4aa52..4e3d6257f0 100644 --- a/core/math/octree.h +++ b/core/math/octree.h @@ -612,7 +612,7 @@ bool Octree<T, use_pairs, AL>::_remove_element_from_octant(Element *p_element, O bool unpaired = false; if (use_pairs && p_octant->last_pass != pass) { - // check wether we should unpair stuff + // check whether we should unpair stuff // always test pairable typename List<Element *, AL>::Element *E = p_octant->pairable_elements.front(); while (E) { diff --git a/core/method_bind.h b/core/method_bind.h index 2e5712c3fe..e02d64c935 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -243,7 +243,7 @@ public: PropertyInfo get_argument_info(int p_argument) const; PropertyInfo get_return_info() const; - void set_argument_names(const Vector<StringName> &p_names); //set by class, db, cant be inferred otherwise + void set_argument_names(const Vector<StringName> &p_names); //set by class, db, can't be inferred otherwise Vector<StringName> get_argument_names() const; #endif diff --git a/core/oa_hash_map.h b/core/oa_hash_map.h index c3b32af545..280aea6a14 100644 --- a/core/oa_hash_map.h +++ b/core/oa_hash_map.h @@ -36,7 +36,7 @@ #include "os/copymem.h" #include "os/memory.h" -// uncomment this to disable intial local storage. +// uncomment this to disable initial local storage. #define OA_HASH_MAP_INITIAL_LOCAL_STORAGE /** diff --git a/core/project_settings.cpp b/core/project_settings.cpp index 0c19de382c..0991c0df68 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -167,7 +167,7 @@ bool ProjectSettings::_set(const StringName &p_name, const Variant &p_value) { } if (props.has(p_name)) { - if (!props[p_name].overrided) + if (!props[p_name].overridden) props[p_name].variant = p_value; } else { diff --git a/core/project_settings.h b/core/project_settings.h index e85092e431..eba53441cf 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -58,19 +58,19 @@ protected: Variant variant; Variant initial; bool hide_from_editor; - bool overrided; + bool overridden; VariantContainer() : order(0), persist(false), hide_from_editor(false), - overrided(false) { + overridden(false) { } VariantContainer(const Variant &p_variant, int p_order, bool p_persist = false) : order(p_order), persist(p_persist), variant(p_variant), hide_from_editor(false), - overrided(false) { + overridden(false) { } }; diff --git a/core/script_language.h b/core/script_language.h index 66614a293c..d1da0a3b72 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -179,7 +179,7 @@ class ScriptCodeCompletionCache { public: virtual RES get_cached_resource(const String &p_path) = 0; - static ScriptCodeCompletionCache *get_sigleton() { return singleton; } + static ScriptCodeCompletionCache *get_singleton() { return singleton; } ScriptCodeCompletionCache(); }; diff --git a/core/ustring.cpp b/core/ustring.cpp index 1fce4f1826..d445e4ed47 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -2217,7 +2217,7 @@ int String::find(const String &p_str, int p_from) const { const int len = length(); if (src_len == 0 || len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); const CharType *str = p_str.c_str(); @@ -2256,7 +2256,7 @@ int String::find(const char *p_str, int p_from) const { const int len = length(); if (len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); @@ -2317,7 +2317,7 @@ int String::findmk(const Vector<String> &p_keys, int p_from, int *r_key) const { int len = length(); if (len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); @@ -2366,7 +2366,7 @@ int String::findn(const String &p_str, int p_from) const { int src_len = p_str.length(); if (src_len == 0 || length() == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *srcd = c_str(); @@ -2462,7 +2462,7 @@ int String::rfindn(const String &p_str, int p_from) const { int len = length(); if (src_len == 0 || len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); @@ -3167,7 +3167,7 @@ String String::http_unescape() const { if ((ord1 >= '0' && ord1 <= '9') || (ord1 >= 'A' && ord1 <= 'Z')) { CharType ord2 = ord_at(i + 2); if ((ord2 >= '0' && ord2 <= '9') || (ord2 >= 'A' && ord2 <= 'Z')) { - char bytes[2] = { ord1, ord2 }; + char bytes[2] = { (char)ord1, (char)ord2 }; res += (char)strtol(bytes, NULL, 16); i += 2; } diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml index 9af81ae299..8b3e6345ec 100644 --- a/doc/classes/@GlobalScope.xml +++ b/doc/classes/@GlobalScope.xml @@ -1077,7 +1077,7 @@ Joypad Right Analog Trigger </constant> <constant name="OK" value="0" enum="Error"> - Functions that return Error return OK when no error occured. Most functions don't return errors and/or just print errors to STDOUT. + Functions that return Error return OK when no error occurred. Most functions don't return errors and/or just print errors to STDOUT. </constant> <constant name="FAILED" value="1" enum="Error"> Generic error. diff --git a/doc/classes/ARVRInterface.xml b/doc/classes/ARVRInterface.xml index c941b126a4..50f49ae66c 100644 --- a/doc/classes/ARVRInterface.xml +++ b/doc/classes/ARVRInterface.xml @@ -91,7 +91,7 @@ This interface support AR (video background and real world tracking). </constant> <constant name="ARVR_EXTERNAL" value="8" enum="Capabilities"> - This interface outputs to an external device, if the main viewport is used the on screen output is an unmodified buffer of either the left or right eye (stretched if the viewport size is not changed to the same aspect ratio of get_render_targetsize. Using a seperate viewport node frees up the main viewport for other purposes. + This interface outputs to an external device, if the main viewport is used the on screen output is an unmodified buffer of either the left or right eye (stretched if the viewport size is not changed to the same aspect ratio of get_render_targetsize. Using a separate viewport node frees up the main viewport for other purposes. </constant> <constant name="EYE_MONO" value="0" enum="Eyes"> Mono output, this is mostly used internally when retrieving positioning information for our camera node or when stereo scopic rendering is not supported. diff --git a/doc/classes/ARVRServer.xml b/doc/classes/ARVRServer.xml index 0b1db11a4d..1eec98a40d 100644 --- a/doc/classes/ARVRServer.xml +++ b/doc/classes/ARVRServer.xml @@ -49,7 +49,7 @@ <return type="int"> </return> <description> - Get the number of interfaces currently registered with the AR/VR server. If you're game supports multiple AR/VR platforms you can look throught the available interface and either present the user with a selection or simply try an initialize each interface and use the first one that returns true. + Get the number of interfaces currently registered with the AR/VR server. If you're game supports multiple AR/VR platforms you can look through the available interface and either present the user with a selection or simply try an initialize each interface and use the first one that returns true. </description> </method> <method name="get_interfaces" qualifiers="const"> diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml index 3ce0457755..9f3263528d 100644 --- a/doc/classes/Control.xml +++ b/doc/classes/Control.xml @@ -8,7 +8,7 @@ For more information on Godot's UI system, anchors, margins, and containers, see the related tutorials in the manual. To build flexible UIs, you'll need a mix of UI elements that inherit from [code]Control[/code] and [Container] nodes. [b]User Interface nodes and input[/b] Godot sends input events to the scene's root node first, by calling [method Node._input]. [method Node._input] forwards the event down the node tree to the nodes under the mouse cursor, or on keyboard focus. To do so, it calls [method MainLoop._input_event]. Call [method accept_event] so no other node receives the event. Once you accepted an input, it becomes handled so [method Node._unhandled_input] will not process it. - Only one [code]Control[/code] node can be in keyboard focus. Only the node in focus will receive keyboard events. To get the foucs, call [method set_focus_mode]. [code]Control[/code] nodes lose focus when another node grabs it, or if you hide the node in focus. + Only one [code]Control[/code] node can be in keyboard focus. Only the node in focus will receive keyboard events. To get the focus, call [method set_focus_mode]. [code]Control[/code] nodes lose focus when another node grabs it, or if you hide the node in focus. Call [method set_ignore_mouse] to tell a [code]Control[/code] node to ignore mouse or touch events. You'll need it if you place an icon on top of a button. [Theme] resources change the Control's appearance. If you change the [Theme] on a [code]Control[/code] node, it affects all of its children. To override some of the theme's parameters, call one of the [code]add_*_override[/code] methods, like [method add_font_override]. You can override the theme with the inspector. </description> diff --git a/doc/classes/Generic6DOFJoint.xml b/doc/classes/Generic6DOFJoint.xml index f5b3df714b..01009edf9a 100644 --- a/doc/classes/Generic6DOFJoint.xml +++ b/doc/classes/Generic6DOFJoint.xml @@ -24,10 +24,10 @@ When rotating across x-axis, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. </member> <member name="angular_limit_x/force_limit" type="float" setter="set_param_x" getter="get_param_x"> - The maximum amount of force that can occur, when rotating arround x-axis. + The maximum amount of force that can occur, when rotating around x-axis. </member> <member name="angular_limit_x/lower_angle" type="float" setter="_set_angular_lo_limit_x" getter="_get_angular_lo_limit_x"> - The minimum rotation in negative direction to break loose and rotate arround the x-axis. + The minimum rotation in negative direction to break loose and rotate around the x-axis. </member> <member name="angular_limit_x/restitution" type="float" setter="set_param_x" getter="get_param_x"> The amount of rotational restitution across the x-axis. The lower, the more restitution occurs. @@ -36,7 +36,7 @@ The speed of all rotations across the x-axis. </member> <member name="angular_limit_x/upper_angle" type="float" setter="_set_angular_hi_limit_x" getter="_get_angular_hi_limit_x"> - The minimum rotation in positive direction to break loose and rotate arround the x-axis. + The minimum rotation in positive direction to break loose and rotate around the x-axis. </member> <member name="angular_limit_y/damping" type="float" setter="set_param_y" getter="get_param_y"> The amount of rotational damping across the y-axis. The lower, the more dampening occurs. @@ -48,10 +48,10 @@ When rotating across y-axis, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. </member> <member name="angular_limit_y/force_limit" type="float" setter="set_param_y" getter="get_param_y"> - The maximum amount of force that can occur, when rotating arround y-axis. + The maximum amount of force that can occur, when rotating around y-axis. </member> <member name="angular_limit_y/lower_angle" type="float" setter="_set_angular_lo_limit_y" getter="_get_angular_lo_limit_y"> - The minimum rotation in negative direction to break loose and rotate arround the y-axis. + The minimum rotation in negative direction to break loose and rotate around the y-axis. </member> <member name="angular_limit_y/restitution" type="float" setter="set_param_y" getter="get_param_y"> The amount of rotational restitution across the y-axis. The lower, the more restitution occurs. @@ -60,7 +60,7 @@ The speed of all rotations across the y-axis. </member> <member name="angular_limit_y/upper_angle" type="float" setter="_set_angular_hi_limit_y" getter="_get_angular_hi_limit_y"> - The minimum rotation in positive direction to break loose and rotate arround the y-axis. + The minimum rotation in positive direction to break loose and rotate around the y-axis. </member> <member name="angular_limit_z/damping" type="float" setter="set_param_z" getter="get_param_z"> The amount of rotational damping across the z-axis. The lower, the more dampening occurs. @@ -72,10 +72,10 @@ When rotating across z-axis, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. </member> <member name="angular_limit_z/force_limit" type="float" setter="set_param_z" getter="get_param_z"> - The maximum amount of force that can occur, when rotating arround z-axis. + The maximum amount of force that can occur, when rotating around z-axis. </member> <member name="angular_limit_z/lower_angle" type="float" setter="_set_angular_lo_limit_z" getter="_get_angular_lo_limit_z"> - The minimum rotation in negative direction to break loose and rotate arround the z-axis. + The minimum rotation in negative direction to break loose and rotate around the z-axis. </member> <member name="angular_limit_z/restitution" type="float" setter="set_param_z" getter="get_param_z"> The amount of rotational restitution across the z-axis. The lower, the more restitution occurs. @@ -84,7 +84,7 @@ The speed of all rotations across the z-axis. </member> <member name="angular_limit_z/upper_angle" type="float" setter="_set_angular_hi_limit_z" getter="_get_angular_hi_limit_z"> - The minimum rotation in positive direction to break loose and rotate arround the z-axis. + The minimum rotation in positive direction to break loose and rotate around the z-axis. </member> <member name="angular_motor_x/enabled" type="bool" setter="set_flag_x" getter="get_flag_x"> If [code]true[/code] a rotating motor at the x-axis is enabled. @@ -185,10 +185,10 @@ The amount of damping that happens at the linear motion across the axes. </constant> <constant name="PARAM_ANGULAR_LOWER_LIMIT" value="5" enum="Param"> - The minimum rotation in negative direction to break loose and rotate arround the axes. + The minimum rotation in negative direction to break loose and rotate around the axes. </constant> <constant name="PARAM_ANGULAR_UPPER_LIMIT" value="6" enum="Param"> - The minimum rotation in positive direction to break loose and rotate arround the axes. + The minimum rotation in positive direction to break loose and rotate around the axes. </constant> <constant name="PARAM_ANGULAR_LIMIT_SOFTNESS" value="7" enum="Param"> The speed of all rotations across the axes. @@ -200,7 +200,7 @@ The amount of rotational restitution across the axes. The lower, the more restitution occurs. </constant> <constant name="PARAM_ANGULAR_FORCE_LIMIT" value="10" enum="Param"> - The maximum amount of force that can occur, when rotating arround the axes. + The maximum amount of force that can occur, when rotating around the axes. </constant> <constant name="PARAM_ANGULAR_ERP" value="11" enum="Param"> When rotating across the axes, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. diff --git a/doc/classes/HingeJoint.xml b/doc/classes/HingeJoint.xml index dab7f4127c..b6e2f6f9a2 100644 --- a/doc/classes/HingeJoint.xml +++ b/doc/classes/HingeJoint.xml @@ -4,7 +4,7 @@ A hinge between two 3D bodies. </brief_description> <description> - Normaly uses the z-axis of body A as the hinge axis, another axis can be specified when adding it manually though. + Normally uses the z-axis of body A as the hinge axis, another axis can be specified when adding it manually though. </description> <tutorials> </tutorials> @@ -40,12 +40,12 @@ Target speed for the motor. </member> <member name="params/bias" type="float" setter="set_param" getter="get_param"> - The speed with wich the two bodies get pulled together when they move in different directions. + The speed with which the two bodies get pulled together when they move in different directions. </member> </members> <constants> <constant name="PARAM_BIAS" value="0" enum="Param"> - The speed with wich the two bodies get pulled together when they move in different directions. + The speed with which the two bodies get pulled together when they move in different directions. </constant> <constant name="PARAM_LIMIT_UPPER" value="1" enum="Param"> The maximum rotation. only active if [member angular_limit/enable] is [code]true[/code]. diff --git a/doc/classes/Input.xml b/doc/classes/Input.xml index 30fc80dae9..5b0b63abec 100644 --- a/doc/classes/Input.xml +++ b/doc/classes/Input.xml @@ -17,7 +17,7 @@ <argument index="0" name="action" type="String"> </argument> <description> - This will simulate pressing the specificed action. + This will simulate pressing the specified action. </description> </method> <method name="action_release"> diff --git a/doc/classes/InputEventMouse.xml b/doc/classes/InputEventMouse.xml index 7d5a60ff0d..5d9cda8605 100644 --- a/doc/classes/InputEventMouse.xml +++ b/doc/classes/InputEventMouse.xml @@ -4,7 +4,7 @@ Base input event type for mouse events. </brief_description> <description> - Stores general mouse events informations. + Stores general mouse events information. </description> <tutorials> http://docs.godotengine.org/en/3.0/learning/features/inputs/inputevent.html @@ -21,7 +21,7 @@ Mouse position relative to the current [Viewport] when used in [method Control._gui_input], otherwise is at 0,0. </member> <member name="position" type="Vector2" setter="set_position" getter="get_position"> - Mouse local position relative to the [Viewport]. If used in [method Control._gui_input] the position is relative to the current [Control] wich is under the mouse. + Mouse local position relative to the [Viewport]. If used in [method Control._gui_input] the position is relative to the current [Control] which is under the mouse. </member> </members> <constants> diff --git a/doc/classes/InputEventMouseButton.xml b/doc/classes/InputEventMouseButton.xml index 6b93fbfa67..1f7aa19386 100644 --- a/doc/classes/InputEventMouseButton.xml +++ b/doc/classes/InputEventMouseButton.xml @@ -4,7 +4,7 @@ Input event type for mouse button events. </brief_description> <description> - Contains mouse click informations. See [method Node._input]. + Contains mouse click information. See [method Node._input]. </description> <tutorials> http://docs.godotengine.org/en/3.0/learning/features/inputs/mouse_and_input_coordinates.html diff --git a/doc/classes/InputEventMouseMotion.xml b/doc/classes/InputEventMouseMotion.xml index 4b3126dc72..1183d1c16c 100644 --- a/doc/classes/InputEventMouseMotion.xml +++ b/doc/classes/InputEventMouseMotion.xml @@ -4,7 +4,7 @@ Input event type for mouse motion events. </brief_description> <description> - Contains mouse motion informations. Supports relative, absolute positions and speed. See [method Node._input]. + Contains mouse motion information. Supports relative, absolute positions and speed. See [method Node._input]. </description> <tutorials> http://docs.godotengine.org/en/3.0/learning/features/inputs/mouse_and_input_coordinates.html diff --git a/doc/classes/InputEventScreenDrag.xml b/doc/classes/InputEventScreenDrag.xml index bbf1411189..950f79018e 100644 --- a/doc/classes/InputEventScreenDrag.xml +++ b/doc/classes/InputEventScreenDrag.xml @@ -5,7 +5,7 @@ (only available on mobile devices) </brief_description> <description> - Contains screen drag informations. See [method Node._input]. + Contains screen drag information. See [method Node._input]. </description> <tutorials> http://docs.godotengine.org/en/3.0/learning/features/inputs/inputevent.html diff --git a/doc/classes/InputEventWithModifiers.xml b/doc/classes/InputEventWithModifiers.xml index 68a5540402..3dc102aa61 100644 --- a/doc/classes/InputEventWithModifiers.xml +++ b/doc/classes/InputEventWithModifiers.xml @@ -4,7 +4,7 @@ Base class for keys events with modifiers. </brief_description> <description> - Contains keys events informations with modifiers support like [code]SHIFT[/code] or [code]ALT[/code]. See [method Node._input]. + Contains keys events information with modifiers support like [code]SHIFT[/code] or [code]ALT[/code]. See [method Node._input]. </description> <tutorials> http://docs.godotengine.org/en/3.0/learning/features/inputs/inputevent.html diff --git a/doc/classes/Joint.xml b/doc/classes/Joint.xml index c26bbdb218..7b1497e99a 100644 --- a/doc/classes/Joint.xml +++ b/doc/classes/Joint.xml @@ -23,7 +23,7 @@ The [Node], the second side of the Joint attaches to. </member> <member name="solver/priority" type="int" setter="set_solver_priority" getter="get_solver_priority"> - The order in wich the solver is executed compared to the other [Joints], the lower, the earlier. + The order in which the solver is executed compared to the other [Joints], the lower, the earlier. </member> </members> <constants> diff --git a/doc/classes/KinematicBody.xml b/doc/classes/KinematicBody.xml index 747c46cced..a782a55504 100644 --- a/doc/classes/KinematicBody.xml +++ b/doc/classes/KinematicBody.xml @@ -27,7 +27,7 @@ <argument index="0" name="slide_idx" type="int"> </argument> <description> - Returns a [KinematicCollision], which contains information about a collision that occured during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1). + Returns a [KinematicCollision], which contains information about a collision that occurred during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1). </description> </method> <method name="get_slide_count" qualifiers="const"> @@ -87,7 +87,7 @@ If the body is standing on a slope and the horizontal speed (relative to the floor's speed) goes below [code]slope_stop_min_velocity[/code], the body will stop completely. This prevents the body from sliding down slopes when you include gravity in [code]linear_velocity[/code]. When set to lower values, the body will not be able to stand still on steep slopes. If the body collides, it will change direction a maximum of [code]max_bounces[/code] times before it stops. [code]floor_max_angle[/code] is the maximum angle (in radians) where a slope is still considered a floor (or a ceiling), rather than a wall. The default value equals 45 degrees. - Returns the movement that remained when the body stopped. To get more detailed information about collisions that occured, use [method get_slide_collision]. + Returns the movement that remained when the body stopped. To get more detailed information about collisions that occurred, use [method get_slide_collision]. </description> </method> <method name="test_move"> diff --git a/doc/classes/KinematicBody2D.xml b/doc/classes/KinematicBody2D.xml index 5c12a0c8c0..d00a887e42 100644 --- a/doc/classes/KinematicBody2D.xml +++ b/doc/classes/KinematicBody2D.xml @@ -26,7 +26,7 @@ <argument index="0" name="slide_idx" type="int"> </argument> <description> - Returns a [KinematicCollision2D], which contains information about a collision that occured during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1). + Returns a [KinematicCollision2D], which contains information about a collision that occurred during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1). </description> </method> <method name="get_slide_count" qualifiers="const"> @@ -86,7 +86,7 @@ If the body is standing on a slope and the horizontal speed (relative to the floor's speed) goes below [code]slope_stop_min_velocity[/code], the body will stop completely. This prevents the body from sliding down slopes when you include gravity in [code]linear_velocity[/code]. When set to lower values, the body will not be able to stand still on steep slopes. If the body collides, it will change direction a maximum of [code]max_bounces[/code] times before it stops. [code]floor_max_angle[/code] is the maximum angle (in radians) where a slope is still considered a floor (or a ceiling), rather than a wall. The default value equals 45 degrees. - Returns the movement that remained when the body stopped. To get more detailed information about collisions that occured, use [method get_slide_collision]. + Returns the movement that remained when the body stopped. To get more detailed information about collisions that occurred, use [method get_slide_collision]. </description> </method> <method name="test_move"> diff --git a/doc/classes/Line2D.xml b/doc/classes/Line2D.xml index 4ad0d7575f..2898a84491 100644 --- a/doc/classes/Line2D.xml +++ b/doc/classes/Line2D.xml @@ -71,7 +71,7 @@ The gradient is drawn through the whole line from start to finish. The default color will not be used if a gradient is set. </member> <member name="joint_mode" type="int" setter="set_joint_mode" getter="get_joint_mode" enum="Line2D.LineJointMode"> - The style for the points inbetween the start and the end. + The style for the points between the start and the end. </member> <member name="points" type="PoolVector2Array" setter="set_points" getter="get_points"> The points that form the lines. The line is drawn between every point set in this array. diff --git a/doc/classes/LineEdit.xml b/doc/classes/LineEdit.xml index 3a3fda72cc..c8798b8ee4 100644 --- a/doc/classes/LineEdit.xml +++ b/doc/classes/LineEdit.xml @@ -86,7 +86,7 @@ Duration (in seconds) of a caret's blinking cycle. </member> <member name="caret_position" type="int" setter="set_cursor_position" getter="get_cursor_position"> - The cursor's position inside the [code]LineEdit[/code]. When set, the text may scroll to accomodate it. + The cursor's position inside the [code]LineEdit[/code]. When set, the text may scroll to accommodate it. </member> <member name="context_menu_enabled" type="bool" setter="set_context_menu_enabled" getter="is_context_menu_enabled"> If [code]true[/code] the context menu will appear when right clicked. diff --git a/doc/classes/MultiMeshInstance.xml b/doc/classes/MultiMeshInstance.xml index e09327e2c9..2896f514aa 100644 --- a/doc/classes/MultiMeshInstance.xml +++ b/doc/classes/MultiMeshInstance.xml @@ -4,7 +4,8 @@ Node that instances a [MultiMesh]. </brief_description> <description> - MultiMeshInstance is a [Node] that takes a [MultiMesh] resource and adds it to the current scenario by creating an instance of it (yes, this is an instance of instances). + [code]MultiMeshInstance[/code] is a specialized node to instance [GeometryInstance]s based on a [MultiMesh] resource. + This is useful to optimize the rendering of a high amount of instances of a given mesh (for example tree in a forest or grass strands). </description> <tutorials> </tutorials> @@ -14,6 +15,7 @@ </methods> <members> <member name="multimesh" type="MultiMesh" setter="set_multimesh" getter="get_multimesh"> + The [MultiMesh] resource that will be used and shared among all instances of the [code]MultiMeshInstance[/code]. </member> </members> <constants> diff --git a/doc/classes/Node.xml b/doc/classes/Node.xml index e7627e11c5..6f64c865cd 100644 --- a/doc/classes/Node.xml +++ b/doc/classes/Node.xml @@ -44,7 +44,7 @@ </argument> <description> Called when there is an input event. The input event propagates through the node tree until a node consumes it. - It is only called if input processing is enabled, which is done automatically if this method is overriden, and can be toggled with [method set_process_input]. + It is only called if input processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process_input]. </description> </method> <method name="_physics_process" qualifiers="virtual"> @@ -54,7 +54,7 @@ </argument> <description> Called during the physics processing step of the main loop. Physics processing means that the frame rate is synced to the physics, i.e. the [code]delta[/code] variable should be constant. - It is only called if physics processing is enabled, which is done automatically if this method is overriden, and can be toggled with [method set_physics_process]. + It is only called if physics processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_physics_process]. Corresponds to the NOTIFICATION_PHYSICS_PROCESS notification in [method Object._notification]. </description> </method> @@ -65,7 +65,7 @@ </argument> <description> Called during the processing step of the main loop. Processing happens at every frame and as fast as possible, so the [code]delta[/code] time since the previous frame is not constant. - It is only called if processing is enabled, which is done automatically if this method is overriden, and can be toggled with [method set_process]. + It is only called if processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process]. Corresponds to the NOTIFICATION_PROCESS notification in [method Object._notification]. </description> </method> @@ -84,7 +84,7 @@ </argument> <description> Propagated to all nodes when the previous InputEvent is not consumed by any nodes. - It is only called if unhandled input processing is enabled, which is done automatically if this method is overriden, and can be toggled with [method set_process_unhandled_input]. + It is only called if unhandled input processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process_unhandled_input]. </description> </method> <method name="_unhandled_key_input" qualifiers="virtual"> @@ -656,7 +656,7 @@ <argument index="0" name="enable" type="bool"> </argument> <description> - Enables or disables physics (i.e. fixed framerate) processing. When a node is being processed, it will receive a NOTIFICATION_PHYSICS_PROCESS at a fixed (usually 60 fps, see [OS] to change) interval (and the [method _physics_process] callback will be called if exists). Enabled automatically if [method _physics_process] is overriden. Any calls to this before [method _ready] will be ignored. + Enables or disables physics (i.e. fixed framerate) processing. When a node is being processed, it will receive a NOTIFICATION_PHYSICS_PROCESS at a fixed (usually 60 fps, see [OS] to change) interval (and the [method _physics_process] callback will be called if exists). Enabled automatically if [method _physics_process] is overridden. Any calls to this before [method _ready] will be ignored. </description> </method> <method name="set_physics_process_internal"> @@ -673,7 +673,7 @@ <argument index="0" name="enable" type="bool"> </argument> <description> - Enables or disables processing. When a node is being processed, it will receive a NOTIFICATION_PROCESS on every drawn frame (and the [method _process] callback will be called if exists). Enabled automatically if [method _process] is overriden. Any calls to this before [method _ready] will be ignored. + Enables or disables processing. When a node is being processed, it will receive a NOTIFICATION_PROCESS on every drawn frame (and the [method _process] callback will be called if exists). Enabled automatically if [method _process] is overridden. Any calls to this before [method _ready] will be ignored. </description> </method> <method name="set_process_input"> @@ -682,7 +682,7 @@ <argument index="0" name="enable" type="bool"> </argument> <description> - Enables or disables input processing. This is not required for GUI controls! Enabled automatically if [method _input] is overriden. Any calls to this before [method _ready] will be ignored. + Enables or disables input processing. This is not required for GUI controls! Enabled automatically if [method _input] is overridden. Any calls to this before [method _ready] will be ignored. </description> </method> <method name="set_process_internal"> @@ -699,7 +699,7 @@ <argument index="0" name="enable" type="bool"> </argument> <description> - Enables unhandled input processing. This is not required for GUI controls! It enables the node to receive all input that was not previously handled (usually by a [Control]). Enabled automatically if [method _unhandled_input] is overriden. Any calls to this before [method _ready] will be ignored. + Enables unhandled input processing. This is not required for GUI controls! It enables the node to receive all input that was not previously handled (usually by a [Control]). Enabled automatically if [method _unhandled_input] is overridden. Any calls to this before [method _ready] will be ignored. </description> </method> <method name="set_process_unhandled_key_input"> @@ -708,7 +708,7 @@ <argument index="0" name="enable" type="bool"> </argument> <description> - Enables unhandled key input processing. Enabled automatically if [method _unhandled_key_input] is overriden. Any calls to this before [method _ready] will be ignored. + Enables unhandled key input processing. Enabled automatically if [method _unhandled_key_input] is overridden. Any calls to this before [method _ready] will be ignored. </description> </method> <method name="set_scene_instance_load_placeholder"> diff --git a/doc/classes/PhysicsServer.xml b/doc/classes/PhysicsServer.xml index 2edf2f5e72..f822867666 100644 --- a/doc/classes/PhysicsServer.xml +++ b/doc/classes/PhysicsServer.xml @@ -1199,7 +1199,7 @@ If above 0, this value is the maximum value for an impulse that this Joint puts on it's ends. </constant> <constant name="HINGE_JOINT_BIAS" value="0" enum="HingeJointParam"> - The speed with wich the two bodies get pulled together when they move in different directions. + The speed with which the two bodies get pulled together when they move in different directions. </constant> <constant name="HINGE_JOINT_LIMIT_UPPER" value="1" enum="HingeJointParam"> The maximum rotation across the Hinge. @@ -1234,7 +1234,7 @@ The minimum difference between the pivot points on their x-axis before damping happens. </constant> <constant name="SLIDER_JOINT_LINEAR_LIMIT_SOFTNESS" value="2" enum="SliderJointParam"> - A factor applied to the movement accross the slider axis once the limits get surpassed. The lower, the slower the movement. + A factor applied to the movement across the slider axis once the limits get surpassed. The lower, the slower the movement. </constant> <constant name="SLIDER_JOINT_LINEAR_LIMIT_RESTITUTION" value="3" enum="SliderJointParam"> The amount of restitution once the limits are surpassed. The lower, the more velocityenergy gets lost. @@ -1243,7 +1243,7 @@ The amount of damping once the slider limits are surpassed. </constant> <constant name="SLIDER_JOINT_LINEAR_MOTION_SOFTNESS" value="5" enum="SliderJointParam"> - A factor applied to the movement accross the slider axis as long as the slider is in the limits. The lower, the slower the movement. + A factor applied to the movement across the slider axis as long as the slider is in the limits. The lower, the slower the movement. </constant> <constant name="SLIDER_JOINT_LINEAR_MOTION_RESTITUTION" value="6" enum="SliderJointParam"> The amount of restitution inside the slider limits. @@ -1252,13 +1252,13 @@ The amount of damping inside the slider limits. </constant> <constant name="SLIDER_JOINT_LINEAR_ORTHOGONAL_SOFTNESS" value="8" enum="SliderJointParam"> - A factor applied to the movement accross axes orthogonal to the slider. + A factor applied to the movement across axes orthogonal to the slider. </constant> <constant name="SLIDER_JOINT_LINEAR_ORTHOGONAL_RESTITUTION" value="9" enum="SliderJointParam"> - The amount of restitution when movement is accross axes orthogonal to the slider. + The amount of restitution when movement is across axes orthogonal to the slider. </constant> <constant name="SLIDER_JOINT_LINEAR_ORTHOGONAL_DAMPING" value="10" enum="SliderJointParam"> - The amount of damping when movement is accross axes orthogonal to the slider. + The amount of damping when movement is across axes orthogonal to the slider. </constant> <constant name="SLIDER_JOINT_ANGULAR_LIMIT_UPPER" value="11" enum="SliderJointParam"> The upper limit of rotation in the slider. @@ -1323,7 +1323,7 @@ The maximum difference between the pivot points' axes. </constant> <constant name="G6DOF_JOINT_LINEAR_LIMIT_SOFTNESS" value="2" enum="G6DOFJointAxisParam"> - A factor that gets applied to the movement accross the axes. The lower, the slower the movement. + A factor that gets applied to the movement across the axes. The lower, the slower the movement. </constant> <constant name="G6DOF_JOINT_LINEAR_RESTITUTION" value="3" enum="G6DOFJointAxisParam"> The amount of restitution on the axes movement. The lower, the more velocity-energy gets lost. @@ -1332,25 +1332,25 @@ The amount of damping that happens at the linear motion across the axes. </constant> <constant name="G6DOF_JOINT_ANGULAR_LOWER_LIMIT" value="5" enum="G6DOFJointAxisParam"> - The minimum rotation in negative direction to break loose and rotate arround the axes. + The minimum rotation in negative direction to break loose and rotate around the axes. </constant> <constant name="G6DOF_JOINT_ANGULAR_UPPER_LIMIT" value="6" enum="G6DOFJointAxisParam"> - The minimum rotation in positive direction to break loose and rotate arround the axes. + The minimum rotation in positive direction to break loose and rotate around the axes. </constant> <constant name="G6DOF_JOINT_ANGULAR_LIMIT_SOFTNESS" value="7" enum="G6DOFJointAxisParam"> - A factor that gets multiplied onto all rotations accross the axes. + A factor that gets multiplied onto all rotations across the axes. </constant> <constant name="G6DOF_JOINT_ANGULAR_DAMPING" value="8" enum="G6DOFJointAxisParam"> - The amount of rotational damping accross the axes. The lower, the more dampening occurs. + The amount of rotational damping across the axes. The lower, the more dampening occurs. </constant> <constant name="G6DOF_JOINT_ANGULAR_RESTITUTION" value="9" enum="G6DOFJointAxisParam"> - The amount of rotational restitution accross the axes. The lower, the more restitution occurs. + The amount of rotational restitution across the axes. The lower, the more restitution occurs. </constant> <constant name="G6DOF_JOINT_ANGULAR_FORCE_LIMIT" value="10" enum="G6DOFJointAxisParam"> - The maximum amount of force that can occur, when rotating arround the axes. + The maximum amount of force that can occur, when rotating around the axes. </constant> <constant name="G6DOF_JOINT_ANGULAR_ERP" value="11" enum="G6DOFJointAxisParam"> - When correcting the crossing of limits in rotation accross the axes, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. + When correcting the crossing of limits in rotation across the axes, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. </constant> <constant name="G6DOF_JOINT_ANGULAR_MOTOR_TARGET_VELOCITY" value="12" enum="G6DOFJointAxisParam"> Target speed for the motor at the axes. diff --git a/doc/classes/PinJoint.xml b/doc/classes/PinJoint.xml index f1e9d8dfe6..eeea1d5565 100644 --- a/doc/classes/PinJoint.xml +++ b/doc/classes/PinJoint.xml @@ -14,11 +14,11 @@ </methods> <members> <member name="params/bias" type="float" setter="set_param" getter="get_param"> - The force with wich the pinned objects stay in positional relation to each other. + The force with which the pinned objects stay in positional relation to each other. The higher, the stronger. </member> <member name="params/damping" type="float" setter="set_param" getter="get_param"> - The force with wich the pinned objects stay in velocity relation to each other. + The force with which the pinned objects stay in velocity relation to each other. The higher, the stronger. </member> <member name="params/impulse_clamp" type="float" setter="set_param" getter="get_param"> @@ -27,11 +27,11 @@ </members> <constants> <constant name="PARAM_BIAS" value="0" enum="Param"> - The force with wich the pinned objects stay in positional relation to each other. + The force with which the pinned objects stay in positional relation to each other. The higher, the stronger. </constant> <constant name="PARAM_DAMPING" value="1" enum="Param"> - The force with wich the pinned objects stay in velocity relation to each other. + The force with which the pinned objects stay in velocity relation to each other. The higher, the stronger. </constant> <constant name="PARAM_IMPULSE_CLAMP" value="2" enum="Param"> diff --git a/doc/classes/PopupMenu.xml b/doc/classes/PopupMenu.xml index 1a68a13907..da73abbabb 100644 --- a/doc/classes/PopupMenu.xml +++ b/doc/classes/PopupMenu.xml @@ -266,7 +266,7 @@ <argument index="0" name="idx" type="int"> </argument> <description> - Return whether the item is a seperator. If it is, it would be displayed as a line. + Return whether the item is a separator. If it is, it would be displayed as a line. </description> </method> <method name="remove_item"> @@ -308,7 +308,7 @@ <argument index="1" name="enable" type="bool"> </argument> <description> - Mark the item at index "idx" as a seperator, which means that it would be displayed as a mere line. + Mark the item at index "idx" as a separator, which means that it would be displayed as a mere line. </description> </method> <method name="set_item_checked"> diff --git a/doc/classes/RayCast2D.xml b/doc/classes/RayCast2D.xml index 7575f11e05..2d53206663 100644 --- a/doc/classes/RayCast2D.xml +++ b/doc/classes/RayCast2D.xml @@ -76,6 +76,7 @@ <argument index="0" name="bit" type="int"> </argument> <description> + Return an individual bit on the collision mask. </description> </method> <method name="get_collision_normal" qualifiers="const"> @@ -125,6 +126,7 @@ <argument index="1" name="value" type="bool"> </argument> <description> + Set/clear individual bits on the collision mask. This makes selecting the areas scanned easier. </description> </method> </methods> diff --git a/doc/classes/SliderJoint.xml b/doc/classes/SliderJoint.xml index 89441094e6..81ab064b8a 100644 --- a/doc/classes/SliderJoint.xml +++ b/doc/classes/SliderJoint.xml @@ -59,7 +59,7 @@ The amount of restitution once the limits are surpassed. The lower, the more velocity-energy gets lost. </member> <member name="linear_limit/softness" type="float" setter="set_param" getter="get_param"> - A factor applied to the movement accross the slider axis once the limits get surpassed. The lower, the slower the movement. + A factor applied to the movement across the slider axis once the limits get surpassed. The lower, the slower the movement. </member> <member name="linear_limit/upper_distance" type="float" setter="set_param" getter="get_param"> The maximum difference between the pivot points on their x-axis before damping happens. @@ -71,16 +71,16 @@ The amount of restitution inside the slider limits. </member> <member name="linear_motion/softness" type="float" setter="set_param" getter="get_param"> - A factor applied to the movement accross the slider axis as long as the slider is in the limits. The lower, the slower the movement. + A factor applied to the movement across the slider axis as long as the slider is in the limits. The lower, the slower the movement. </member> <member name="linear_ortho/damping" type="float" setter="set_param" getter="get_param"> - The amount of damping when movement is accross axes orthogonal to the slider. + The amount of damping when movement is across axes orthogonal to the slider. </member> <member name="linear_ortho/restitution" type="float" setter="set_param" getter="get_param"> - The amount of restitution when movement is accross axes orthogonal to the slider. + The amount of restitution when movement is across axes orthogonal to the slider. </member> <member name="linear_ortho/softness" type="float" setter="set_param" getter="get_param"> - A factor applied to the movement accross axes orthogonal to the slider. + A factor applied to the movement across axes orthogonal to the slider. </member> </members> <constants> @@ -91,7 +91,7 @@ The minimum difference between the pivot points on their x-axis before damping happens. </constant> <constant name="PARAM_LINEAR_LIMIT_SOFTNESS" value="2" enum="Param"> - A factor applied to the movement accross the slider axis once the limits get surpassed. The lower, the slower the movement. + A factor applied to the movement across the slider axis once the limits get surpassed. The lower, the slower the movement. </constant> <constant name="PARAM_LINEAR_LIMIT_RESTITUTION" value="3" enum="Param"> The amount of restitution once the limits are surpassed. The lower, the more velocityenergy gets lost. @@ -100,7 +100,7 @@ The amount of damping once the slider limits are surpassed. </constant> <constant name="PARAM_LINEAR_MOTION_SOFTNESS" value="5" enum="Param"> - A factor applied to the movement accross the slider axis as long as the slider is in the limits. The lower, the slower the movement. + A factor applied to the movement across the slider axis as long as the slider is in the limits. The lower, the slower the movement. </constant> <constant name="PARAM_LINEAR_MOTION_RESTITUTION" value="6" enum="Param"> The amount of restitution inside the slider limits. @@ -109,13 +109,13 @@ The amount of damping inside the slider limits. </constant> <constant name="PARAM_LINEAR_ORTHOGONAL_SOFTNESS" value="8" enum="Param"> - A factor applied to the movement accross axes orthogonal to the slider. + A factor applied to the movement across axes orthogonal to the slider. </constant> <constant name="PARAM_LINEAR_ORTHOGONAL_RESTITUTION" value="9" enum="Param"> - The amount of restitution when movement is accross axes orthogonal to the slider. + The amount of restitution when movement is across axes orthogonal to the slider. </constant> <constant name="PARAM_LINEAR_ORTHOGONAL_DAMPING" value="10" enum="Param"> - The amount of damping when movement is accross axes orthogonal to the slider. + The amount of damping when movement is across axes orthogonal to the slider. </constant> <constant name="PARAM_ANGULAR_LIMIT_UPPER" value="11" enum="Param"> The upper limit of rotation in the slider. diff --git a/doc/classes/String.xml b/doc/classes/String.xml index 5ae1c6608b..19ab367257 100644 --- a/doc/classes/String.xml +++ b/doc/classes/String.xml @@ -343,7 +343,7 @@ <argument index="1" name="placeholder" type="String" default="{_}"> </argument> <description> - Formats the string by replacing all occurences of [code]placeholder[/code] with [code]values[/code]. + Formats the string by replacing all occurrences of [code]placeholder[/code] with [code]values[/code]. </description> </method> <method name="get_base_dir"> diff --git a/doc/classes/VisualServer.xml b/doc/classes/VisualServer.xml index 3823b7e5e9..ed987f7047 100644 --- a/doc/classes/VisualServer.xml +++ b/doc/classes/VisualServer.xml @@ -204,7 +204,7 @@ <argument index="4" name="antialiased" type="bool" default="false"> </argument> <description> - Adds a polyline, which is a line from mutliple points with a width, to the [CanvasItem]'s draw commands. + Adds a polyline, which is a line from multiple points with a width, to the [CanvasItem]'s draw commands. </description> </method> <method name="canvas_item_add_primitive"> @@ -669,7 +669,7 @@ <argument index="1" name="mask" type="int"> </argument> <description> - The shadow mask. binary about wich layers this canvas light affects wich canvas item's shadows. See [LightOccluder2D] for more information on light masks. + The shadow mask. binary about which layers this canvas light affects which canvas item's shadows. See [LightOccluder2D] for more information on light masks. </description> </method> <method name="canvas_light_set_layer_range"> @@ -1506,7 +1506,7 @@ <argument index="1" name="cube_side" type="int" enum="VisualServer.CubeMapSide" default="0"> </argument> <description> - Returns a copy of a texture's image unless it's a CubeMap, in wich case it returns the [RID] of the image at one of the cubes sides. + Returns a copy of a texture's image unless it's a CubeMap, in which case it returns the [RID] of the image at one of the cubes sides. </description> </method> <method name="texture_get_flags" qualifiers="const"> @@ -2155,10 +2155,10 @@ Primitive to draw consists of triangles. </constant> <constant name="PRIMITIVE_TRIANGLE_STRIP" value="5" enum="PrimitiveType"> - Primitive to draw consists of a triangle strip (the last 3 verticies are always combined to make a triangle). + Primitive to draw consists of a triangle strip (the last 3 vertices are always combined to make a triangle). </constant> <constant name="PRIMITIVE_TRIANGLE_FAN" value="6" enum="PrimitiveType"> - Primitive to draw consists of a triangle strip (the last 2 verticies are always combined with the first to make a triangle). + Primitive to draw consists of a triangle strip (the last 2 vertices are always combined with the first to make a triangle). </constant> <constant name="PRIMITIVE_MAX" value="7" enum="PrimitiveType"> Marks the primitive types endpoint. used internally. diff --git a/doc/classes/WorldEnvironment.xml b/doc/classes/WorldEnvironment.xml index 06a24c98d9..3969a8c502 100644 --- a/doc/classes/WorldEnvironment.xml +++ b/doc/classes/WorldEnvironment.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> <class name="WorldEnvironment" inherits="Node" category="Core" version="3.0-rc1"> <brief_description> - Sets environment properties for the entire scene + Default environment properties for the entire scene (post-processing effects, lightning and background settings). </brief_description> <description> - The [code]WorldEnvironment[/code] node can be added to a scene in order to set default [Environment] variables for the scene. The [code]WorldEnvironment[/code] can be overridden by an [Environment] node set on the current [Camera]. Additionally, only one [code]WorldEnvironment[/code] may be instanced in a given scene at a time. The [code]WorldEnvironment[/code] allows the user to specify default lighting parameters (e.g. ambient lighting), various post-processing effects (e.g. SSAO, DOF, Tonemapping), and how to draw the background (e.g. solid color, skybox). + The [code]WorldEnvironment[/code] node is used to configure the default [Environment] for the scene. + The parameters defined in the [code]WorldEnvironment[/code] can be overridden by an [Environment] node set on the current [Camera]. Additionally, only one [code]WorldEnvironment[/code] may be instanced in a given scene at a time. + The [code]WorldEnvironment[/code] allows the user to specify default lighting parameters (e.g. ambient lighting), various post-processing effects (e.g. SSAO, DOF, Tonemapping), and how to draw the background (e.g. solid color, skybox). Usually, these are added in order to improve the realism/color balance of the scene. </description> <tutorials> http://docs.godotengine.org/en/3.0/learning/features/3d/environment_and_post_processing.html @@ -15,6 +17,7 @@ </methods> <members> <member name="environment" type="Environment" setter="set_environment" getter="get_environment"> + The [Environment] resource used by this [code]WorldEnvironment[/code], defining the default properties. </member> </members> <constants> diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index ed7f3b24d0..0fc095a868 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -876,11 +876,34 @@ Ref<Image> RasterizerStorageGLES3::texture_get_data(RID p_texture, VS::CubeMapSi } } + Image::Format img_format; + + //convert special case RGB10_A2 to RGBA8 because it's not a supported image format + if (texture->gl_internal_format_cache == GL_RGB10_A2) { + + img_format = Image::FORMAT_RGBA8; + + uint32_t *ptr = (uint32_t *)wb.ptr(); + uint32_t num_pixels = data_size / 4; + + for (int ofs = 0; ofs < num_pixels; ofs++) { + uint32_t px = ptr[ofs]; + uint32_t a = px >> 30 & 0xFF; + + ptr[ofs] = (px >> 2 & 0xFF) | + (px >> 12 & 0xFF) << 8 | + (px >> 22 & 0xFF) << 16 | + (a | a << 2 | a << 4 | a << 6) << 24; + } + } else { + img_format = texture->format; + } + wb = PoolVector<uint8_t>::Write(); data.resize(data_size); - Image *img = memnew(Image(texture->alloc_width, texture->alloc_height, texture->mipmaps > 1 ? true : false, texture->format, data)); + Image *img = memnew(Image(texture->alloc_width, texture->alloc_height, texture->mipmaps > 1 ? true : false, img_format, data)); return Ref<Image>(img); #else @@ -5346,7 +5369,7 @@ void RasterizerStorageGLES3::particles_set_emitting(RID p_particles, bool p_emit Particles *particles = particles_owner.getornull(p_particles); ERR_FAIL_COND(!particles); if (p_emitting != particles->emitting) { - // Restart is overriden by set_emitting + // Restart is overridden by set_emitting particles->restart_request = false; } particles->emitting = p_emitting; diff --git a/drivers/gles3/shaders/copy.glsl b/drivers/gles3/shaders/copy.glsl index 44eec9525b..1b7c626d3c 100644 --- a/drivers/gles3/shaders/copy.glsl +++ b/drivers/gles3/shaders/copy.glsl @@ -131,7 +131,7 @@ void main() { #elif defined(USE_ASYM_PANO) - // When an assymetrical projection matrix is used (applicable for stereoscopic rendering i.e. VR) we need to do this calculation per fragment to get a perspective correct result. + // When an asymmetrical projection matrix is used (applicable for stereoscopic rendering i.e. VR) we need to do this calculation per fragment to get a perspective correct result. // Note that we're ignoring the x-offset for IPD, with Z sufficiently in the distance it becomes neglectible, as a result we could probably just set cube_normal.z to -1. // The Matrix[2][0] (= asym_proj.x) and Matrix[2][1] (= asym_proj.z) values are what provide the right shift in the image. diff --git a/editor/collada/collada.cpp b/editor/collada/collada.cpp index 1f0af55103..4ce57d7f63 100644 --- a/editor/collada/collada.cpp +++ b/editor/collada/collada.cpp @@ -908,7 +908,7 @@ void Collada::_parse_curve_geometry(XMLParser &parser, String p_id, String p_nam COLLADA_PRINT("curve name: " + p_name); String current_source; - // handles geometry node and the curve childs in this loop + // handles geometry node and the curve children in this loop // read sources with arrays and accessor for each curve if (parser.is_empty()) { return; @@ -996,7 +996,7 @@ void Collada::_parse_mesh_geometry(XMLParser &parser, String p_id, String p_name COLLADA_PRINT("mesh name: " + p_name); String current_source; - // handles geometry node and the mesh childs in this loop + // handles geometry node and the mesh children in this loop // read sources with arrays and accessor for each mesh if (parser.is_empty()) { return; diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index 3ecb7d6314..19fd297f69 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -627,7 +627,7 @@ bool OrphanResourcesDialog::_fill_owners(EditorFileSystemDirectory *efsd, HashMa if (!efsd) return false; - bool has_childs = false; + bool has_children = false; for (int i = 0; i < efsd->get_subdir_count(); i++) { @@ -643,7 +643,7 @@ bool OrphanResourcesDialog::_fill_owners(EditorFileSystemDirectory *efsd, HashMa if (!children) { memdelete(dir_item); } else { - has_childs = true; + has_children = true; } } } @@ -683,12 +683,12 @@ bool OrphanResourcesDialog::_fill_owners(EditorFileSystemDirectory *efsd, HashMa ti->add_button(1, get_icon("GuiVisibilityVisible", "EditorIcons")); } ti->set_metadata(0, path); - has_childs = true; + has_children = true; } } } - return has_childs; + return has_children; } void OrphanResourcesDialog::refresh() { diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 621364d901..2f0c41c6e1 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -369,7 +369,7 @@ void EditorNode::_notification(int p_what) { search_button->set_icon(gui_base->get_icon("Search", "EditorIcons")); object_menu->set_icon(gui_base->get_icon("Tools", "EditorIcons")); - // clear_button->set_icon(gui_base->get_icon("Close", "EditorIcons")); dont have access to that node. needs to become a class property + // clear_button->set_icon(gui_base->get_icon("Close", "EditorIcons")); don't have access to that node. needs to become a class property update_menu->set_icon(gui_base->get_icon("Collapse", "EditorIcons")); dock_tab_move_left->set_icon(theme->get_icon("Back", "EditorIcons")); dock_tab_move_right->set_icon(theme->get_icon("Forward", "EditorIcons")); @@ -4239,7 +4239,7 @@ void EditorNode::_bottom_panel_switch(bool p_enable, int p_idx) { bottom_panel_items[i].button->set_pressed(i == p_idx); bottom_panel_items[i].control->set_visible(i == p_idx); } - if (ScriptEditor::get_singleton()->get_debugger() == bottom_panel_items[p_idx].control) { // this is the debug panel wich uses tabs, so the top section should be smaller + if (ScriptEditor::get_singleton()->get_debugger() == bottom_panel_items[p_idx].control) { // this is the debug panel which uses tabs, so the top section should be smaller bottom_panel->add_style_override("panel", gui_base->get_stylebox("BottomPanelDebuggerOverride", "EditorStyles")); } else { bottom_panel->add_style_override("panel", gui_base->get_stylebox("panel", "TabContainer")); diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h index 8ed14ab847..145dccc2d5 100644 --- a/editor/editor_plugin.h +++ b/editor/editor_plugin.h @@ -178,7 +178,7 @@ public: virtual bool handles(Object *p_object) const; virtual Dictionary get_state() const; //save editor state so it can't be reloaded when reloading scene virtual void set_state(const Dictionary &p_state); //restore editor state (likely was saved with the scene) - virtual void clear(); // clear any temporary data in te editor, reset it (likely new scene or load another scene) + virtual void clear(); // clear any temporary data in the editor, reset it (likely new scene or load another scene) virtual void save_external_data(); // if editor references external resources/scenes, save them virtual void apply_changes(); // if changes are pending in editor, apply them virtual void get_breakpoints(List<String> *p_breakpoints); diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 9125f5f670..096a60afa3 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -212,7 +212,7 @@ void editor_register_and_generate_icons(Ref<Theme> p_theme, bool p_dark_theme = } // generate thumb files with the given thumb size - bool force_filter = !(p_thumb_size == 64 && p_thumb_size == 32); // we dont need filter with original resolution + bool force_filter = !(p_thumb_size == 64 && p_thumb_size == 32); // we don't need filter with original resolution if (p_thumb_size >= 64) { float scale = (float)p_thumb_size / 64.0 * EDSCALE; for (int i = 0; i < editor_bg_thumbs_count; i++) { diff --git a/editor/icons/SCsub b/editor/icons/SCsub index 0e4a4796ec..9bd036dfa9 100644 --- a/editor/icons/SCsub +++ b/editor/icons/SCsub @@ -52,9 +52,9 @@ def make_editor_icons_action(target, source, env): # some special cases if icon_name in ['Int', 'Bool', 'Float']: icon_name = icon_name.lower() - if icon_name.endswith("MediumThumb"): # dont know a better way to handle this + if icon_name.endswith("MediumThumb"): # don't know a better way to handle this thumb_medium_indices.append(str(index)) - if icon_name.endswith("BigThumb"): # dont know a better way to handle this + if icon_name.endswith("BigThumb"): # don't know a better way to handle this thumb_big_indices.append(str(index)) s.write('\t"%s"' % icon_name) diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 869500a6b6..863b13cbd7 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -1551,7 +1551,7 @@ void ColladaImport::create_animations(bool p_make_tracks_in_all_bones, bool p_im node = node_name_map[at.target]; } else { - print_line("Couldnt find node: " + at.target); + print_line("Couldn't find node: " + at.target); continue; } } else { @@ -1736,7 +1736,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones } if (xform_idx == -1) { - print_line("couldnt find matching node " + at.target + " xform for track " + at.param); + print_line("couldn't find matching node " + at.target + " xform for track " + at.param); continue; } diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index d071d43cb7..c22e1cd88b 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -187,7 +187,7 @@ void AnimationPlayerEditor::_play_pressed() { if (current != "") { if (current == player->get_assigned_animation()) - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself player->play(current); } @@ -211,7 +211,7 @@ void AnimationPlayerEditor::_play_from_pressed() { if (current == player->get_assigned_animation() && player->is_playing()) { - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself } player->play(current); @@ -235,7 +235,7 @@ void AnimationPlayerEditor::_play_bw_pressed() { if (current != "") { if (current == player->get_assigned_animation()) - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself player->play(current, -1, -1, true); } @@ -257,7 +257,7 @@ void AnimationPlayerEditor::_play_bw_from_pressed() { float time = player->get_current_animation_position(); if (current == player->get_assigned_animation()) - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself player->play(current, -1, -1, true); player->seek(time); diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index f6834732a3..670f13b6c8 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1238,7 +1238,7 @@ void CanvasItemEditor::_gui_input_viewport_base(const Ref<InputEvent> &p_event) if (b->get_button_index() == BUTTON_LEFT && b->is_pressed()) { if (show_guides && show_rulers && EditorNode::get_singleton()->get_edited_scene()) { Transform2D xform = viewport_scrollable->get_transform() * transform; - // Retreive the guide lists + // Retrieve the guide lists Array vguides; if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) { vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_"); @@ -1296,7 +1296,7 @@ void CanvasItemEditor::_gui_input_viewport_base(const Ref<InputEvent> &p_event) if (show_guides && EditorNode::get_singleton()->get_edited_scene()) { Transform2D xform = viewport_scrollable->get_transform() * transform; - // Retreive the guide lists + // Retrieve the guide lists Array vguides; if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) { vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_"); diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 3be68f21af..7c49408c35 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -177,7 +177,7 @@ void CurveEditor::on_gui_input(const Ref<InputEvent> &p_event) { set_hover_point_index(i); set_selected_point(i); - // This is to prevent the user from loosing a point out of view. + // This is to prevent the user from losing a point out of view. if (point_pos.y < curve.get_min_value()) point_pos.y = curve.get_min_value(); else if (point_pos.y > curve.get_max_value()) diff --git a/editor/plugins/navigation_mesh_generator.cpp b/editor/plugins/navigation_mesh_generator.cpp index 214f982140..5d4e5520f4 100644 --- a/editor/plugins/navigation_mesh_generator.cpp +++ b/editor/plugins/navigation_mesh_generator.cpp @@ -138,12 +138,12 @@ void NavigationMeshGenerator::_convert_detail_mesh_to_native_navigation_mesh(con void NavigationMeshGenerator::_build_recast_navigation_mesh(Ref<NavigationMesh> p_nav_mesh, EditorProgress *ep, rcHeightfield *hf, rcCompactHeightfield *chf, rcContourSet *cset, rcPolyMesh *poly_mesh, rcPolyMeshDetail *detail_mesh, - Vector<float> &verticies, Vector<int> &indices) { + Vector<float> &vertices, Vector<int> &indices) { rcContext ctx; ep->step(TTR("Setting up Configuration..."), 1); - const float *verts = verticies.ptr(); - const int nverts = verticies.size() / 3; + const float *verts = vertices.ptr(); + const int nverts = vertices.size() / 3; const int *tris = indices.ptr(); const int ntris = indices.size() / 3; @@ -265,12 +265,12 @@ void NavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node) EditorProgress ep("bake", TTR("Navigation Mesh Generator Setup:"), 11); ep.step(TTR("Parsing Geometry..."), 0); - Vector<float> verticies; + Vector<float> vertices; Vector<int> indices; - _parse_geometry(Object::cast_to<Spatial>(p_node)->get_global_transform().affine_inverse(), p_node, verticies, indices); + _parse_geometry(Object::cast_to<Spatial>(p_node)->get_global_transform().affine_inverse(), p_node, vertices, indices); - if (verticies.size() > 0 && indices.size() > 0) { + if (vertices.size() > 0 && indices.size() > 0) { rcHeightfield *hf = NULL; rcCompactHeightfield *chf = NULL; @@ -278,7 +278,7 @@ void NavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node) rcPolyMesh *poly_mesh = NULL; rcPolyMeshDetail *detail_mesh = NULL; - _build_recast_navigation_mesh(p_nav_mesh, &ep, hf, chf, cset, poly_mesh, detail_mesh, verticies, indices); + _build_recast_navigation_mesh(p_nav_mesh, &ep, hf, chf, cset, poly_mesh, detail_mesh, vertices, indices); if (hf) { rcFreeHeightField(hf); diff --git a/editor/plugins/navigation_mesh_generator.h b/editor/plugins/navigation_mesh_generator.h index 2f7bad0a82..d26f541b8d 100644 --- a/editor/plugins/navigation_mesh_generator.h +++ b/editor/plugins/navigation_mesh_generator.h @@ -54,7 +54,7 @@ protected: static void _convert_detail_mesh_to_native_navigation_mesh(const rcPolyMeshDetail *p_detail_mesh, Ref<NavigationMesh> p_nav_mesh); static void _build_recast_navigation_mesh(Ref<NavigationMesh> p_nav_mesh, EditorProgress *ep, rcHeightfield *hf, rcCompactHeightfield *chf, rcContourSet *cset, rcPolyMesh *poly_mesh, - rcPolyMeshDetail *detail_mesh, Vector<float> &verticies, Vector<int> &indices); + rcPolyMeshDetail *detail_mesh, Vector<float> &vertices, Vector<int> &indices); public: static void bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node); diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index e2ea853052..5e8eb06556 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -1589,7 +1589,7 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { float snap = spatial_editor->get_rotate_snap(); if (snap) { - angle = Math::rad2deg(angle) + snap * 0.5; //else it wont reach +180 + angle = Math::rad2deg(angle) + snap * 0.5; //else it won't reach +180 angle -= Math::fmod(angle, snap); set_message(vformat(TTR("Rotating %s degrees."), rtos(angle))); angle = Math::deg2rad(angle); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 33b538fd48..16605f2ebd 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -159,7 +159,7 @@ private: bool is_empty = true; String n = d->get_next(); while (n != String()) { - if (!n.begins_with(".")) { // i dont know if this is enough to guarantee an empty dir + if (!n.begins_with(".")) { // i don't know if this is enough to guarantee an empty dir is_empty = false; break; } @@ -690,7 +690,7 @@ void ProjectManager::_notification(int p_what) { } break; case NOTIFICATION_READY: { - if (scroll_childs->get_child_count() == 0) + if (scroll_children->get_child_count() == 0) open_templates->popup_centered_minsize(); } break; case NOTIFICATION_VISIBILITY_CHANGED: { @@ -712,9 +712,9 @@ void ProjectManager::_panel_draw(Node *p_hb) { } void ProjectManager::_update_project_buttons() { - for (int i = 0; i < scroll_childs->get_child_count(); i++) { + for (int i = 0; i < scroll_children->get_child_count(); i++) { - CanvasItem *item = Object::cast_to<CanvasItem>(scroll_childs->get_child(i)); + CanvasItem *item = Object::cast_to<CanvasItem>(scroll_children->get_child(i)); item->update(); } @@ -736,8 +736,8 @@ void ProjectManager::_panel_input(const Ref<InputEvent> &p_ev, Node *p_hb) { int clicked_id = -1; int last_clicked_id = -1; - for (int i = 0; i < scroll_childs->get_child_count(); i++) { - HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_childs->get_child(i)); + for (int i = 0; i < scroll_children->get_child_count(); i++) { + HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_children->get_child(i)); if (!hb) continue; if (hb->get_meta("name") == clicked) clicked_id = i; if (hb->get_meta("name") == last_clicked) last_clicked_id = i; @@ -746,8 +746,8 @@ void ProjectManager::_panel_input(const Ref<InputEvent> &p_ev, Node *p_hb) { if (last_clicked_id != -1 && clicked_id != -1) { int min = clicked_id < last_clicked_id ? clicked_id : last_clicked_id; int max = clicked_id > last_clicked_id ? clicked_id : last_clicked_id; - for (int i = 0; i < scroll_childs->get_child_count(); ++i) { - HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_childs->get_child(i)); + for (int i = 0; i < scroll_children->get_child_count(); ++i) { + HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_children->get_child(i)); if (!hb) continue; if (i != clicked_id && (i < min || i > max) && !mb->get_control()) { selected_list.erase(hb->get_meta("name")); @@ -801,9 +801,9 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) { } break; case KEY_HOME: { - for (int i = 0; i < scroll_childs->get_child_count(); i++) { + for (int i = 0; i < scroll_children->get_child_count(); i++) { - HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_childs->get_child(i)); + HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_children->get_child(i)); if (hb) { selected_list.clear(); selected_list.insert(hb->get_meta("name"), hb->get_meta("main_scene")); @@ -816,13 +816,13 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) { } break; case KEY_END: { - for (int i = scroll_childs->get_child_count() - 1; i >= 0; i--) { + for (int i = scroll_children->get_child_count() - 1; i >= 0; i--) { - HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_childs->get_child(i)); + HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_children->get_child(i)); if (hb) { selected_list.clear(); selected_list.insert(hb->get_meta("name"), hb->get_meta("main_scene")); - scroll->set_v_scroll(scroll_childs->get_size().y); + scroll->set_v_scroll(scroll_children->get_size().y); _update_project_buttons(); break; } @@ -838,9 +838,9 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) { bool found = false; - for (int i = scroll_childs->get_child_count() - 1; i >= 0; i--) { + for (int i = scroll_children->get_child_count() - 1; i >= 0; i--) { - HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_childs->get_child(i)); + HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_children->get_child(i)); if (!hb) continue; String current = hb->get_meta("name"); @@ -875,9 +875,9 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) { bool found = selected_list.empty(); - for (int i = 0; i < scroll_childs->get_child_count(); i++) { + for (int i = 0; i < scroll_children->get_child_count(); i++) { - HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_childs->get_child(i)); + HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_children->get_child(i)); if (!hb) continue; String current = hb->get_meta("name"); @@ -941,8 +941,8 @@ void ProjectManager::_load_recent_projects() { ProjectListFilter::FilterOption filter_option = project_filter->get_filter_option(); String search_term = project_filter->get_search_term(); - while (scroll_childs->get_child_count() > 0) { - memdelete(scroll_childs->get_child(0)); + while (scroll_children->get_child_count() > 0) { + memdelete(scroll_children->get_child(0)); } Map<String, String> selected_list_copy = selected_list; @@ -1102,7 +1102,7 @@ void ProjectManager::_load_recent_projects() { fpath->add_color_override("font_color", font_color); fpath->set_clip_text(true); - scroll_childs->add_child(hb); + scroll_children->add_child(hb); } for (Map<String, String>::Element *E = selected_list_copy.front(); E; E = E->next()) { @@ -1125,8 +1125,8 @@ void ProjectManager::_on_project_renamed() { void ProjectManager::_on_project_created(const String &dir) { bool has_already = false; - for (int i = 0; i < scroll_childs->get_child_count(); i++) { - HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_childs->get_child(i)); + for (int i = 0; i < scroll_children->get_child_count(); i++) { + HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_children->get_child(i)); Label *fpath = Object::cast_to<Label>(hb->get_node(NodePath("project/path"))); if (fpath->get_text() == dir) { has_already = true; @@ -1143,8 +1143,8 @@ void ProjectManager::_on_project_created(const String &dir) { } void ProjectManager::_update_scroll_position(const String &dir) { - for (int i = 0; i < scroll_childs->get_child_count(); i++) { - HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_childs->get_child(i)); + for (int i = 0; i < scroll_children->get_child_count(); i++) { + HBoxContainer *hb = Object::cast_to<HBoxContainer>(scroll_children->get_child(i)); Label *fpath = Object::cast_to<Label>(hb->get_node(NodePath("project/path"))); if (fpath->get_text() == dir) { last_clicked = hb->get_meta("name"); @@ -1584,9 +1584,9 @@ ProjectManager::ProjectManager() { VBoxContainer *tree_vb = memnew(VBoxContainer); tree_hb->add_child(tree_vb); - scroll_childs = memnew(VBoxContainer); - scroll_childs->set_h_size_flags(SIZE_EXPAND_FILL); - scroll->add_child(scroll_childs); + scroll_children = memnew(VBoxContainer); + scroll_children->set_h_size_flags(SIZE_EXPAND_FILL); + scroll->add_child(scroll_children); Button *open = memnew(Button); open->set_text(TTR("Edit")); diff --git a/editor/project_manager.h b/editor/project_manager.h index 6fc82bf542..23ffa2f857 100644 --- a/editor/project_manager.h +++ b/editor/project_manager.h @@ -64,7 +64,7 @@ class ProjectManager : public Control { AcceptDialog *dialog_error; ProjectDialog *npdialog; ScrollContainer *scroll; - VBoxContainer *scroll_childs; + VBoxContainer *scroll_children; Map<String, String> selected_list; // name -> main_scene String last_clicked; bool importing; diff --git a/editor/translations/af.po b/editor/translations/af.po index e65c382344..1faa6a59e8 100644 --- a/editor/translations/af.po +++ b/editor/translations/af.po @@ -7766,7 +7766,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7870,8 +7870,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/ar.po b/editor/translations/ar.po index ddc278bc3a..6d979653b8 100644 --- a/editor/translations/ar.po +++ b/editor/translations/ar.po @@ -7850,7 +7850,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7954,8 +7954,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/bg.po b/editor/translations/bg.po index 4945d495c5..0513664cba 100644 --- a/editor/translations/bg.po +++ b/editor/translations/bg.po @@ -7852,7 +7852,7 @@ msgstr "PathFollow2D работи Ñамо когато е наÑледник н #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7958,8 +7958,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/bn.po b/editor/translations/bn.po index 3dd9818d46..f23b20f4a5 100644 --- a/editor/translations/bn.po +++ b/editor/translations/bn.po @@ -8265,7 +8265,7 @@ msgstr "PathFollow2D à¦à¦•à¦®à¦¾à¦¤à§à¦° Path2D à¦à¦° অংশ হিসেà #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8387,8 +8387,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/ca.po b/editor/translations/ca.po index 487355629d..1ab1197774 100644 --- a/editor/translations/ca.po +++ b/editor/translations/ca.po @@ -7982,7 +7982,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8108,8 +8108,8 @@ msgstr "Res és visible perquè no s'ha assignat cap Malla a cap pas de Dibuix." #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "El motor de fÃsiques sobreescriurà els canvis en la mida dels nodes " diff --git a/editor/translations/cs.po b/editor/translations/cs.po index 9b1cc3ab9b..354db0ba3a 100644 --- a/editor/translations/cs.po +++ b/editor/translations/cs.po @@ -7972,7 +7972,7 @@ msgstr "PathFollow2D funguje pouze když je dÃtÄ›tem uzlu Path2D." #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8089,8 +8089,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/da.po b/editor/translations/da.po index cb0876cc3a..851f6994f3 100644 --- a/editor/translations/da.po +++ b/editor/translations/da.po @@ -7932,7 +7932,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8050,8 +8050,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/de.po b/editor/translations/de.po index d3ab8a6fb8..6bed65ef55 100644 --- a/editor/translations/de.po +++ b/editor/translations/de.po @@ -8028,7 +8028,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8160,8 +8160,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "Größenänderungen von RigidBody (in Character- oder Rigid-Modus) werden " diff --git a/editor/translations/de_CH.po b/editor/translations/de_CH.po index da7576e855..05462b4c09 100644 --- a/editor/translations/de_CH.po +++ b/editor/translations/de_CH.po @@ -7904,7 +7904,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8013,8 +8013,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/editor.pot b/editor/translations/editor.pot index 2fd3bc8f99..ba53722b29 100644 --- a/editor/translations/editor.pot +++ b/editor/translations/editor.pot @@ -7704,7 +7704,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7808,8 +7808,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/el.po b/editor/translations/el.po index b4c5b06eaa..bc7c9bc76f 100644 --- a/editor/translations/el.po +++ b/editor/translations/el.po @@ -7993,7 +7993,7 @@ msgstr "Το PathFollow2D δουλεÏει μόνο όταν κληÏονομεΠ#: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8123,8 +8123,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "ΑλλαγÎÏ‚ στο μÎγεθος του RigidBody (στις λειτουÏγίες character ή rigid) θα " diff --git a/editor/translations/es.po b/editor/translations/es.po index 142f52c18a..2591426382 100644 --- a/editor/translations/es.po +++ b/editor/translations/es.po @@ -8346,7 +8346,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp #, fuzzy msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8481,8 +8481,8 @@ msgstr "" #: scene/3d/physics_body.cpp #, fuzzy msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "Los cambios en el tamaño del RigidBody (en el personaje o modos rÃgidos) " diff --git a/editor/translations/es_AR.po b/editor/translations/es_AR.po index 8bfcd5b4fb..33f408080d 100644 --- a/editor/translations/es_AR.po +++ b/editor/translations/es_AR.po @@ -7984,7 +7984,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8108,8 +8108,8 @@ msgstr "Nada visible ya que no se asigno pasadas de dibujado a los meshes." #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "Los cambios de tamaño a RigidBody (en modo character o rigid) seran " diff --git a/editor/translations/fa.po b/editor/translations/fa.po index 203c60da01..7ca94dda79 100644 --- a/editor/translations/fa.po +++ b/editor/translations/fa.po @@ -7910,7 +7910,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8028,8 +8028,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/fi.po b/editor/translations/fi.po index 8efc80b6ed..ebb95e2cb7 100644 --- a/editor/translations/fi.po +++ b/editor/translations/fi.po @@ -8124,7 +8124,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8228,8 +8228,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/fr.po b/editor/translations/fr.po index 008dfef6fb..cd7ab47044 100644 --- a/editor/translations/fr.po +++ b/editor/translations/fr.po @@ -8070,7 +8070,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8200,8 +8200,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "Les changements de taille pour RigidBody (dans les modes caractère ou " diff --git a/editor/translations/he.po b/editor/translations/he.po index 869e9fe5fc..d81f7fea22 100644 --- a/editor/translations/he.po +++ b/editor/translations/he.po @@ -7711,7 +7711,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7815,8 +7815,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/hi.po b/editor/translations/hi.po index 18c47a913b..801b84a8b9 100644 --- a/editor/translations/hi.po +++ b/editor/translations/hi.po @@ -7765,7 +7765,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7869,8 +7869,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/hu.po b/editor/translations/hu.po index bf50a786cf..f0e6fbe0f6 100644 --- a/editor/translations/hu.po +++ b/editor/translations/hu.po @@ -7735,7 +7735,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7839,8 +7839,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/id.po b/editor/translations/id.po index 547cc54d41..fe098bb3a9 100644 --- a/editor/translations/id.po +++ b/editor/translations/id.po @@ -8126,7 +8126,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8247,8 +8247,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/is.po b/editor/translations/is.po index e27d2710c2..58e19d12a3 100644 --- a/editor/translations/is.po +++ b/editor/translations/is.po @@ -7713,7 +7713,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7817,8 +7817,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/it.po b/editor/translations/it.po index ab11d241d6..348bc853ba 100644 --- a/editor/translations/it.po +++ b/editor/translations/it.po @@ -8151,7 +8151,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp #, fuzzy msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8283,8 +8283,8 @@ msgstr "Nulla é visibile perché le mesh non sono state assegnate ai draw pass. #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "I cambiamenti di dimensione a RigidBody (nel personaggio o nelle modalità " diff --git a/editor/translations/ja.po b/editor/translations/ja.po index b31113a7a0..74d95e50ef 100644 --- a/editor/translations/ja.po +++ b/editor/translations/ja.po @@ -8832,7 +8832,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8957,8 +8957,8 @@ msgstr "æ画パスã®ãŸã‚ã®ãƒ¡ãƒƒã‚·ãƒ¥ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“ã®ã§ #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/ko.po b/editor/translations/ko.po index 3d282de6b0..bd31f9f93c 100644 --- a/editor/translations/ko.po +++ b/editor/translations/ko.po @@ -7918,7 +7918,7 @@ msgstr "PathFollow2D는 Path2D ë…¸ë“œì˜ ìžì‹ë…¸ë“œë¡œ ìžˆì„ ë•Œë§Œ ë™ìž‘í•© #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8040,8 +8040,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/lt.po b/editor/translations/lt.po index ba5470a974..7019289641 100644 --- a/editor/translations/lt.po +++ b/editor/translations/lt.po @@ -7735,7 +7735,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7841,8 +7841,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/nb.po b/editor/translations/nb.po index 4bb49b4fc9..59b5215cd0 100644 --- a/editor/translations/nb.po +++ b/editor/translations/nb.po @@ -7956,7 +7956,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8060,8 +8060,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/nl.po b/editor/translations/nl.po index 94c06f46c5..60774a32b1 100644 --- a/editor/translations/nl.po +++ b/editor/translations/nl.po @@ -8038,7 +8038,7 @@ msgstr "PathFollow2D werkt alleen wanneer het een kind van een Path2D node is." #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8157,8 +8157,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/pl.po b/editor/translations/pl.po index 27cfb1f0ea..e0f8afda80 100644 --- a/editor/translations/pl.po +++ b/editor/translations/pl.po @@ -8141,7 +8141,7 @@ msgstr "PathFollow2D zadziaÅ‚a tylko wtedy, gdy bÄ™dzie dzieckiem wÄ™zeÅ‚ Path2D #: scene/2d/physics_body_2d.cpp #, fuzzy msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8266,8 +8266,8 @@ msgstr "" #: scene/3d/physics_body.cpp #, fuzzy msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "Zmiany rozmiaru w RigidBody (w trybach character i rigid) zostanÄ… nadpisane " diff --git a/editor/translations/pr.po b/editor/translations/pr.po index ef1a830945..ab142a63bf 100644 --- a/editor/translations/pr.po +++ b/editor/translations/pr.po @@ -7817,7 +7817,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7921,8 +7921,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/pt_BR.po b/editor/translations/pt_BR.po index 600775f68e..7095a66ae5 100644 --- a/editor/translations/pt_BR.po +++ b/editor/translations/pt_BR.po @@ -7979,7 +7979,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8107,8 +8107,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "Mudanças de tamanho no RigidBody (nos modos Character e Rigid) serão " diff --git a/editor/translations/pt_PT.po b/editor/translations/pt_PT.po index 3483815fd6..a8954d7e69 100644 --- a/editor/translations/pt_PT.po +++ b/editor/translations/pt_PT.po @@ -7983,7 +7983,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8114,8 +8114,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "Mudanças no tamanho do RigidBody (em modos caráter ou rÃgido) serão " diff --git a/editor/translations/ru.po b/editor/translations/ru.po index 54a350fab5..d4252db41a 100644 --- a/editor/translations/ru.po +++ b/editor/translations/ru.po @@ -7959,7 +7959,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8085,8 +8085,8 @@ msgstr "Ðичего не видно, потому что полиÑетки нР#: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° RigidBody (в режиме character или rigid) будут " diff --git a/editor/translations/sk.po b/editor/translations/sk.po index e0f0fa14b1..be41dc5921 100644 --- a/editor/translations/sk.po +++ b/editor/translations/sk.po @@ -7810,7 +7810,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7914,8 +7914,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/sl.po b/editor/translations/sl.po index 89f734648c..3428d3a07e 100644 --- a/editor/translations/sl.po +++ b/editor/translations/sl.po @@ -7804,7 +7804,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7908,8 +7908,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/sr_Cyrl.po b/editor/translations/sr_Cyrl.po index c168421518..99f128f6f0 100644 --- a/editor/translations/sr_Cyrl.po +++ b/editor/translations/sr_Cyrl.po @@ -7896,7 +7896,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8000,8 +8000,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/sv.po b/editor/translations/sv.po index 4ab3f5eb96..6647f45cf0 100644 --- a/editor/translations/sv.po +++ b/editor/translations/sv.po @@ -8383,7 +8383,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8499,8 +8499,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/ta.po b/editor/translations/ta.po index d7362178a4..def1db720f 100644 --- a/editor/translations/ta.po +++ b/editor/translations/ta.po @@ -7713,7 +7713,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7817,8 +7817,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/th.po b/editor/translations/th.po index fac87388a4..246261f64a 100644 --- a/editor/translations/th.po +++ b/editor/translations/th.po @@ -7845,7 +7845,7 @@ msgstr "PathFollow2D จะทำงานได้ต้à¸à¸‡à¹€à¸›à¹‡à¸™à¹‚ภ#: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7957,8 +7957,8 @@ msgstr "ไม่มีà¸à¸²à¸£à¹à¸ªà¸”งผลเนื่à¸à¸‡à¸ˆà¸²à¸à¹„ #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "ระบบฟิสิà¸à¸ªà¹Œà¸ˆà¸°à¸ˆà¸±à¸”à¸à¸²à¸£à¸‚นาดขà¸à¸‡ RigidBody (ในโหมด character หรืภrigid) เมื่à¸à¸£à¸±à¸™à¹€à¸à¸¡\n" diff --git a/editor/translations/tr.po b/editor/translations/tr.po index 60cd32b132..13b1b70941 100644 --- a/editor/translations/tr.po +++ b/editor/translations/tr.po @@ -7974,7 +7974,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8104,8 +8104,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "RigidBody boyut deÄŸiÅŸikliÄŸi(karakter yada rigid kipleri) fizik motoru " diff --git a/editor/translations/uk.po b/editor/translations/uk.po index b3da859893..990a7a628f 100644 --- a/editor/translations/uk.po +++ b/editor/translations/uk.po @@ -7872,7 +7872,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7978,8 +7978,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/ur_PK.po b/editor/translations/ur_PK.po index f834e4a105..3db2f08d1a 100644 --- a/editor/translations/ur_PK.po +++ b/editor/translations/ur_PK.po @@ -7776,7 +7776,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7880,8 +7880,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/vi.po b/editor/translations/vi.po index 94e42d6464..360e9a4944 100644 --- a/editor/translations/vi.po +++ b/editor/translations/vi.po @@ -7718,7 +7718,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7822,8 +7822,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/zh_CN.po b/editor/translations/zh_CN.po index db4e616527..b077e11302 100644 --- a/editor/translations/zh_CN.po +++ b/editor/translations/zh_CN.po @@ -7869,7 +7869,7 @@ msgstr "PathFollow2D类型的节点åªæœ‰æ”¾åœ¨Path2D节点下æ‰èƒ½æ£å¸¸å·¥ä½œ #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7986,8 +7986,8 @@ msgstr "ç²’åä¸å¯è§ï¼Œå› ä¸ºæ²¡æœ‰ç½‘æ ¼(meshes)指定到绘制通é“(draw p #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" "è¿è¡Œæ—¶ï¼Œä¿®æ”¹RigidBody(character或rigid模å¼ï¼‰çš„尺寸,会修改物ç†å¼•æ“Žçš„大å°å°º" diff --git a/editor/translations/zh_HK.po b/editor/translations/zh_HK.po index f9ebeb54a2..768f975cc2 100644 --- a/editor/translations/zh_HK.po +++ b/editor/translations/zh_HK.po @@ -8051,7 +8051,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -8155,8 +8155,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/editor/translations/zh_TW.po b/editor/translations/zh_TW.po index 4a399d0e6a..e2a3c29d76 100644 --- a/editor/translations/zh_TW.po +++ b/editor/translations/zh_TW.po @@ -7863,7 +7863,7 @@ msgstr "" #: scene/2d/physics_body_2d.cpp msgid "" -"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"Size changes to RigidBody2D (in character or rigid modes) will be overridden " "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" @@ -7967,8 +7967,8 @@ msgstr "" #: scene/3d/physics_body.cpp msgid "" -"Size changes to RigidBody (in character or rigid modes) will be overriden by " -"the physics engine when running.\n" +"Size changes to RigidBody (in character or rigid modes) will be overridden " +"by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" diff --git a/main/main.cpp b/main/main.cpp index be334fac48..d670b1d0b5 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -908,7 +908,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph GLOBAL_DEF("debug/settings/stdout/print_fps", OS::get_singleton()->is_stdout_verbose()); - if (!OS::get_singleton()->_verbose_stdout) //overrided + if (!OS::get_singleton()->_verbose_stdout) //overridden OS::get_singleton()->_verbose_stdout = GLOBAL_DEF("debug/settings/stdout/verbose_stdout", false); if (frame_delay == 0) { diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp index 5179f6d6d1..af948556c4 100644 --- a/main/tests/test_string.cpp +++ b/main/tests/test_string.cpp @@ -893,7 +893,7 @@ TestFunc test_funcs[] = { MainLoop *test() { - /** A character length != wchar_t may be forced, so the tests wont work */ + /** A character length != wchar_t may be forced, so the tests won't work */ ERR_FAIL_COND_V(sizeof(CharType) != sizeof(wchar_t), NULL); diff --git a/methods.py b/methods.py index 3ffe8cb310..892fa8cfc3 100644 --- a/methods.py +++ b/methods.py @@ -1601,7 +1601,7 @@ def detect_visual_c_compiler_version(tools_env): # These is no flag to give to visual c compilers to set the architecture, ie scons bits argument (32,64,ARM etc) # There are many different cl.exe files that are run, and each one compiles & links to a different architecture # As far as I know, the only way to figure out what compiler will be run when Scons calls cl.exe via Program() - # is to check the PATH varaible and figure out which one will be called first. Code bellow does that and returns: + # is to check the PATH variable and figure out which one will be called first. Code bellow does that and returns: # the following string values: # "" Compiler not detected diff --git a/modules/bullet/area_bullet.cpp b/modules/bullet/area_bullet.cpp index 9d46e4fe30..648919e612 100644 --- a/modules/bullet/area_bullet.cpp +++ b/modules/bullet/area_bullet.cpp @@ -236,7 +236,7 @@ void AreaBullet::set_param(PhysicsServer::AreaParameter p_param, const Variant & set_spOv_gravityPointAttenuation(p_value); break; default: - print_line("The Bullet areas dosn't suppot this param: " + itos(p_param)); + print_line("The Bullet areas doesn't suppot this param: " + itos(p_param)); } } @@ -259,7 +259,7 @@ Variant AreaBullet::get_param(PhysicsServer::AreaParameter p_param) const { case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION: return spOv_gravityPointAttenuation; default: - print_line("The Bullet areas dosn't suppot this param: " + itos(p_param)); + print_line("The Bullet areas doesn't suppot this param: " + itos(p_param)); return Variant(); } } diff --git a/modules/bullet/godot_motion_state.h b/modules/bullet/godot_motion_state.h index 2ebe368536..fe5d8418b7 100644 --- a/modules/bullet/godot_motion_state.h +++ b/modules/bullet/godot_motion_state.h @@ -41,7 +41,7 @@ class RigidBodyBullet; -// This clas is responsible to move kinematic actor +// This class is responsible to move kinematic actor // and sincronize rendering engine with Bullet /// DOC: /// http://www.bulletphysics.org/mediawiki-1.5.8/index.php/MotionStates#What.27s_a_MotionState.3F diff --git a/modules/bullet/rigid_body_bullet.cpp b/modules/bullet/rigid_body_bullet.cpp index f2115a5d50..3edc407e87 100644 --- a/modules/bullet/rigid_body_bullet.cpp +++ b/modules/bullet/rigid_body_bullet.cpp @@ -690,7 +690,7 @@ void RigidBodyBullet::set_continuous_collision_detection(bool p_enable) { /// Calculate using the rule writte below the CCD swept sphere radius /// CCD works on an embedded sphere of radius, make sure this radius /// is embedded inside the convex objects, preferably smaller: - /// for an object of dimentions 1 meter, try 0.2 + /// for an object of dimensions 1 meter, try 0.2 btVector3 center; btScalar radius; btBody->getCollisionShape()->getBoundingSphere(center, radius); diff --git a/modules/bullet/rigid_body_bullet.h b/modules/bullet/rigid_body_bullet.h index eb9417e391..aff6056ad9 100644 --- a/modules/bullet/rigid_body_bullet.h +++ b/modules/bullet/rigid_body_bullet.h @@ -48,11 +48,11 @@ class GodotMotionState; class BulletPhysicsDirectBodyState; /// This class could be used in multi thread with few changes but currently -/// is setted to be only in one single thread. +/// is set to be only in one single thread. /// /// In the system there is only one object at a time that manage all bodies and is /// created by BulletPhysicsServer and is held by the "singleton" variable of this class -/// Each time something require it, the body must be setted again. +/// Each time something require it, the body must be set again. class BulletPhysicsDirectBodyState : public PhysicsDirectBodyState { GDCLASS(BulletPhysicsDirectBodyState, PhysicsDirectBodyState) diff --git a/modules/bullet/shape_bullet.cpp b/modules/bullet/shape_bullet.cpp index 27eac4e6ee..c6b9695d96 100644 --- a/modules/bullet/shape_bullet.cpp +++ b/modules/bullet/shape_bullet.cpp @@ -282,7 +282,7 @@ PhysicsServer::ShapeType ConvexPolygonShapeBullet::get_type() const { } void ConvexPolygonShapeBullet::setup(const Vector<Vector3> &p_vertices) { - // Make a copy of verticies + // Make a copy of vertices const int n_of_vertices = p_vertices.size(); vertices.resize(n_of_vertices); for (int i = n_of_vertices - 1; 0 <= i; --i) { diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index 56d3779d34..4cf6e99b06 100644 --- a/modules/gdnative/include/gdnative/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -70,7 +70,7 @@ typedef enum { GODOT_OK, GODOT_FAILED, ///< Generic fail error GODOT_ERR_UNAVAILABLE, ///< What is requested is unsupported/unavailable - GODOT_ERR_UNCONFIGURED, ///< The object being used hasnt been properly set up yet + GODOT_ERR_UNCONFIGURED, ///< The object being used hasn't been properly set up yet GODOT_ERR_UNAUTHORIZED, ///< Missing credentials for requested resource GODOT_ERR_PARAMETER_RANGE_ERROR, ///< Parameter given out of range (5) GODOT_ERR_OUT_OF_MEMORY, ///< Out of memory diff --git a/modules/gdnative/include/nativescript/godot_nativescript.h b/modules/gdnative/include/nativescript/godot_nativescript.h index fdd2a65bb2..11017ae78d 100644 --- a/modules/gdnative/include/nativescript/godot_nativescript.h +++ b/modules/gdnative/include/nativescript/godot_nativescript.h @@ -50,7 +50,7 @@ typedef enum { GODOT_PROPERTY_HINT_RANGE, ///< hint_text = "min,max,step,slider; //slider is optional" GODOT_PROPERTY_HINT_EXP_RANGE, ///< hint_text = "min,max,step", exponential edit GODOT_PROPERTY_HINT_ENUM, ///< hint_text= "val1,val2,val3,etc" - GODOT_PROPERTY_HINT_EXP_EASING, /// exponential easing funciton (Math::ease) + GODOT_PROPERTY_HINT_EXP_EASING, /// exponential easing function (Math::ease) GODOT_PROPERTY_HINT_LENGTH, ///< hint_text= "length" (as integer) GODOT_PROPERTY_HINT_SPRITE_FRAME, GODOT_PROPERTY_HINT_KEY_ACCEL, ///< hint_text= "length" (as integer) diff --git a/modules/gdnative/pluginscript/pluginscript_script.cpp b/modules/gdnative/pluginscript/pluginscript_script.cpp index 8290582b9b..5ae7926f1b 100644 --- a/modules/gdnative/pluginscript/pluginscript_script.cpp +++ b/modules/gdnative/pluginscript/pluginscript_script.cpp @@ -209,7 +209,7 @@ Error PluginScript::reload(bool p_keep_state) { } // Script's parent is passed as base_name which can make reference to a - // ClassDB name (i.e. `Node2D`) or a ressource path (i.e. `res://foo/bar.gd`) + // ClassDB name (i.e. `Node2D`) or a resource path (i.e. `res://foo/bar.gd`) StringName *base_name = (StringName *)&manifest.base; if (*base_name) { diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 810c40337d..c4269ab4a9 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -491,8 +491,8 @@ static Ref<Reference> _get_parent_class(GDScriptCompletionContext &context) { path = context.base_path.plus_file(path); } - if (ScriptCodeCompletionCache::get_sigleton()) - script = ScriptCodeCompletionCache::get_sigleton()->get_cached_resource(path); + if (ScriptCodeCompletionCache::get_singleton()) + script = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path); else script = ResourceLoader::load(path); @@ -765,8 +765,8 @@ static bool _guess_expression_type(GDScriptCompletionContext &context, const GDS //print_line("is a script"); Ref<Script> scr; - if (ScriptCodeCompletionCache::get_sigleton()) - scr = ScriptCodeCompletionCache::get_sigleton()->get_cached_resource(script); + if (ScriptCodeCompletionCache::get_singleton()) + scr = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(script); else scr = ResourceLoader::load(script); @@ -1301,8 +1301,8 @@ static bool _guess_identifier_type(GDScriptCompletionContext &context, int p_lin //print_line("is a script"); Ref<Script> scr; - if (ScriptCodeCompletionCache::get_sigleton()) - scr = ScriptCodeCompletionCache::get_sigleton()->get_cached_resource(script); + if (ScriptCodeCompletionCache::get_singleton()) + scr = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(script); else scr = ResourceLoader::load(script); diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 2a6d37812e..75fb7e15c4 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -458,9 +458,9 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s if (!validating) { //this can be too slow for just validating code - if (for_completion && ScriptCodeCompletionCache::get_sigleton()) { - res = ScriptCodeCompletionCache::get_sigleton()->get_cached_resource(path); - } else { + if (for_completion && ScriptCodeCompletionCache::get_singleton()) { + res = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path); + } else if (FileAccess::exists(path)) { res = ResourceLoader::load(path); } if (!res.is_valid()) { diff --git a/modules/mobile_vr/mobile_interface.cpp b/modules/mobile_vr/mobile_interface.cpp index 07a81e07b0..6b1c7eb279 100644 --- a/modules/mobile_vr/mobile_interface.cpp +++ b/modules/mobile_vr/mobile_interface.cpp @@ -345,7 +345,7 @@ Transform MobileVRInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, co if (initialized) { float world_scale = arvr_server->get_world_scale(); - // we don't need to check for the existance of our HMD, doesn't effect our values... + // we don't need to check for the existence of our HMD, doesn't effect our values... // note * 0.01 to convert cm to m and * 0.5 as we're moving half in each direction... if (p_eye == ARVRInterface::EYE_LEFT) { transform_for_eye.origin.x = -(intraocular_dist * 0.01 * 0.5 * world_scale); diff --git a/modules/mono/editor/bindings_generator.cpp b/modules/mono/editor/bindings_generator.cpp index 800e3b723b..9bf81b52bb 100644 --- a/modules/mono/editor/bindings_generator.cpp +++ b/modules/mono/editor/bindings_generator.cpp @@ -1811,7 +1811,7 @@ void BindingsGenerator::_populate_object_type_interfaces() { imethod.return_type = name_cache.type_void; // Actually, more methods like this may be added in the future, - // which could actually will return something differnet. + // which could actually will return something different. // Let's put this to notify us if that ever happens. if (itype.cname != name_cache.type_Object || imethod.name != "free") { if (verbose_output) { diff --git a/modules/mono/glue/cs_files/DebuggingUtils.cs b/modules/mono/glue/cs_files/DebuggingUtils.cs index 42ca57fbf9..ffaaf00837 100644 --- a/modules/mono/glue/cs_files/DebuggingUtils.cs +++ b/modules/mono/glue/cs_files/DebuggingUtils.cs @@ -34,8 +34,8 @@ namespace Godot StringBuilder sb = new StringBuilder(); - if (methodBase is MethodInfo methodInfo) - sb.AppendTypeName(methodInfo.ReturnType); + if (methodBase is MethodInfo) + sb.AppendTypeName(((MethodInfo)methodBase).ReturnType); sb.Append(methodBase.DeclaringType.FullName); sb.Append("."); diff --git a/modules/mono/glue/cs_files/Plane.cs b/modules/mono/glue/cs_files/Plane.cs index 6365e71826..b347c0835a 100644 --- a/modules/mono/glue/cs_files/Plane.cs +++ b/modules/mono/glue/cs_files/Plane.cs @@ -91,7 +91,7 @@ namespace Godot float dist = (normal.Dot(from) - d) / den; - // This is a ray, before the emiting pos (from) does not exist + // This is a ray, before the emitting pos (from) does not exist if (dist > Mathf.Epsilon) return new Vector3(); diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index ed602bbc70..b11deb08fd 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -195,7 +195,7 @@ void AudioStreamPlayer2D::_notification(int p_what) { float dist = global_pos.distance_to(screen_in_global); //distance to screen center if (dist > max_distance) - continue; //cant hear this sound in this viewport + continue; //can't hear this sound in this viewport float multiplier = Math::pow(1.0f - dist / max_distance, attenuation); multiplier *= Math::db2linear(volume_db); //also apply player volume! diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 12d6f32567..87bcdae527 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -101,7 +101,7 @@ void CanvasItemMaterial::_update_shader() { case LIGHT_MODE_UNSHADED: code += ",unshaded"; break; case LIGHT_MODE_LIGHT_ONLY: code += ",light_only"; break; } - code += ";\n"; //thats it. + code += ";\n"; //that's it. ShaderData shader_data; shader_data.shader = VS::get_singleton()->shader_create(); diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp index e451e7a65b..89edbb6cc1 100644 --- a/scene/2d/collision_object_2d.cpp +++ b/scene/2d/collision_object_2d.cpp @@ -328,6 +328,20 @@ void CollisionObject2D::_update_pickable() { Physics2DServer::get_singleton()->body_set_pickable(rid, pickable); } +String CollisionObject2D::get_configuration_warning() const { + + String warning = Node2D::get_configuration_warning(); + + if (shapes.empty()) { + if (warning == String()) { + warning += "\n"; + } + warning += TTR("This node has no children shapes, so it can't interact with the space.\nConsider adding CollisionShape2D or CollisionPolygon2D children nodes to define it's shape."); + } + + return warning; +} + void CollisionObject2D::_bind_methods() { ClassDB::bind_method(D_METHOD("get_rid"), &CollisionObject2D::get_rid); diff --git a/scene/2d/collision_object_2d.h b/scene/2d/collision_object_2d.h index ee3cea46a5..6da63d1a0b 100644 --- a/scene/2d/collision_object_2d.h +++ b/scene/2d/collision_object_2d.h @@ -107,6 +107,8 @@ public: void set_pickable(bool p_enabled); bool is_pickable() const; + String get_configuration_warning() const; + _FORCE_INLINE_ RID get_rid() const { return rid; } CollisionObject2D(); diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 1b25b3588a..c4c9362387 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -807,7 +807,7 @@ String RigidBody2D::get_configuration_warning() const { if (warning != String()) { warning += "\n"; } - warning += TTR("Size changes to RigidBody2D (in character or rigid modes) will be overriden by the physics engine when running.\nChange the size in children collision shapes instead."); + warning += TTR("Size changes to RigidBody2D (in character or rigid modes) will be overridden by the physics engine when running.\nChange the size in children collision shapes instead."); } return warning; diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index cf2a47f14c..bf3bc42e4e 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -320,7 +320,7 @@ void AudioStreamPlayer3D::_notification(int p_what) { total_max = MAX(total_max, cam_area_pos.length()); } if (total_max > max_distance) { - continue; //cant hear this sound in this camera + continue; //can't hear this sound in this camera } } diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp index b246fe75f4..73770a2dd2 100644 --- a/scene/3d/collision_object.cpp +++ b/scene/3d/collision_object.cpp @@ -365,6 +365,20 @@ bool CollisionObject::get_capture_input_on_drag() const { return capture_input_on_drag; } +String CollisionObject::get_configuration_warning() const { + + String warning = Spatial::get_configuration_warning(); + + if (shapes.empty()) { + if (warning == String()) { + warning += "\n"; + } + warning += TTR("This node has no children shapes, so it can't interact with the space.\nConsider adding CollisionShape or CollisionPolygon children nodes to define it's shape."); + } + + return warning; +} + CollisionObject::CollisionObject() { capture_input_on_drag = false; diff --git a/scene/3d/collision_object.h b/scene/3d/collision_object.h index c58e02848f..f31d65e411 100644 --- a/scene/3d/collision_object.h +++ b/scene/3d/collision_object.h @@ -109,6 +109,8 @@ public: _FORCE_INLINE_ RID get_rid() const { return rid; } + virtual String get_configuration_warning() const; + CollisionObject(); ~CollisionObject(); }; diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index a15a7dcead..bf7952b2dd 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -772,7 +772,7 @@ String RigidBody::get_configuration_warning() const { if (warning != String()) { warning += "\n"; } - warning += TTR("Size changes to RigidBody (in character or rigid modes) will be overriden by the physics engine when running.\nChange the size in children collision shapes instead."); + warning += TTR("Size changes to RigidBody (in character or rigid modes) will be overridden by the physics engine when running.\nChange the size in children collision shapes instead."); } return warning; diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp index 99541db4d3..d3a13c741e 100644 --- a/scene/3d/skeleton.cpp +++ b/scene/3d/skeleton.cpp @@ -61,7 +61,7 @@ bool Skeleton::_set(const StringName &p_path, const Variant &p_value) { set_bone_enabled(which, p_value); else if (what == "pose") set_bone_pose(which, p_value); - else if (what == "bound_childs") { + else if (what == "bound_children") { Array children = p_value; if (is_inside_tree()) { @@ -105,7 +105,7 @@ bool Skeleton::_get(const StringName &p_path, Variant &r_ret) const { r_ret = is_bone_enabled(which); else if (what == "pose") r_ret = get_bone_pose(which); - else if (what == "bound_childs") { + else if (what == "bound_children") { Array children; for (const List<uint32_t>::Element *E = bones[which].nodes_bound.front(); E; E = E->next()) { @@ -134,7 +134,7 @@ void Skeleton::_get_property_list(List<PropertyInfo> *p_list) const { p_list->push_back(PropertyInfo(Variant::TRANSFORM, prep + "rest")); p_list->push_back(PropertyInfo(Variant::BOOL, prep + "enabled")); p_list->push_back(PropertyInfo(Variant::TRANSFORM, prep + "pose", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR)); - p_list->push_back(PropertyInfo(Variant::ARRAY, prep + "bound_childs")); + p_list->push_back(PropertyInfo(Variant::ARRAY, prep + "bound_children")); } } diff --git a/scene/3d/skeleton.h b/scene/3d/skeleton.h index de0d4216d9..d693670055 100644 --- a/scene/3d/skeleton.h +++ b/scene/3d/skeleton.h @@ -83,12 +83,12 @@ class Skeleton : public Spatial { Array _get_bound_child_nodes_to_bone(int p_bone) const { Array bound; - List<Node *> childs; - get_bound_child_nodes_to_bone(p_bone, &childs); + List<Node *> children; + get_bound_child_nodes_to_bone(p_bone, &children); - for (int i = 0; i < childs.size(); i++) { + for (int i = 0; i < children.size(); i++) { - bound.push_back(childs[i]); + bound.push_back(children[i]); } return bound; } diff --git a/scene/3d/vehicle_body.cpp b/scene/3d/vehicle_body.cpp index aeee51c4b2..ed3bde9504 100644 --- a/scene/3d/vehicle_body.cpp +++ b/scene/3d/vehicle_body.cpp @@ -572,7 +572,7 @@ void VehicleBody::_resolve_single_bilateral(PhysicsDirectBodyState *s, const Vec b2invmass); // FIXME: rel_vel assignment here is overwritten by the following assignment. - // What seemes to be intented in the next next assignment is: rel_vel = normal.dot(rel_vel); + // What seemes to be intended in the next next assignment is: rel_vel = normal.dot(rel_vel); // Investigate why. real_t rel_vel = jac.getRelativeVelocity( s->get_linear_velocity(), diff --git a/scene/3d/voxel_light_baker.cpp b/scene/3d/voxel_light_baker.cpp index e1717a56f3..d389b69ef3 100644 --- a/scene/3d/voxel_light_baker.cpp +++ b/scene/3d/voxel_light_baker.cpp @@ -461,16 +461,16 @@ void VoxelLightBaker::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p } } - if (bake_cells[p_idx].childs[i] == CHILD_EMPTY) { + if (bake_cells[p_idx].children[i] == CHILD_EMPTY) { //sub cell must be created uint32_t child_idx = bake_cells.size(); - bake_cells[p_idx].childs[i] = child_idx; + bake_cells[p_idx].children[i] = child_idx; bake_cells.resize(bake_cells.size() + 1); bake_cells[child_idx].level = p_level + 1; } - _plot_face(bake_cells[p_idx].childs[i], p_level + 1, nx, ny, nz, p_vtx, p_normal, p_uv, p_material, aabb); + _plot_face(bake_cells[p_idx].children[i], p_level + 1, nx, ny, nz, p_vtx, p_normal, p_uv, p_material, aabb); } } } @@ -700,7 +700,7 @@ void VoxelLightBaker::_init_light_plot(int p_idx, int p_level, int p_x, int p_y, int half = (1 << (cell_subdiv - 1)) >> (p_level + 1); for (int i = 0; i < 8; i++) { - uint32_t child = bake_cells[p_idx].childs[i]; + uint32_t child = bake_cells[p_idx].children[i]; if (child == CHILD_EMPTY) continue; @@ -809,7 +809,7 @@ uint32_t VoxelLightBaker::_find_cell_at_pos(const Cell *cells, int x, int y, int ofs_z += half; } - cell = bc->childs[child]; + cell = bc->children[child]; if (cell == CHILD_EMPTY) return CHILD_EMPTY; @@ -1257,7 +1257,7 @@ void VoxelLightBaker::_fixup_plot(int p_idx, int p_level) { for (int i = 0; i < 8; i++) { - uint32_t child = bake_cells[p_idx].childs[i]; + uint32_t child = bake_cells[p_idx].children[i]; if (child == CHILD_EMPTY) continue; @@ -1483,7 +1483,7 @@ void VoxelLightBaker::_sample_baked_octree_filtered_and_anisotropic(const Vector ofs_z += half; } - cell = bc->childs[child]; + cell = bc->children[child]; if (cell == CHILD_EMPTY) break; @@ -1766,7 +1766,7 @@ Vector3 VoxelLightBaker::_compute_ray_trace_at_pos(const Vector3 &p_pos, const V ofs_z += half; } - cell = bc->childs[child]; + cell = bc->children[child]; if (unlikely(cell == CHILD_EMPTY)) break; @@ -1928,7 +1928,7 @@ Error VoxelLightBaker::make_lightmap(const Transform &p_xform, Ref<Mesh> &p_mesh for (int i = 0; i < height; i++) { for (int j = 0; j < width; j++) { if (lightmap_ptr[i * width + j].normal == Vector3()) - continue; //empty, dont write over it anyway + continue; //empty, don't write over it anyway float gauss_sum = gauss_kernel[0]; Vector3 accum = lightmap_ptr[i * width + j].pos * gauss_kernel[0]; for (int k = 1; k < 4; k++) { @@ -2191,7 +2191,7 @@ PoolVector<int> VoxelLightBaker::create_gi_probe_data() { for (int i = 0; i < bake_cells.size(); i++) { for (int j = 0; j < 8; j++) { - w32[ofs++] = bake_cells[i].childs[j]; + w32[ofs++] = bake_cells[i].children[j]; } { //albedo @@ -2275,7 +2275,7 @@ void VoxelLightBaker::_debug_mesh(int p_idx, int p_level, const AABB &p_aabb, Re for (int i = 0; i < 8; i++) { - uint32_t child = bake_cells[p_idx].childs[i]; + uint32_t child = bake_cells[p_idx].children[i]; if (child == CHILD_EMPTY || child >= max_original_cells) continue; @@ -2290,7 +2290,7 @@ void VoxelLightBaker::_debug_mesh(int p_idx, int p_level, const AABB &p_aabb, Re if (i & 4) aabb.position.z += aabb.size.z; - _debug_mesh(bake_cells[p_idx].childs[i], p_level + 1, aabb, p_multimesh, idx, p_mode); + _debug_mesh(bake_cells[p_idx].children[i], p_level + 1, aabb, p_multimesh, idx, p_mode); } } } @@ -2423,7 +2423,7 @@ PoolVector<uint8_t> VoxelLightBaker::create_capture_octree(int p_subdiv) { } for (int j = 0; j < 8; j++) { - uint32_t child = bake_cells[demap[i]].childs[j]; + uint32_t child = bake_cells[demap[i]].children[j]; octree[i].children[j] = child == CHILD_EMPTY ? CHILD_EMPTY : remap[child]; } } diff --git a/scene/3d/voxel_light_baker.h b/scene/3d/voxel_light_baker.h index d270a26a2a..6a1f1253a3 100644 --- a/scene/3d/voxel_light_baker.h +++ b/scene/3d/voxel_light_baker.h @@ -60,7 +60,7 @@ private: struct Cell { - uint32_t childs[8]; + uint32_t children[8]; float albedo[3]; //albedo in RGB24 float emission[3]; //accumulated light in 16:16 fixed point (needs to be integer for moving lights fast) float normal[3]; @@ -70,7 +70,7 @@ private: Cell() { for (int i = 0; i < 8; i++) { - childs[i] = CHILD_EMPTY; + children[i] = CHILD_EMPTY; } for (int i = 0; i < 3; i++) { diff --git a/scene/gui/base_button.h b/scene/gui/base_button.h index 9e0e1493d1..6917e112ab 100644 --- a/scene/gui/base_button.h +++ b/scene/gui/base_button.h @@ -90,8 +90,8 @@ public: /* Signals */ - bool is_pressed() const; ///< return wether button is pressed (toggled in) - bool is_pressing() const; ///< return wether button is pressed (toggled in) + bool is_pressed() const; ///< return whether button is pressed (toggled in) + bool is_pressing() const; ///< return whether button is pressed (toggled in) bool is_hovered() const; void set_pressed(bool p_pressed); ///only works in toggle mode diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index d9d033dfb9..01415594d3 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2013,7 +2013,7 @@ Control *Control::find_prev_valid_focus() const { if (from->is_set_as_toplevel() || !Object::cast_to<Control>(from->get_parent())) { - //find last of the childs + //find last of the children prev_child = _prev_control(from); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 4d87a6b3ba..95bd676a08 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -455,7 +455,7 @@ void TextEdit::_update_selection_mode_word() { end += 1; } - // inital selection + // initial selection if (!selection.active) { select(row, beg, row, end); selection.selecting_column = beg; @@ -888,7 +888,7 @@ void TextEdit::_notification(int p_what) { VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(xmargin_beg + ofs_x, ofs_y, char_w, get_row_height()), cache.selection_color); } } else { - // if it has text, then draw current line marker in the margin, as line number ect will draw over it, draw the rest of line marker later. + // if it has text, then draw current line marker in the margin, as line number etc will draw over it, draw the rest of line marker later. if (line == cursor.line && highlight_current_line) { VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(0, ofs_y, xmargin_beg, get_row_height()), cache.current_line_color); } @@ -937,7 +937,7 @@ void TextEdit::_notification(int p_what) { cache.font->draw(ci, Point2(cache.style_normal->get_margin(MARGIN_LEFT) + cache.breakpoint_gutter_width + ofs_x, ofs_y + cache.font->get_ascent()), fc, cache.line_number_color); } - //loop through charcters in one line + //loop through characters in one line for (int j = 0; j < str.length(); j++) { //look for keyword @@ -1775,15 +1775,16 @@ void TextEdit::indent_left() { void TextEdit::_get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) const { float rows = p_mouse.y; + rows -= cache.style_normal->get_margin(MARGIN_TOP); + rows += (CLAMP(v_scroll->get_value() - get_line_scroll_pos(true), 0, 1) * get_row_height()); rows /= get_row_height(); - rows += v_scroll->get_value(); - int row = Math::floor(rows); + int first_vis_line = CLAMP(cursor.line_ofs, 0, text.size() - 1); + int row = first_vis_line + Math::floor(rows); if (is_hiding_enabled()) { // row will be offset by the hidden rows - int lsp = get_line_scroll_pos(true); - int f_ofs = num_lines_from(CLAMP(cursor.line_ofs, 0, text.size() - 1), MIN(row + 1 - cursor.line_ofs, text.size() - cursor.line_ofs)) - 1; - row = cursor.line_ofs + f_ofs; + int f_ofs = num_lines_from(first_vis_line, rows + 1) - 1; + row = first_vis_line + f_ofs; row = CLAMP(row, 0, text.size() - num_lines_from(text.size() - 1, -1)); } @@ -3130,7 +3131,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { return; } - if (!scancode_handled && !k->get_command()) { //for german kbds + if (!scancode_handled && !k->get_command()) { //for German kbds if (k->get_unicode() >= 32) { diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index a4b703af9e..e12044fca2 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -45,12 +45,12 @@ void TreeItem::move_to_top() { - if (!parent || parent->childs == this) + if (!parent || parent->children == this) return; //already on top TreeItem *prev = get_prev(); prev->next = next; - next = parent->childs; - parent->childs = this; + next = parent->children; + parent->children = this; } void TreeItem::move_to_bottom() { @@ -65,7 +65,7 @@ void TreeItem::move_to_bottom() { if (prev) { prev->next = next; } else { - parent->childs = next; + parent->children = next; } last->next = this; next = NULL; @@ -368,10 +368,10 @@ TreeItem *TreeItem::get_next() { TreeItem *TreeItem::get_prev() { - if (!parent || parent->childs == this) + if (!parent || parent->children == this) return NULL; - TreeItem *prev = parent->childs; + TreeItem *prev = parent->children; while (prev && prev->next != this) prev = prev->next; @@ -385,7 +385,7 @@ TreeItem *TreeItem::get_parent() { TreeItem *TreeItem::get_children() { - return childs; + return children; } TreeItem *TreeItem::get_prev_visible() { @@ -402,10 +402,10 @@ TreeItem *TreeItem::get_prev_visible() { } else { current = prev; - while (!current->collapsed && current->childs) { + while (!current->collapsed && current->children) { //go to the very end - current = current->childs; + current = current->children; while (current->next) current = current->next; } @@ -418,9 +418,9 @@ TreeItem *TreeItem::get_next_visible() { TreeItem *current = this; - if (!current->collapsed && current->childs) { + if (!current->collapsed && current->children) { - current = current->childs; + current = current->children; } else if (current->next) { @@ -444,7 +444,7 @@ TreeItem *TreeItem::get_next_visible() { void TreeItem::remove_child(TreeItem *p_item) { ERR_FAIL_NULL(p_item); - TreeItem **c = &childs; + TreeItem **c = &children; while (*c) { @@ -802,16 +802,16 @@ void TreeItem::_bind_methods() { void TreeItem::clear_children() { - TreeItem *c = childs; + TreeItem *c = children; while (c) { TreeItem *aux = c; c = c->get_next(); - aux->parent = 0; // so it wont try to recursively autoremove from me in here + aux->parent = 0; // so it won't try to recursively autoremove from me in here memdelete(aux); } - childs = 0; + children = 0; }; TreeItem::TreeItem(Tree *p_tree) { @@ -823,7 +823,7 @@ TreeItem::TreeItem(Tree *p_tree) { parent = 0; // parent item next = 0; // next in list - childs = 0; //child items + children = 0; //child items } TreeItem::~TreeItem() { @@ -977,9 +977,9 @@ int Tree::get_item_height(TreeItem *p_item) const { int height = compute_item_height(p_item); height += cache.vseparation; - if (!p_item->collapsed) { /* if not collapsed, check the childs */ + if (!p_item->collapsed) { /* if not collapsed, check the children */ - TreeItem *c = p_item->childs; + TreeItem *c = p_item->children; while (c) { @@ -1386,7 +1386,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 } } - if (!p_item->disable_folding && !hide_folding && p_item->childs) { //has childs, draw the guide box + if (!p_item->disable_folding && !hide_folding && p_item->children) { //has children, draw the guide box Ref<Texture> arrow; @@ -1413,9 +1413,9 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 children_pos.y += htotal; } - if (!p_item->collapsed) { /* if not collapsed, check the childs */ + if (!p_item->collapsed) { /* if not collapsed, check the children */ - TreeItem *c = p_item->childs; + TreeItem *c = p_item->children; while (c) { @@ -1569,7 +1569,7 @@ void Tree::select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_c *r_in_range = false; } - TreeItem *c = p_current->childs; + TreeItem *c = p_current->children; while (c) { @@ -1635,7 +1635,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool if (!p_item->disable_folding && !hide_folding && (p_pos.x >= x_ofs && p_pos.x < (x_ofs + cache.item_margin))) { - if (p_item->childs) + if (p_item->children) p_item->set_collapsed(!p_item->is_collapsed()); return -1; //handled! @@ -1942,9 +1942,9 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool new_pos.y -= item_h; } - if (!p_item->collapsed) { /* if not collapsed, check the childs */ + if (!p_item->collapsed) { /* if not collapsed, check the children */ - TreeItem *c = p_item->childs; + TreeItem *c = p_item->children; while (c) { @@ -2988,7 +2988,7 @@ TreeItem *Tree::create_item(TreeItem *p_parent, int p_idx) { ti->cells.resize(columns.size()); TreeItem *prev = NULL; - TreeItem *c = p_parent->childs; + TreeItem *c = p_parent->children; int idx = 0; while (c) { @@ -3003,7 +3003,7 @@ TreeItem *Tree::create_item(TreeItem *p_parent, int p_idx) { if (prev) prev->next = ti; else - p_parent->childs = ti; + p_parent->children = ti; ti->parent = p_parent; } else { @@ -3036,8 +3036,8 @@ TreeItem *Tree::get_last_item() { if (last->next) last = last->next; - else if (last->childs) - last = last->childs; + else if (last->children) + last = last->children; else break; } @@ -3208,9 +3208,9 @@ TreeItem *Tree::get_next_selected(TreeItem *p_item) { p_item = root; } else { - if (p_item->childs) { + if (p_item->children) { - p_item = p_item->childs; + p_item = p_item->children; } else if (p_item->next) { @@ -3325,9 +3325,9 @@ int Tree::get_item_offset(TreeItem *p_item) const { ofs += compute_item_height(it) + cache.vseparation; - if (it->childs && !it->collapsed) { + if (it->children && !it->collapsed) { - it = it->childs; + it = it->children; } else if (it->next) { @@ -3548,7 +3548,7 @@ TreeItem *Tree::_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_ } if (p_item->is_collapsed()) - return NULL; // do not try childs, it's collapsed + return NULL; // do not try children, it's collapsed TreeItem *n = p_item->get_children(); while (n) { @@ -3821,7 +3821,7 @@ void Tree::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_rmb_select"), "set_allow_rmb_select", "get_allow_rmb_select"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "hide_folding"), "set_hide_folding", "is_folding_hidden"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "hide_root"), "set_hide_root", "is_root_hidden"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "drop_mode_flags", PROPERTY_HINT_FLAGS, "On Item,Inbetween"), "set_drop_mode_flags", "get_drop_mode_flags"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "drop_mode_flags", PROPERTY_HINT_FLAGS, "On Item,In between"), "set_drop_mode_flags", "get_drop_mode_flags"); ADD_PROPERTY(PropertyInfo(Variant::INT, "select_mode", PROPERTY_HINT_ENUM, "Single,Row,Multi"), "set_select_mode", "get_select_mode"); ADD_SIGNAL(MethodInfo("item_selected")); diff --git a/scene/gui/tree.h b/scene/gui/tree.h index 709ff73971..2a8546a743 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -144,13 +144,13 @@ private: Vector<Cell> cells; - bool collapsed; // wont show childs + bool collapsed; // won't show children bool disable_folding; int custom_min_height; TreeItem *parent; // parent item TreeItem *next; // next in list - TreeItem *childs; //child items + TreeItem *children; //child items Tree *tree; //tree (for reference) TreeItem(Tree *p_tree); diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 148cdaf526..ac85dd64af 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -184,7 +184,7 @@ void Node::_propagate_ready() { } void Node::_propagate_enter_tree() { - // this needs to happen to all childs before any enter_tree + // this needs to happen to all children before any enter_tree if (data.parent) { data.tree = data.parent->data.tree; @@ -1202,13 +1202,13 @@ void Node::_validate_child_name(Node *p_child, bool p_force_human_readable) { unique = false; } else { //check if exists - Node **childs = data.children.ptrw(); + Node **children = data.children.ptrw(); int cc = data.children.size(); for (int i = 0; i < cc; i++) { - if (childs[i] == p_child) + if (children[i] == p_child) continue; - if (childs[i]->data.name == p_child->data.name) { + if (children[i]->data.name == p_child->data.name) { unique = false; break; } @@ -1311,7 +1311,7 @@ void Node::_add_child_nocheck(Node *p_child, const StringName &p_name) { } /* Notify */ - //recognize childs created in this node constructor + //recognize children created in this node constructor p_child->data.parent_owned = data.in_constructor; add_child_notify(p_child); } diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 1a2ea796bd..1ff1f4b6d8 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -196,8 +196,6 @@ void Viewport::_update_stretch_transform() { if (size_override_stretch && size_override) { - //print_line("sive override size "+size_override_size); - //print_line("rect size "+size); stretch_transform = Transform2D(); Size2 scale = size / (size_override_size + size_override_margin * 2); stretch_transform.scale(scale); @@ -211,114 +209,6 @@ void Viewport::_update_stretch_transform() { _update_global_transform(); } -void Viewport::_update_rect() { - - if (!is_inside_tree()) - return; - - /*if (!render_target && parent_control) { - - Control *c = parent_control; - - rect.pos=Point2(); - rect.size=c->get_size(); - }*/ - /* - VisualServer::ViewportRect vr; - vr.x=rect.pos.x; - vr.y=rect.pos.y; - - if (render_target) { - vr.x=0; - vr.y=0; - } - vr.width=rect.size.width; - vr.height=rect.size.height; - - VisualServer::get_singleton()->viewport_set_rect(viewport,vr); - last_vp_rect=rect; - - if (canvas_item.is_valid()) { - VisualServer::get_singleton()->canvas_item_set_custom_rect(canvas_item,true,rect); - } - - emit_signal("size_changed"); - texture->emit_changed(); -*/ -} - -void Viewport::_parent_resized() { - - _update_rect(); -} - -void Viewport::_parent_draw() { -} - -void Viewport::_parent_visibility_changed() { - - /* - if (parent_control) { - - Control *c = parent_control; - VisualServer::get_singleton()->canvas_item_set_visible(canvas_item,c->is_visible_in_tree()); - - _update_listener(); - _update_listener_2d(); - } -*/ -} - -void Viewport::_vp_enter_tree() { - - /* if (parent_control) { - - Control *cparent=parent_control; - RID parent_ci = cparent->get_canvas_item(); - ERR_FAIL_COND(!parent_ci.is_valid()); - canvas_item = VisualServer::get_singleton()->canvas_item_create(); - - VisualServer::get_singleton()->canvas_item_set_parent(canvas_item,parent_ci); - VisualServer::get_singleton()->canvas_item_set_visible(canvas_item,false); - //VisualServer::get_singleton()->canvas_item_attach_viewport(canvas_item,viewport); - parent_control->connect("resized",this,"_parent_resized"); - parent_control->connect("visibility_changed",this,"_parent_visibility_changed"); - } else if (!parent){ - - //VisualServer::get_singleton()->viewport_attach_to_screen(viewport,0); - - } -*/ -} - -void Viewport::_vp_exit_tree() { - - /* - if (parent_control) { - - parent_control->disconnect("resized",this,"_parent_resized"); - } - - if (parent_control) { - - parent_control->disconnect("visibility_changed",this,"_parent_visibility_changed"); - } - - if (canvas_item.is_valid()) { - - VisualServer::get_singleton()->free(canvas_item); - canvas_item=RID(); - - } - - if (!parent) { - - VisualServer::get_singleton()->viewport_detach(viewport); - - } -*/ -} - void Viewport::update_worlds() { if (!is_inside_tree()) @@ -376,7 +266,6 @@ void Viewport::_notification(int p_what) { _update_listener(); _update_listener_2d(); - _update_rect(); find_world_2d()->_register_viewport(this, Rect2()); @@ -436,11 +325,6 @@ void Viewport::_notification(int p_what) { if (world_2d.is_valid()) world_2d->_remove_viewport(this); - /* - if (!render_target) - _vp_exit_tree(); - */ - VisualServer::get_singleton()->viewport_set_scenario(viewport, RID()); // SpatialSoundServer::get_singleton()->listener_set_space(internal_listener, RID()); VisualServer::get_singleton()->viewport_remove_canvas(viewport, current_canvas); @@ -718,7 +602,6 @@ void Viewport::set_size(const Size2 &p_size) { size = p_size.floor(); VS::get_singleton()->viewport_set_size(viewport, size.width, size.height); - _update_rect(); _update_stretch_transform(); emit_signal("size_changed"); @@ -1167,7 +1050,7 @@ void Viewport::set_size_override(bool p_enable, const Size2 &p_size, const Vecto size_override_size = p_size; } size_override_margin = p_margin; - _update_rect(); + _update_stretch_transform(); emit_signal("size_changed"); } @@ -1186,9 +1069,6 @@ void Viewport::set_size_override_stretch(bool p_enable) { return; size_override_stretch = p_enable; - if (size_override) { - _update_rect(); - } _update_stretch_transform(); } @@ -2684,9 +2564,6 @@ void Viewport::_bind_methods() { ClassDB::bind_method(D_METHOD("set_transparent_background", "enable"), &Viewport::set_transparent_background); ClassDB::bind_method(D_METHOD("has_transparent_background"), &Viewport::has_transparent_background); - ClassDB::bind_method(D_METHOD("_parent_visibility_changed"), &Viewport::_parent_visibility_changed); - - ClassDB::bind_method(D_METHOD("_parent_resized"), &Viewport::_parent_resized); ClassDB::bind_method(D_METHOD("_vp_input"), &Viewport::_vp_input); ClassDB::bind_method(D_METHOD("_vp_input_text", "text"), &Viewport::_vp_input_text); ClassDB::bind_method(D_METHOD("_vp_unhandled_input"), &Viewport::_vp_unhandled_input); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 48e2929e54..07bbd3f1fa 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -206,12 +206,6 @@ private: void _test_new_mouseover(ObjectID new_collider); Map<ObjectID, uint64_t> physics_2d_mouseover; - void _update_rect(); - - void _parent_resized(); - void _parent_draw(); - void _parent_visibility_changed(); - Ref<World2D> world_2d; Ref<World> world; Ref<World> own_world; @@ -294,9 +288,6 @@ private: _FORCE_INLINE_ Transform2D _get_input_pre_xform() const; - void _vp_enter_tree(); - void _vp_exit_tree(); - void _vp_input(const Ref<InputEvent> &p_ev); void _vp_input_text(const String &p_text); void _vp_unhandled_input(const Ref<InputEvent> &p_ev); diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index dd8d0e2141..3df9285bb6 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -1119,7 +1119,7 @@ void SceneState::set_bundled_scene(const Dictionary &p_dictionary) { uint32_t name_index = r[idx++]; nd.name = name_index & ((1 << NAME_INDEX_BITS) - 1); nd.index = (name_index >> NAME_INDEX_BITS); - nd.index--; //0 is invaild, stored as 1 + nd.index--; //0 is invalid, stored as 1 nd.instance = r[idx++]; nd.properties.resize(r[idx++]); for (int j = 0; j < nd.properties.size(); j++) { @@ -1212,7 +1212,7 @@ Dictionary SceneState::get_bundled_scene() const { rnodes.push_back(nd.owner); rnodes.push_back(nd.type); uint32_t name_index = nd.name; - if (nd.index < (1 << (32 - NAME_INDEX_BITS)) - 1) { //save if less than 16k childs + if (nd.index < (1 << (32 - NAME_INDEX_BITS)) - 1) { //save if less than 16k children name_index |= uint32_t(nd.index + 1) << NAME_INDEX_BITS; //for backwards compatibility, index 0 is no index } rnodes.push_back(name_index); diff --git a/scene/resources/primitive_meshes.h b/scene/resources/primitive_meshes.h index 2b7294141a..1eaa007bd7 100644 --- a/scene/resources/primitive_meshes.h +++ b/scene/resources/primitive_meshes.h @@ -39,7 +39,7 @@ @author Bastiaan Olij <mux213@gmail.com> Base class for all the classes in this file, handles a number of code functions that are shared among all meshes. - This class is set appart that it assumes a single surface is always generated for our mesh. + This class is set apart that it assumes a single surface is always generated for our mesh. */ class PrimitiveMesh : public Mesh { diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp index 71a691fe27..0faa0dc770 100644 --- a/scene/resources/scene_format_text.cpp +++ b/scene/resources/scene_format_text.cpp @@ -1411,7 +1411,7 @@ void ResourceFormatSaverTextInstance::_find_resources(const Variant &p_variant, I = I->next(); } - resource_set.insert(res); //saved after, so the childs it needs are available when loaded + resource_set.insert(res); //saved after, so the children it needs are available when loaded saved_resources.push_back(res); } break; diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index 800710ed2a..3138d73caf 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -212,7 +212,7 @@ bool TileSet::_get(const StringName &p_name, Variant &r_ret) const { Vector3 v; for (Map<Vector2, int>::Element *E = tile_map[id].autotile_data.priority_map.front(); E; E = E->next()) { if (E->value() > 1) { - //Dont save default value + //Don't save default value v.x = E->key().x; v.y = E->key().y; v.z = E->value(); diff --git a/servers/arvr_server.cpp b/servers/arvr_server.cpp index 1804d97555..d373a7d6f5 100644 --- a/servers/arvr_server.cpp +++ b/servers/arvr_server.cpp @@ -212,7 +212,7 @@ Array ARVRServer::get_interfaces() const { }; /* - A little extra info on the tracker ids, these are unique per tracker type so we get soem consistency in recognising our trackers, specifically controllers. + A little extra info on the tracker ids, these are unique per tracker type so we get some consistency in recognising our trackers, specifically controllers. The first controller that is turned of will get ID 1, the second will get ID 2, etc. The magic happens when one of the controllers is turned off, say controller 1 turns off, controller 2 will remain controller 2, controller 3 will remain controller 3. diff --git a/servers/arvr_server.h b/servers/arvr_server.h index cb0e3949d4..34f143c0e0 100644 --- a/servers/arvr_server.h +++ b/servers/arvr_server.h @@ -95,7 +95,7 @@ public: /* World scale allows you to specify a scale factor that is applied to all positioning vectors in our VR world in essence scaling up, or scaling down the world. For stereoscopic rendering specifically this is very important to give an accurate sense of scale. - Add controllers into the mix and an accurate mapping of real world movement to percieved virtual movement becomes very important. + Add controllers into the mix and an accurate mapping of real world movement to perceived virtual movement becomes very important. Most VR platforms, and our assumption, is that 1 unit in our virtual world equates to 1 meter in the real mode. This scale basically effects the unit size relationship to real world size. @@ -112,7 +112,7 @@ public: in relation to this point. Note that the ARVROrigin spatial node in your scene automatically updates this property and it should be used instead of - direct access to this property and it therefor is not available in GDScript + direct access to this property and it therefore is not available in GDScript Note: this should not be used in AR and should be ignored by an AR based interface as it would throw what you're looking at in the real world and in the virtual world out of sync diff --git a/servers/audio/audio_rb_resampler.cpp b/servers/audio/audio_rb_resampler.cpp index dc917e29e2..9faa4056c3 100644 --- a/servers/audio/audio_rb_resampler.cpp +++ b/servers/audio/audio_rb_resampler.cpp @@ -41,7 +41,7 @@ int AudioRBResampler::get_channel_count() const { return channels; } -// Linear interpolation based sample rate convertion (low quality) +// Linear interpolation based sample rate conversion (low quality) // Note that AudioStreamPlaybackResampled::mix has better algorithm, // but it wasn't obvious to integrate that with VideoPlayer template <int C> diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp index 8d8bbb881f..0920fa748b 100644 --- a/servers/visual/visual_server_scene.cpp +++ b/servers/visual/visual_server_scene.cpp @@ -2091,7 +2091,7 @@ bool VisualServerScene::_render_reflection_probe_step(Instance *p_instance, int _render_scene(xform, cm, false, RID(), VSG::storage->reflection_probe_get_cull_mask(p_instance->base), p_instance->scenario->self, shadow_atlas, reflection_probe->instance, p_step); } else { - //do roughness postprocess step until it belives it's done + //do roughness postprocess step until it believes it's done return VSG::scene_render->reflection_probe_instance_postprocess_step(reflection_probe->instance); } diff --git a/servers/visual/visual_server_viewport.cpp b/servers/visual/visual_server_viewport.cpp index 222dc6351b..3eb8953c1f 100644 --- a/servers/visual/visual_server_viewport.cpp +++ b/servers/visual/visual_server_viewport.cpp @@ -505,7 +505,7 @@ void VisualServerViewport::viewport_set_transparent_background(RID p_viewport, b ERR_FAIL_COND(!viewport); VSG::storage->render_target_set_flag(viewport->render_target, RasterizerStorage::RENDER_TARGET_TRANSPARENT, p_enabled); - viewport->transparent_bg = true; + viewport->transparent_bg = p_enabled; } void VisualServerViewport::viewport_set_global_canvas_transform(RID p_viewport, const Transform2D &p_transform) { diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index 236b7ccb83..c86a8164ce 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -394,7 +394,7 @@ public: FUNC2(viewport_set_hdr, RID, bool) FUNC2(viewport_set_usage, RID, ViewportUsage) - //this passes directly to avoid stalling, but it's pretty dangerous, so dont call after freeing a viewport + //this passes directly to avoid stalling, but it's pretty dangerous, so don't call after freeing a viewport virtual int viewport_get_render_info(RID p_viewport, ViewportRenderInfo p_info) { return visual_server->viewport_get_render_info(p_viewport, p_info); } diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index 5f520f1d04..faa8c50837 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -441,9 +441,9 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ for (int i = 0; i < p_vertex_array_len; i++) { int8_t vector[4] = { - CLAMP(src[i].x * 127, -128, 127), - CLAMP(src[i].y * 127, -128, 127), - CLAMP(src[i].z * 127, -128, 127), + (int8_t)CLAMP(src[i].x * 127, -128, 127), + (int8_t)CLAMP(src[i].y * 127, -128, 127), + (int8_t)CLAMP(src[i].z * 127, -128, 127), 0, }; @@ -476,10 +476,10 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ for (int i = 0; i < p_vertex_array_len; i++) { uint8_t xyzw[4] = { - CLAMP(src[i * 4 + 0] * 127, -128, 127), - CLAMP(src[i * 4 + 1] * 127, -128, 127), - CLAMP(src[i * 4 + 2] * 127, -128, 127), - CLAMP(src[i * 4 + 3] * 127, -128, 127) + (uint8_t)CLAMP(src[i * 4 + 0] * 127, -128, 127), + (uint8_t)CLAMP(src[i * 4 + 1] * 127, -128, 127), + (uint8_t)CLAMP(src[i * 4 + 2] * 127, -128, 127), + (uint8_t)CLAMP(src[i * 4 + 3] * 127, -128, 127) }; copymem(&vw[p_offsets[ai] + i * p_stride], xyzw, 4); @@ -678,7 +678,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ ERR_FAIL_COND_V(indices.size() == 0, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(indices.size() != p_index_array_len, ERR_INVALID_PARAMETER); - /* determine wether using 16 or 32 bits indices */ + /* determine whether using 16 or 32 bits indices */ PoolVector<int>::Read read = indices.read(); const int *src = read.ptr(); @@ -943,7 +943,7 @@ void VisualServer::mesh_add_surface_from_arrays(RID p_mesh, PrimitiveType p_prim ERR_PRINT("index_array_len==NO_INDEX_ARRAY"); break; } - /* determine wether using 16 or 32 bits indices */ + /* determine whether using 16 or 32 bits indices */ if (array_len >= (1 << 16)) { elem_size = 4; @@ -1111,7 +1111,7 @@ Array VisualServer::_get_array_from_surface(uint32_t p_format, PoolVector<uint8_ ERR_PRINT("index_array_len==NO_INDEX_ARRAY"); break; } - /* determine wether using 16 or 32 bits indices */ + /* determine whether using 16 or 32 bits indices */ if (p_vertex_len >= (1 << 16)) { elem_size = 4; @@ -1397,7 +1397,7 @@ Array VisualServer::_get_array_from_surface(uint32_t p_format, PoolVector<uint8_ } break; case VS::ARRAY_INDEX: { - /* determine wether using 16 or 32 bits indices */ + /* determine whether using 16 or 32 bits indices */ PoolVector<uint8_t>::Read ir = p_index_data.read(); |