godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49616 from BastiaanOlij/more_rename_transform 

Adding some more missing renames for Transform3D and Quaternion
This commit is contained in:
Rémi Verschelde 2021-06-15 16:50:52 +02:00 committed by GitHub
parent 7a85e95a4b 2161fd117b
commit fed31b1827
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/object/script_language.cpp
View File

@ -353,10 +353,10 @@ void ScriptLanguage::get_core_type_words(List<String> *p_core_type_words) const
p_core_type_words->push_back("Vector3i"); p_core_type_words->push_back("Vector3i");
p_core_type_words->push_back("Transform2D"); p_core_type_words->push_back("Transform2D");
p_core_type_words->push_back("Plane"); p_core_type_words->push_back("Plane");
p_core_type_words->push_back("Quat"); p_core_type_words->push_back("Quaternion");
p_core_type_words->push_back("AABB"); p_core_type_words->push_back("AABB");
p_core_type_words->push_back("Basis"); p_core_type_words->push_back("Basis");
p_core_type_words->push_back("Transform"); p_core_type_words->push_back("Transform3D");
p_core_type_words->push_back("Color"); p_core_type_words->push_back("Color");
p_core_type_words->push_back("StringName"); p_core_type_words->push_back("StringName");
p_core_type_words->push_back("NodePath"); p_core_type_words->push_back("NodePath");

2
editor/connections_dialog.cpp
View File

@ -446,7 +446,7 @@ ConnectDialog::ConnectDialog() {
type_list->add_item("Quaternion", Variant::QUATERNION); type_list->add_item("Quaternion", Variant::QUATERNION);
type_list->add_item("AABB", Variant::AABB); type_list->add_item("AABB", Variant::AABB);
type_list->add_item("Basis", Variant::BASIS); type_list->add_item("Basis", Variant::BASIS);
type_list->add_item("Transform", Variant::TRANSFORM3D); type_list->add_item("Transform3D", Variant::TRANSFORM3D);
type_list->add_item("Color", Variant::COLOR); type_list->add_item("Color", Variant::COLOR);
type_list->select(0); type_list->select(0);

0
editor/icons/Transform.svg → editor/icons/Transform3D.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 428 B

After

Width:  |  Height:  |  Size: 428 B

6
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -1227,7 +1227,7 @@ void VisualShaderEditor::_update_options_menu() {
item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon("bool", "EditorIcons")); item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon("bool", "EditorIcons"));
break; break;
case VisualShaderNode::PORT_TYPE_TRANSFORM: case VisualShaderNode::PORT_TYPE_TRANSFORM:
item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Transform", "EditorIcons")); item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Transform3D", "EditorIcons"));
break; break;
case VisualShaderNode::PORT_TYPE_SAMPLER: case VisualShaderNode::PORT_TYPE_SAMPLER:
item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon("ImageTexture", "EditorIcons")); item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon("ImageTexture", "EditorIcons"));
@ -4504,7 +4504,7 @@ public:
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("int", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("int", "EditorIcons"),
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Vector3", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Vector3", "EditorIcons"),
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("bool", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("bool", "EditorIcons"),
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Transform", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Transform3D", "EditorIcons"),
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("ImageTexture", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("ImageTexture", "EditorIcons"),
}; };
@ -4549,7 +4549,7 @@ public:
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("int", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("int", "EditorIcons"),
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("bool", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("bool", "EditorIcons"),
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Vector3", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Vector3", "EditorIcons"),
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Transform", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Transform3D", "EditorIcons"),
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Color", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Color", "EditorIcons"),
EditorNode::get_singleton()->get_gui_base()->get_theme_icon("ImageTexture", "EditorIcons"), EditorNode::get_singleton()->get_gui_base()->get_theme_icon("ImageTexture", "EditorIcons"),
}; };

2
editor/property_selector.cpp
View File

@ -135,7 +135,7 @@ void PropertySelector::_update_search() {
search_options->get_theme_icon("Quaternion", "EditorIcons"), search_options->get_theme_icon("Quaternion", "EditorIcons"),
search_options->get_theme_icon("AABB", "EditorIcons"), search_options->get_theme_icon("AABB", "EditorIcons"),
search_options->get_theme_icon("Basis", "EditorIcons"), search_options->get_theme_icon("Basis", "EditorIcons"),
search_options->get_theme_icon("Transform", "EditorIcons"), search_options->get_theme_icon("Transform3D", "EditorIcons"),
search_options->get_theme_icon("Color", "EditorIcons"), search_options->get_theme_icon("Color", "EditorIcons"),
search_options->get_theme_icon("NodePath", "EditorIcons"), search_options->get_theme_icon("NodePath", "EditorIcons"),
search_options->get_theme_icon("RID", "EditorIcons"), search_options->get_theme_icon("RID", "EditorIcons"),

2
modules/gdscript/gdscript_editor.cpp
View File

@ -1029,7 +1029,7 @@ static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool
} }
static const char *_type_names[Variant::VARIANT_MAX] = { static const char *_type_names[Variant::VARIANT_MAX] = {
"null", "bool", "int", "float", "String", "StringName", "Vector2", "Vector2i", "Rect2", "Rect2i", "Vector3", "Vector3i", "Transform2D", "Plane", "Quat", "AABB", "Basis", "Transform", "null", "bool", "int", "float", "String", "StringName", "Vector2", "Vector2i", "Rect2", "Rect2i", "Vector3", "Vector3i", "Transform2D", "Plane", "Quaternion", "AABB", "Basis", "Transform3D",
"Color", "NodePath", "RID", "Signal", "Callable", "Object", "Dictionary", "Array", "PackedByteArray", "PackedInt32Array", "PackedInt64Array", "PackedFloat32Array", "PackedFloat64Array", "PackedStringArray", "Color", "NodePath", "RID", "Signal", "Callable", "Object", "Dictionary", "Array", "PackedByteArray", "PackedInt32Array", "PackedInt64Array", "PackedFloat32Array", "PackedFloat64Array", "PackedStringArray",
"PackedVector2Array", "PackedVector3Array", "PackedColorArray" "PackedVector2Array", "PackedVector3Array", "PackedColorArray"
}; };

