diff options
46 files changed, 184 insertions, 134 deletions
diff --git a/core/script_language.cpp b/core/script_language.cpp index b63aeb952c..bb2e9a07ff 100644 --- a/core/script_language.cpp +++ b/core/script_language.cpp @@ -275,7 +275,11 @@ void ScriptServer::save_global_classes() { gcarr.push_back(d); } - ProjectSettings::get_singleton()->set("_global_script_classes", gcarr); + if (gcarr.empty()) { + ProjectSettings::get_singleton()->clear("_global_script_classes"); + } else { + ProjectSettings::get_singleton()->set("_global_script_classes", gcarr); + } ProjectSettings::get_singleton()->save(); } diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml index 3b33bbb45b..f495bfe894 100644 --- a/doc/classes/Control.xml +++ b/doc/classes/Control.xml @@ -669,7 +669,7 @@ <return type="void"> </return> <description> - Invalidates the size cache in this node and in parent nodes up to toplevel. Intended to be used with [method get_minimum_size] when the return value is changed. Setting [member rect_min_size] directly calls this method automatically. + Invalidates the size cache in this node and in parent nodes up to top_level. Intended to be used with [method get_minimum_size] when the return value is changed. Setting [member rect_min_size] directly calls this method automatically. </description> </method> <method name="release_focus"> diff --git a/doc/classes/RigidBody2D.xml b/doc/classes/RigidBody2D.xml index 101f29c43e..eca5b8054d 100644 --- a/doc/classes/RigidBody2D.xml +++ b/doc/classes/RigidBody2D.xml @@ -138,7 +138,7 @@ </member> <member name="contacts_reported" type="int" setter="set_max_contacts_reported" getter="get_max_contacts_reported" default="0"> The maximum number of contacts that will be recorded. Requires [member contact_monitor] to be set to [code]true[/code]. - [b]Note:[/b] The number of contacts is different from the number of collisions. Collisions between parallel edges will result in two contacts (one at each end), and collisions between parallel faces will result in four contacts (one at each corner). + [b]Note:[/b] The number of contacts is different from the number of collisions. Collisions between parallel edges will result in two contacts (one at each end). </member> <member name="continuous_cd" type="int" setter="set_continuous_collision_detection_mode" getter="get_continuous_collision_detection_mode" enum="RigidBody2D.CCDMode" default="0"> Continuous collision detection mode. diff --git a/doc/translations/ar.po b/doc/translations/ar.po index eae5d09b38..1857e45627 100644 --- a/doc/translations/ar.po +++ b/doc/translations/ar.po @@ -11069,7 +11069,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14163,7 +14163,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32615,7 +32615,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/ca.po b/doc/translations/ca.po index caa43cfa3a..2e5c7e2c84 100644 --- a/doc/translations/ca.po +++ b/doc/translations/ca.po @@ -11100,7 +11100,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14194,7 +14194,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32646,7 +32646,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/classes.pot b/doc/translations/classes.pot index 7f352bce28..41c20b05ea 100644 --- a/doc/translations/classes.pot +++ b/doc/translations/classes.pot @@ -11070,7 +11070,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14164,7 +14164,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32616,7 +32616,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/cs.po b/doc/translations/cs.po index 8f8cb7da91..8d94351710 100644 --- a/doc/translations/cs.po +++ b/doc/translations/cs.po @@ -11562,7 +11562,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14656,7 +14656,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -33115,7 +33115,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/de.po b/doc/translations/de.po index 740d4eed12..95b73f8257 100644 --- a/doc/translations/de.po +++ b/doc/translations/de.po @@ -11385,7 +11385,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14492,7 +14492,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -33032,7 +33032,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/es.po b/doc/translations/es.po index 4d71c12010..ef6012b240 100644 --- a/doc/translations/es.po +++ b/doc/translations/es.po @@ -14573,10 +14573,10 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" "Devuelve [code]true[/code] si el nodo está configurado como de nivel " -"superior. Ver [method set_as_toplevel]." +"superior. Ver [method set_as_top_level]." #: doc/classes/CanvasItem.xml:530 msgid "" @@ -18642,7 +18642,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -44207,10 +44207,10 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" -"Devuelve si este nodo se establece como Toplevel, es decir, si ignora las " +"Devuelve si este nodo se establece como top_level, es decir, si ignora las " "transformaciones de sus nodos padres." #: doc/classes/Node3D.xml:97 diff --git a/doc/translations/fa.po b/doc/translations/fa.po index 874d3273c3..06d6ee47d7 100644 --- a/doc/translations/fa.po +++ b/doc/translations/fa.po @@ -11075,7 +11075,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14169,7 +14169,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32621,7 +32621,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/fi.po b/doc/translations/fi.po index 3163a6131f..02ac9fdd76 100644 --- a/doc/translations/fi.po +++ b/doc/translations/fi.po @@ -11088,7 +11088,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14182,7 +14182,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32634,7 +32634,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/fr.po b/doc/translations/fr.po index 55434729e5..a8075d919d 100644 --- a/doc/translations/fr.po +++ b/doc/translations/fr.po @@ -11406,7 +11406,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14500,7 +14500,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32982,7 +32982,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/id.po b/doc/translations/id.po index 246cf15495..b686ef8de6 100644 --- a/doc/translations/id.po +++ b/doc/translations/id.po @@ -11101,7 +11101,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14195,7 +14195,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32647,7 +32647,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/it.po b/doc/translations/it.po index 8a8ec5d107..f664268ebe 100644 --- a/doc/translations/it.po +++ b/doc/translations/it.po @@ -11359,7 +11359,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14453,7 +14453,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32913,7 +32913,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/ja.po b/doc/translations/ja.po index 02072678ef..9727ca0cd3 100644 --- a/doc/translations/ja.po +++ b/doc/translations/ja.po @@ -12289,7 +12289,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -15383,7 +15383,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -33885,7 +33885,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/ko.po b/doc/translations/ko.po index ddc892b659..f69b5f00c0 100644 --- a/doc/translations/ko.po +++ b/doc/translations/ko.po @@ -11077,7 +11077,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14171,7 +14171,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32623,7 +32623,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/nl.po b/doc/translations/nl.po index 4f840c229c..17bd3db383 100644 --- a/doc/translations/nl.po +++ b/doc/translations/nl.po @@ -11103,7 +11103,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14197,7 +14197,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32649,7 +32649,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/pl.po b/doc/translations/pl.po index b3817aa5f6..fd494dc656 100644 --- a/doc/translations/pl.po +++ b/doc/translations/pl.po @@ -11121,7 +11121,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14215,7 +14215,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32668,7 +32668,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/pt_BR.po b/doc/translations/pt_BR.po index 89460c5caf..2e8337989f 100644 --- a/doc/translations/pt_BR.po +++ b/doc/translations/pt_BR.po @@ -11116,7 +11116,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14210,7 +14210,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32662,7 +32662,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/ro.po b/doc/translations/ro.po index fb47ddb0dc..f7e5e0f86f 100644 --- a/doc/translations/ro.po +++ b/doc/translations/ro.po @@ -11077,7 +11077,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14171,7 +14171,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32623,7 +32623,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/ru.po b/doc/translations/ru.po index 83c3440a64..6a397ec35d 100644 --- a/doc/translations/ru.po +++ b/doc/translations/ru.po @@ -11582,7 +11582,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14676,7 +14676,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -33160,7 +33160,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/sr_Cyrl.po b/doc/translations/sr_Cyrl.po index 6d0bd44ba7..156fbabfc0 100644 --- a/doc/translations/sr_Cyrl.po +++ b/doc/translations/sr_Cyrl.po @@ -11087,7 +11087,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14181,7 +14181,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32633,7 +32633,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/th.po b/doc/translations/th.po index 5753295ef4..cbcbc51f63 100644 --- a/doc/translations/th.po +++ b/doc/translations/th.po @@ -11093,7 +11093,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14187,7 +14187,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32639,7 +32639,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/tr.po b/doc/translations/tr.po index 0e5992ad0e..33208243f8 100644 --- a/doc/translations/tr.po +++ b/doc/translations/tr.po @@ -11069,7 +11069,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14163,7 +14163,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32615,7 +32615,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/uk.po b/doc/translations/uk.po index e94a78591f..45da6d19aa 100644 --- a/doc/translations/uk.po +++ b/doc/translations/uk.po @@ -11155,7 +11155,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14249,7 +14249,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32701,7 +32701,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/zh_Hans.po b/doc/translations/zh_Hans.po index 08e9667c29..2e9d14c0d8 100644 --- a/doc/translations/zh_Hans.po +++ b/doc/translations/zh_Hans.po @@ -11302,7 +11302,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14396,7 +14396,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32851,7 +32851,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/doc/translations/zh_Hant.po b/doc/translations/zh_Hant.po index e09b693f6e..9483576d0e 100644 --- a/doc/translations/zh_Hant.po +++ b/doc/translations/zh_Hant.po @@ -11106,7 +11106,7 @@ msgstr "" #: doc/classes/CanvasItem.xml:523 msgid "" "Returns [code]true[/code] if the node is set as top-level. See [method " -"set_as_toplevel]." +"set_as_top_level]." msgstr "" #: doc/classes/CanvasItem.xml:530 @@ -14200,7 +14200,7 @@ msgstr "" #: doc/classes/Control.xml:545 msgid "" -"Invalidates the size cache in this node and in parent nodes up to toplevel. " +"Invalidates the size cache in this node and in parent nodes up to top_level. " "Intended to be used with [method get_minimum_size] when the return value is " "changed. Setting [member rect_min_size] directly calls this method " "automatically." @@ -32652,7 +32652,7 @@ msgstr "" #: doc/classes/Node3D.xml:90 msgid "" -"Returns whether this node is set as Toplevel, that is whether it ignores its " +"Returns whether this node is set as top_level, that is whether it ignores its " "parent nodes transformations." msgstr "" diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index 5118ccacad..7537c86676 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -936,7 +936,11 @@ void EditorData::script_class_save_icon_paths() { } } - ProjectSettings::get_singleton()->set("_global_script_class_icons", d); + if (d.empty()) { + ProjectSettings::get_singleton()->clear("_global_script_class_icons"); + } else { + ProjectSettings::get_singleton()->set("_global_script_class_icons", d); + } ProjectSettings::get_singleton()->save(); } diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index ba9f27f65f..f4d52d6bce 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -1646,7 +1646,7 @@ EditorFileDialog::EditorFileDialog() { filter->connect("item_selected", callable_mp(this, &EditorFileDialog::_filter_selected)); confirm_save = memnew(ConfirmationDialog); - //confirm_save->set_as_toplevel(true); + //confirm_save->set_as_top_level(true); add_child(confirm_save); confirm_save->connect("confirmed", callable_mp(this, &EditorFileDialog::_save_confirm_pressed)); diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 8580bdf47e..b2fd855834 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -3566,7 +3566,7 @@ Vector3 Node3DEditorViewport::_get_instance_position(const Point2 &p_pos) const return point + offset; } -AABB Node3DEditorViewport::_calculate_spatial_bounds(const Node3D *p_parent, bool p_exclude_toplevel_transform) { +AABB Node3DEditorViewport::_calculate_spatial_bounds(const Node3D *p_parent, bool p_exclude_top_level_transform) { AABB bounds; const MeshInstance3D *mesh_instance = Object::cast_to<MeshInstance3D>(p_parent); @@ -3591,7 +3591,7 @@ AABB Node3DEditorViewport::_calculate_spatial_bounds(const Node3D *p_parent, boo bounds = AABB(Vector3(-0.2, -0.2, -0.2), Vector3(0.4, 0.4, 0.4)); } - if (!p_exclude_toplevel_transform) { + if (!p_exclude_top_level_transform) { bounds = p_parent->get_transform().xform(bounds); } diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h index b3dc4ef5f2..4f627b1d0c 100644 --- a/editor/plugins/node_3d_editor_plugin.h +++ b/editor/plugins/node_3d_editor_plugin.h @@ -450,7 +450,7 @@ private: Point2i _get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_ev_mouse_motion) const; Vector3 _get_instance_position(const Point2 &p_pos) const; - static AABB _calculate_spatial_bounds(const Node3D *p_parent, bool p_exclude_toplevel_transform = true); + static AABB _calculate_spatial_bounds(const Node3D *p_parent, bool p_exclude_top_level_transform = true); void _create_preview(const Vector<String> &files) const; void _remove_preview(); bool _cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node); diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp index d0515e7c97..9f4bfe3cef 100644 --- a/modules/bullet/space_bullet.cpp +++ b/modules/bullet/space_bullet.cpp @@ -959,8 +959,8 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f SceneTree::get_singleton()->get_current_scene()->add_child(motionVec); SceneTree::get_singleton()->get_current_scene()->add_child(normalLine); - motionVec->set_as_toplevel(true); - normalLine->set_as_toplevel(true); + motionVec->set_as_top_level(true); + normalLine->set_as_top_level(true); red_mat = Ref<StandardMaterial3D>(memnew(StandardMaterial3D)); red_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED); diff --git a/modules/gdscript/editor/gdscript_highlighter.cpp b/modules/gdscript/editor/gdscript_highlighter.cpp index 9a3273d201..7f7410a92c 100644 --- a/modules/gdscript/editor/gdscript_highlighter.cpp +++ b/modules/gdscript/editor/gdscript_highlighter.cpp @@ -73,6 +73,13 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting(int p_line) color_region_cache[p_line] = -1; int in_region = -1; if (p_line != 0) { + int prev_region_line = p_line - 1; + while (prev_region_line > 0 && !color_region_cache.has(prev_region_line)) { + prev_region_line--; + } + for (int i = prev_region_line; i < p_line - 1; i++) { + get_line_syntax_highlighting(i); + } if (!color_region_cache.has(p_line - 1)) { get_line_syntax_highlighting(p_line - 1); } diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp index 35c4b9d08d..138788cf2d 100644 --- a/scene/3d/node_3d.cpp +++ b/scene/3d/node_3d.cpp @@ -104,7 +104,7 @@ void Node3D::_propagate_transform_changed(Node3D *p_origin) { for (List<Node3D *>::Element *E = data.children.front(); E; E = E->next()) { if (E->get()->data.top_level_active) { - continue; //don't propagate to a toplevel + continue; //don't propagate to a top_level } E->get()->_propagate_transform_changed(p_origin); } @@ -715,8 +715,8 @@ void Node3D::_bind_methods() { ClassDB::bind_method(D_METHOD("get_global_transform"), &Node3D::get_global_transform); ClassDB::bind_method(D_METHOD("get_parent_spatial"), &Node3D::get_parent_spatial); ClassDB::bind_method(D_METHOD("set_ignore_transform_notification", "enabled"), &Node3D::set_ignore_transform_notification); - ClassDB::bind_method(D_METHOD("set_as_toplevel", "enable"), &Node3D::set_as_top_level); - ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &Node3D::is_set_as_top_level); + ClassDB::bind_method(D_METHOD("set_as_top_level", "enable"), &Node3D::set_as_top_level); + ClassDB::bind_method(D_METHOD("is_set_as_top_level"), &Node3D::is_set_as_top_level); ClassDB::bind_method(D_METHOD("set_disable_scale", "disable"), &Node3D::set_disable_scale); ClassDB::bind_method(D_METHOD("is_scale_disabled"), &Node3D::is_scale_disabled); ClassDB::bind_method(D_METHOD("get_world_3d"), &Node3D::get_world_3d); @@ -773,7 +773,7 @@ void Node3D::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "rotation_degrees", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "set_rotation_degrees", "get_rotation_degrees"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "rotation", PROPERTY_HINT_NONE, "", 0), "set_rotation", "get_rotation"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "scale", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "set_scale", "get_scale"); - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "toplevel"), "set_as_toplevel", "is_set_as_toplevel"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "top_level"), "set_as_top_level", "is_set_as_top_level"); ADD_GROUP("Matrix", ""); ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM, "transform", PROPERTY_HINT_NONE, ""), "set_transform", "get_transform"); ADD_GROUP("Visibility", ""); diff --git a/scene/3d/soft_body_3d.cpp b/scene/3d/soft_body_3d.cpp index 94e9555a1a..018a2a7a39 100644 --- a/scene/3d/soft_body_3d.cpp +++ b/scene/3d/soft_body_3d.cpp @@ -425,7 +425,7 @@ void SoftBody3D::_draw_soft_mesh() { /// Necessary in order to render the mesh correctly (Soft body nodes are in global space) simulation_started = true; - call_deferred("set_as_toplevel", true); + call_deferred("set_as_top_level", true); call_deferred("set_transform", Transform()); } diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 17febc8d66..476dccab7e 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -509,13 +509,13 @@ void Control::_notification(int p_notification) { } if (parent_control && !subwindow) { - //do nothing, has a parent control and not toplevel + //do nothing, has a parent control and not top_level if (data.theme.is_null() && parent_control->data.theme_owner) { data.theme_owner = parent_control->data.theme_owner; notification(NOTIFICATION_THEME_CHANGED); } } else { - //is a regular root control or toplevel + //is a regular root control or top_level data.RI = get_viewport()->_gui_add_root_control(this); } @@ -2023,7 +2023,7 @@ void Control::release_focus() { update(); } -bool Control::is_toplevel_control() const { +bool Control::is_top_level_control() const { return is_inside_tree() && (!data.parent_canvas_item && !data.RI && is_set_as_top_level()); } @@ -2499,7 +2499,7 @@ Control *Control::get_root_parent_control() const { if (c) { root = c; - if (c->data.RI || c->is_toplevel_control()) { + if (c->data.RI || c->is_top_level_control()) { break; } } diff --git a/scene/gui/control.h b/scene/gui/control.h index 15e10df0c6..83e79f908f 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -464,7 +464,7 @@ public: virtual Transform2D get_transform() const override; - bool is_toplevel_control() const; + bool is_top_level_control() const; Size2 get_parent_area_size() const; Rect2 get_parent_anchorable_rect() const; diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 4aea2928f4..2da61bdde7 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -936,7 +936,7 @@ FileDialog::FileDialog() { filter->connect("item_selected", callable_mp(this, &FileDialog::_filter_selected)); confirm_save = memnew(ConfirmationDialog); - // confirm_save->set_as_toplevel(true); + // confirm_save->set_as_top_level(true); add_child(confirm_save); confirm_save->connect("confirmed", callable_mp(this, &FileDialog::_save_confirm_pressed)); diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index 14a10ea627..a1f93094c4 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -517,7 +517,7 @@ Vector<Control *> TabContainer::_get_tabs() const { Vector<Control *> controls; for (int i = 0; i < get_child_count(); i++) { Control *control = Object::cast_to<Control>(get_child(i)); - if (!control || control->is_toplevel_control()) { + if (!control || control->is_top_level_control()) { continue; } diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 070948237a..2f5ee20373 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -3892,7 +3892,7 @@ Tree::Tree() { popup_menu = memnew(PopupMenu); popup_menu->hide(); add_child(popup_menu); - // popup_menu->set_as_toplevel(true); + // popup_menu->set_as_top_level(true); popup_editor = memnew(Popup); popup_editor->set_wrap_controls(true); diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp index 2b83e4f532..0d9d9d6356 100644 --- a/scene/main/canvas_item.cpp +++ b/scene/main/canvas_item.cpp @@ -371,7 +371,7 @@ void CanvasItem::_propagate_visibility_changed(bool p_visible) { for (int i = 0; i < get_child_count(); i++) { CanvasItem *c = Object::cast_to<CanvasItem>(get_child(i)); - if (c && c->visible) { //should the toplevels stop propagation? i think so but.. + if (c && c->visible) { //should the top_levels stop propagation? i think so but.. c->_propagate_visibility_changed(p_visible); } } @@ -486,7 +486,7 @@ Transform2D CanvasItem::get_global_transform() const { return global_transform; } -void CanvasItem::_toplevel_raise_self() { +void CanvasItem::_top_level_raise_self() { if (!is_inside_tree()) { return; } @@ -533,7 +533,7 @@ void CanvasItem::_enter_canvas() { get_viewport()->gui_reset_canvas_sort_index(); } - get_tree()->call_group_flags(SceneTree::GROUP_CALL_UNIQUE, group, "_toplevel_raise_self"); + get_tree()->call_group_flags(SceneTree::GROUP_CALL_UNIQUE, group, "_top_level_raise_self"); } else { CanvasItem *parent = get_parent_item(); @@ -599,7 +599,7 @@ void CanvasItem::_notification(int p_what) { } if (group != "") { - get_tree()->call_group_flags(SceneTree::GROUP_CALL_UNIQUE, group, "_toplevel_raise_self"); + get_tree()->call_group_flags(SceneTree::GROUP_CALL_UNIQUE, group, "_top_level_raise_self"); } else { CanvasItem *p = get_parent_item(); ERR_FAIL_COND(!p); @@ -674,18 +674,18 @@ Color CanvasItem::get_modulate() const { return modulate; } -void CanvasItem::set_as_top_level(bool p_toplevel) { - if (top_level == p_toplevel) { +void CanvasItem::set_as_top_level(bool p_top_level) { + if (top_level == p_top_level) { return; } if (!is_inside_tree()) { - top_level = p_toplevel; + top_level = p_top_level; return; } _exit_canvas(); - top_level = p_toplevel; + top_level = p_top_level; _enter_canvas(); } @@ -1104,7 +1104,7 @@ void CanvasItem::force_update_transform() { } void CanvasItem::_bind_methods() { - ClassDB::bind_method(D_METHOD("_toplevel_raise_self"), &CanvasItem::_toplevel_raise_self); + ClassDB::bind_method(D_METHOD("_top_level_raise_self"), &CanvasItem::_top_level_raise_self); ClassDB::bind_method(D_METHOD("_update_callback"), &CanvasItem::_update_callback); #ifdef TOOLS_ENABLED @@ -1136,8 +1136,8 @@ void CanvasItem::_bind_methods() { ClassDB::bind_method(D_METHOD("update"), &CanvasItem::update); - ClassDB::bind_method(D_METHOD("set_as_toplevel", "enable"), &CanvasItem::set_as_top_level); - ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &CanvasItem::is_set_as_top_level); + ClassDB::bind_method(D_METHOD("set_as_top_level", "enable"), &CanvasItem::set_as_top_level); + ClassDB::bind_method(D_METHOD("is_set_as_top_level"), &CanvasItem::is_set_as_top_level); ClassDB::bind_method(D_METHOD("set_light_mask", "light_mask"), &CanvasItem::set_light_mask); ClassDB::bind_method(D_METHOD("get_light_mask"), &CanvasItem::get_light_mask); diff --git a/scene/main/canvas_item.h b/scene/main/canvas_item.h index 457ec2feef..a331cb96a9 100644 --- a/scene/main/canvas_item.h +++ b/scene/main/canvas_item.h @@ -220,7 +220,7 @@ private: mutable Transform2D global_transform; mutable bool global_invalid; - void _toplevel_raise_self(); + void _top_level_raise_self(); void _propagate_visibility_changed(bool p_visible); @@ -355,7 +355,7 @@ public: /* RECT / TRANSFORM */ - void set_as_top_level(bool p_toplevel); + void set_as_top_level(bool p_top_level); bool is_set_as_top_level() const; void set_draw_behind_parent(bool p_enable); diff --git a/scene/resources/syntax_highlighter.cpp b/scene/resources/syntax_highlighter.cpp index 5d58e71fc5..e7b49892d8 100644 --- a/scene/resources/syntax_highlighter.cpp +++ b/scene/resources/syntax_highlighter.cpp @@ -149,6 +149,13 @@ Dictionary CodeHighlighter::_get_line_syntax_highlighting(int p_line) { color_region_cache[p_line] = -1; int in_region = -1; if (p_line != 0) { + int prev_region_line = p_line - 1; + while (prev_region_line > 0 && !color_region_cache.has(prev_region_line)) { + prev_region_line--; + } + for (int i = prev_region_line; i < p_line - 1; i++) { + get_line_syntax_highlighting(i); + } if (!color_region_cache.has(p_line - 1)) { get_line_syntax_highlighting(p_line - 1); } diff --git a/scene/resources/visual_shader_nodes.cpp b/scene/resources/visual_shader_nodes.cpp index 7c4500468b..085c0d0112 100644 --- a/scene/resources/visual_shader_nodes.cpp +++ b/scene/resources/visual_shader_nodes.cpp @@ -452,7 +452,7 @@ String VisualShaderNodeTexture::get_output_port_name(int p_port) const { String VisualShaderNodeTexture::get_input_port_default_hint(int p_port) const { if (p_port == 0) { - return "UV.xy"; + return "default"; } return ""; } @@ -491,15 +491,22 @@ String VisualShaderNodeTexture::generate_global(Shader::Mode p_mode, VisualShade } String VisualShaderNodeTexture::generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview) const { + String default_uv; + if (p_mode != Shader::MODE_PARTICLES && p_mode != Shader::MODE_SKY) { + default_uv = "UV.xy"; + } else { + default_uv = "vec2(0.0)"; + } + if (source == SOURCE_TEXTURE) { String id = make_unique_id(p_type, p_id, "tex"); String code; if (p_input_vars[0] == String()) { // Use UV by default. if (p_input_vars[1] == String()) { - code += "\tvec4 " + id + "_read = texture(" + id + ", UV.xy);\n"; + code += "\tvec4 " + id + "_read = texture(" + id + ", " + default_uv + ");\n"; } else { - code += "\tvec4 " + id + "_read = textureLod(" + id + ", UV.xy, " + p_input_vars[1] + ");\n"; + code += "\tvec4 " + id + "_read = textureLod(" + id + ", " + default_uv + ", " + p_input_vars[1] + ");\n"; } } else if (p_input_vars[1] == String()) { @@ -525,9 +532,9 @@ String VisualShaderNodeTexture::generate_code(Shader::Mode p_mode, VisualShader: if (p_input_vars[0] == String()) { // Use UV by default. if (p_input_vars[1] == String()) { - code += "\t\tvec4 " + id + "_tex_read = texture(" + id + ", UV.xy);\n"; + code += "\t\tvec4 " + id + "_tex_read = texture(" + id + ", " + default_uv + ");\n"; } else { - code += "\t\tvec4 " + id + "_tex_read = textureLod(" + id + ", UV.xy, " + p_input_vars[1] + ");\n"; + code += "\t\tvec4 " + id + "_tex_read = textureLod(" + id + ", " + default_uv + ", " + p_input_vars[1] + ");\n"; } } else if (p_input_vars[1] == String()) { @@ -549,9 +556,9 @@ String VisualShaderNodeTexture::generate_code(Shader::Mode p_mode, VisualShader: if (p_input_vars[0] == String() || p_for_preview) { // Use UV by default. if (p_input_vars[1] == String()) { - code += "\t\tvec4 _tex_read = textureLod(SCREEN_TEXTURE, UV.xy, 0.0 );\n"; + code += "\t\tvec4 _tex_read = textureLod(SCREEN_TEXTURE, " + default_uv + ", 0.0 );\n"; } else { - code += "\t\tvec4 _tex_read = textureLod(SCREEN_TEXTURE, UV.xy, " + p_input_vars[1] + ");\n"; + code += "\t\tvec4 _tex_read = textureLod(SCREEN_TEXTURE, " + default_uv + ", " + p_input_vars[1] + ");\n"; } } else if (p_input_vars[1] == String()) { @@ -572,9 +579,9 @@ String VisualShaderNodeTexture::generate_code(Shader::Mode p_mode, VisualShader: if (p_input_vars[0] == String()) { // Use UV by default. if (p_input_vars[1] == String()) { - code += "\t\tvec4 _tex_read = texture(TEXTURE , UV.xy);\n"; + code += "\t\tvec4 _tex_read = texture(TEXTURE, " + default_uv + ");\n"; } else { - code += "\t\tvec4 _tex_read = textureLod(TEXTURE, UV.xy, " + p_input_vars[1] + ");\n"; + code += "\t\tvec4 _tex_read = textureLod(TEXTURE, " + default_uv + ", " + p_input_vars[1] + ");\n"; } } else if (p_input_vars[1] == String()) { @@ -595,9 +602,9 @@ String VisualShaderNodeTexture::generate_code(Shader::Mode p_mode, VisualShader: if (p_input_vars[0] == String()) { // Use UV by default. if (p_input_vars[1] == String()) { - code += "\t\tvec4 _tex_read = texture(NORMAL_TEXTURE, UV.xy);\n"; + code += "\t\tvec4 _tex_read = texture(NORMAL_TEXTURE, " + default_uv + ");\n"; } else { - code += "\t\tvec4 _tex_read = textureLod(NORMAL_TEXTURE, UV.xy, " + p_input_vars[1] + ");\n"; + code += "\t\tvec4 _tex_read = textureLod(NORMAL_TEXTURE, " + default_uv + ", " + p_input_vars[1] + ");\n"; } } else if (p_input_vars[1] == String()) { @@ -628,9 +635,9 @@ String VisualShaderNodeTexture::generate_code(Shader::Mode p_mode, VisualShader: if (p_input_vars[0] == String()) { // Use UV by default. if (p_input_vars[1] == String()) { - code += "\t\tfloat _depth = texture(DEPTH_TEXTURE, UV.xy).r;\n"; + code += "\t\tfloat _depth = texture(DEPTH_TEXTURE, " + default_uv + ").r;\n"; } else { - code += "\t\tfloat _depth = textureLod(DEPTH_TEXTURE, UV.xy, " + p_input_vars[1] + ").r;\n"; + code += "\t\tfloat _depth = textureLod(DEPTH_TEXTURE, " + default_uv + ", " + p_input_vars[1] + ").r;\n"; } } else if (p_input_vars[1] == String()) { @@ -819,12 +826,19 @@ String VisualShaderNodeSample3D::get_output_port_name(int p_port) const { String VisualShaderNodeSample3D::get_input_port_default_hint(int p_port) const { if (p_port == 0) { - return "vec3(UV.xy, 0.0)"; + return "default"; } return ""; } String VisualShaderNodeSample3D::generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview) const { + String default_uv; + if (p_mode != Shader::MODE_PARTICLES && p_mode != Shader::MODE_SKY) { + default_uv = "vec3(UV, 0.0)"; + } else { + default_uv = "vec3(0.0)"; + } + String code; if (source == SOURCE_TEXTURE || source == SOURCE_PORT) { String id; @@ -837,9 +851,9 @@ String VisualShaderNodeSample3D::generate_code(Shader::Mode p_mode, VisualShader if (id != String()) { if (p_input_vars[0] == String()) { // Use UV by default. if (p_input_vars[1] == String()) { - code += "\t\tvec4 " + id + "_tex_read = texture(" + id + ", vec3(UV.xy, 0.0));\n"; + code += "\t\tvec4 " + id + "_tex_read = texture(" + id + ", " + default_uv + ");\n"; } else { - code += "\t\tvec4 " + id + "_tex_read = textureLod(" + id + ", vec3(UV.xy, 0.0), " + p_input_vars[1] + ");\n"; + code += "\t\tvec4 " + id + "_tex_read = textureLod(" + id + ", " + default_uv + ", " + p_input_vars[1] + ");\n"; } } else if (p_input_vars[1] == String()) { //no lod @@ -1085,6 +1099,13 @@ String VisualShaderNodeCubemap::generate_global(Shader::Mode p_mode, VisualShade } String VisualShaderNodeCubemap::generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview) const { + String default_uv; + if (p_mode != Shader::MODE_PARTICLES && p_mode != Shader::MODE_SKY) { + default_uv = "vec3(UV, 0.0)"; + } else { + default_uv = "vec3(0.0)"; + } + String code; String id; if (source == SOURCE_TEXTURE) { @@ -1108,9 +1129,9 @@ String VisualShaderNodeCubemap::generate_code(Shader::Mode p_mode, VisualShader: if (p_input_vars[0] == String()) { // Use UV by default. if (p_input_vars[1] == String()) { - code += "\t\tvec4 " + id + "_read = texture(" + id + " , vec3(UV, 0.0));\n"; + code += "\t\tvec4 " + id + "_read = texture(" + id + ", " + default_uv + ");\n"; } else { - code += "\t\tvec4 " + id + "_read = textureLod(" + id + " , vec3(UV, 0.0)" + " , " + p_input_vars[1] + " );\n"; + code += "\t\tvec4 " + id + "_read = textureLod(" + id + ", " + default_uv + ", " + p_input_vars[1] + " );\n"; } } else if (p_input_vars[1] == String()) { @@ -1128,7 +1149,7 @@ String VisualShaderNodeCubemap::generate_code(Shader::Mode p_mode, VisualShader: String VisualShaderNodeCubemap::get_input_port_default_hint(int p_port) const { if (p_port == 0) { - return "vec3(UV, 0.0)"; + return "default"; } return ""; } @@ -4246,13 +4267,20 @@ bool VisualShaderNodeTextureUniform::is_code_generated() const { } String VisualShaderNodeTextureUniform::generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview) const { + String default_uv; + if (p_mode != Shader::MODE_PARTICLES && p_mode != Shader::MODE_SKY) { + default_uv = "UV.xy"; + } else { + default_uv = "vec2(0.0)"; + } + String id = get_uniform_name(); String code = "\t{\n"; if (p_input_vars[0] == String()) { // Use UV by default. if (p_input_vars[1] == String()) { - code += "\t\tvec4 n_tex_read = texture(" + id + ", UV.xy);\n"; + code += "\t\tvec4 n_tex_read = texture(" + id + ", " + default_uv + ");\n"; } else { - code += "\t\tvec4 n_tex_read = textureLod(" + id + ", UV.xy, " + p_input_vars[1] + ");\n"; + code += "\t\tvec4 n_tex_read = textureLod(" + id + ", " + default_uv + ", " + p_input_vars[1] + ");\n"; } } else if (p_input_vars[1] == String()) { //no lod @@ -4313,7 +4341,7 @@ void VisualShaderNodeTextureUniform::_bind_methods() { String VisualShaderNodeTextureUniform::get_input_port_default_hint(int p_port) const { if (p_port == 0) { - return "UV.xy"; + return "default"; } return ""; } diff --git a/servers/physics_2d/collision_solver_2d_sw.cpp b/servers/physics_2d/collision_solver_2d_sw.cpp index beba709807..0e056691c7 100644 --- a/servers/physics_2d/collision_solver_2d_sw.cpp +++ b/servers/physics_2d/collision_solver_2d_sw.cpp @@ -47,7 +47,7 @@ bool CollisionSolver2DSW::solve_static_line(const Shape2DSW *p_shape_A, const Tr Vector2 supports[2]; int support_count; - p_shape_B->get_supports(p_transform_A.affine_inverse().basis_xform(-n).normalized(), supports, support_count); + p_shape_B->get_supports(p_transform_B.affine_inverse().basis_xform(-n).normalized(), supports, support_count); bool found = false; diff --git a/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp b/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp index a13e7d786b..db2c707984 100644 --- a/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp +++ b/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp @@ -5871,7 +5871,7 @@ RID RasterizerStorageRD::decal_atlas_get_texture() const { } RID RasterizerStorageRD::decal_atlas_get_texture_srgb() const { - return decal_atlas.texture; + return decal_atlas.texture_srgb; } void RasterizerStorageRD::_update_decal_atlas() { |