2
modules/gdscript/gdscript_parser.cpp
View File

@ -63,7 +63,7 @@ Variant::Type GDScriptParser::get_builtin_type(const StringName &p_type) {
builtin_types["Plane"] = Variant::PLANE; builtin_types["Plane"] = Variant::PLANE;
builtin_types["Quaternion"] = Variant::QUATERNION; builtin_types["Quaternion"] = Variant::QUATERNION;
builtin_types["Basis"] = Variant::BASIS; builtin_types["Basis"] = Variant::BASIS;
builtin_types["Transform"] = Variant::TRANSFORM3D; builtin_types["Transform3D"] = Variant::TRANSFORM3D;
builtin_types["Color"] = Variant::COLOR; builtin_types["Color"] = Variant::COLOR;
builtin_types["RID"] = Variant::RID; builtin_types["RID"] = Variant::RID;
builtin_types["Object"] = Variant::OBJECT; builtin_types["Object"] = Variant::OBJECT;

4
modules/visual_script/visual_script_editor.cpp
View File

@ -627,7 +627,7 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
Control::get_theme_icon("Quaternion", "EditorIcons"), Control::get_theme_icon("Quaternion", "EditorIcons"),
Control::get_theme_icon("AABB", "EditorIcons"), Control::get_theme_icon("AABB", "EditorIcons"),
Control::get_theme_icon("Basis", "EditorIcons"), Control::get_theme_icon("Basis", "EditorIcons"),
Control::get_theme_icon("Transform", "EditorIcons"), Control::get_theme_icon("Transform3D", "EditorIcons"),
Control::get_theme_icon("Color", "EditorIcons"), Control::get_theme_icon("Color", "EditorIcons"),
Control::get_theme_icon("NodePath", "EditorIcons"), Control::get_theme_icon("NodePath", "EditorIcons"),
Control::get_theme_icon("RID", "EditorIcons"), Control::get_theme_icon("RID", "EditorIcons"),
@ -1078,7 +1078,7 @@ void VisualScriptEditor::_update_members() {
Control::get_theme_icon("Quaternion", "EditorIcons"), Control::get_theme_icon("Quaternion", "EditorIcons"),
Control::get_theme_icon("AABB", "EditorIcons"), Control::get_theme_icon("AABB", "EditorIcons"),
Control::get_theme_icon("Basis", "EditorIcons"), Control::get_theme_icon("Basis", "EditorIcons"),
Control::get_theme_icon("Transform", "EditorIcons"), Control::get_theme_icon("Transform3D", "EditorIcons"),
Control::get_theme_icon("Color", "EditorIcons"), Control::get_theme_icon("Color", "EditorIcons"),
Control::get_theme_icon("NodePath", "EditorIcons"), Control::get_theme_icon("NodePath", "EditorIcons"),
Control::get_theme_icon("RID", "EditorIcons"), Control::get_theme_icon("RID", "EditorIcons"),

2
modules/visual_script/visual_script_property_selector.cpp
View File

@ -111,7 +111,7 @@ void VisualScriptPropertySelector::_update_search() {
vbc->get_theme_icon("Quaternion", "EditorIcons"), vbc->get_theme_icon("Quaternion", "EditorIcons"),
vbc->get_theme_icon("AABB", "EditorIcons"), vbc->get_theme_icon("AABB", "EditorIcons"),
vbc->get_theme_icon("Basis", "EditorIcons"), vbc->get_theme_icon("Basis", "EditorIcons"),
vbc->get_theme_icon("Transform", "EditorIcons"), vbc->get_theme_icon("Transform3D", "EditorIcons"),
vbc->get_theme_icon("Color", "EditorIcons"), vbc->get_theme_icon("Color", "EditorIcons"),
vbc->get_theme_icon("Path", "EditorIcons"), vbc->get_theme_icon("Path", "EditorIcons"),
vbc->get_theme_icon("RID", "EditorIcons"), vbc->get_theme_icon("RID", "EditorIcons"),