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

Merge pull request #57720 from akien-mga/prefer-cast-to-get_class-string-compare

This commit is contained in:
Rémi Verschelde 2022-02-08 11:09:43 +01:00 committed by GitHub
parent 7e308d5120 317cd0b19a
commit f32c715fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 140 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/debugger/editor_debugger_node.cpp
View File

@ -683,7 +683,7 @@ EditorDebuggerNode::CameraOverride EditorDebuggerNode::get_camera_override() {
void EditorDebuggerNode::add_debugger_plugin(const Ref<Script> &p_script) { void EditorDebuggerNode::add_debugger_plugin(const Ref<Script> &p_script) {
ERR_FAIL_COND_MSG(debugger_plugins.has(p_script), "Debugger plugin already exists."); ERR_FAIL_COND_MSG(debugger_plugins.has(p_script), "Debugger plugin already exists.");
ERR_FAIL_COND_MSG(p_script.is_null(), "Debugger plugin script is null"); ERR_FAIL_COND_MSG(p_script.is_null(), "Debugger plugin script is null");
ERR_FAIL_COND_MSG(String(p_script->get_instance_base_type()) == "", "Debugger plugin script has error."); ERR_FAIL_COND_MSG(p_script->get_instance_base_type() == StringName(), "Debugger plugin script has error.");
ERR_FAIL_COND_MSG(String(p_script->get_instance_base_type()) != "EditorDebuggerPlugin", "Base type of debugger plugin is not 'EditorDebuggerPlugin'."); ERR_FAIL_COND_MSG(String(p_script->get_instance_base_type()) != "EditorDebuggerPlugin", "Base type of debugger plugin is not 'EditorDebuggerPlugin'.");
ERR_FAIL_COND_MSG(!p_script->is_tool(), "Debugger plugin script is not in tool mode."); ERR_FAIL_COND_MSG(!p_script->is_tool(), "Debugger plugin script is not in tool mode.");
debugger_plugins.insert(p_script); debugger_plugins.insert(p_script);

16
editor/editor_autoload_settings.cpp
View File

@ -362,21 +362,21 @@ Node *EditorAutoloadSettings::_create_autoload(const String &p_path) {
RES res = ResourceLoader::load(p_path); RES res = ResourceLoader::load(p_path);
ERR_FAIL_COND_V_MSG(res.is_null(), nullptr, "Can't autoload: " + p_path + "."); ERR_FAIL_COND_V_MSG(res.is_null(), nullptr, "Can't autoload: " + p_path + ".");
Node *n = nullptr; Node *n = nullptr;
if (res->is_class("PackedScene")) { Ref<PackedScene> scn = res;
Ref<PackedScene> ps = res; Ref<Script> script = res;
n = ps->instantiate(); if (scn.is_valid()) {
} else if (res->is_class("Script")) { n = scn->instantiate();
Ref<Script> s = res; } else if (script.is_valid()) {
StringName ibt = s->get_instance_base_type(); StringName ibt = script->get_instance_base_type();
bool valid_type = ClassDB::is_parent_class(ibt, "Node"); bool valid_type = ClassDB::is_parent_class(ibt, "Node");
ERR_FAIL_COND_V_MSG(!valid_type, nullptr, "Script does not inherit a Node: " + p_path + "."); ERR_FAIL_COND_V_MSG(!valid_type, nullptr, "Script does not inherit a Node: " + p_path + ".");
Object *obj = ClassDB::instantiate(ibt); Object *obj = ClassDB::instantiate(ibt);
ERR_FAIL_COND_V_MSG(obj == nullptr, nullptr, "Cannot instance script for AutoLoad, expected 'Node' inheritance, got: " + String(ibt) + "."); ERR_FAIL_COND_V_MSG(!obj, nullptr, "Cannot instance script for AutoLoad, expected 'Node' inheritance, got: " + String(ibt) + ".");
n = Object::cast_to<Node>(obj); n = Object::cast_to<Node>(obj);
n->set_script(s); n->set_script(script);
} }
ERR_FAIL_COND_V_MSG(!n, nullptr, "Path in AutoLoad not a node or script: " + p_path + "."); ERR_FAIL_COND_V_MSG(!n, nullptr, "Path in AutoLoad not a node or script: " + p_path + ".");

5
editor/editor_help_search.cpp
View File

@ -610,11 +610,6 @@ TreeItem *EditorHelpSearch::Runner::_create_member_item(TreeItem *p_parent, cons
text = p_text; text = p_text;
} else { } else {
icon = ui_service->get_theme_icon(p_icon, SNAME("EditorIcons")); icon = ui_service->get_theme_icon(p_icon, SNAME("EditorIcons"));
/*// In flat mode, show the class icon.
if (ui_service->has_icon(p_class_name, "EditorIcons"))
icon = ui_service->get_icon(p_class_name, "EditorIcons");
else if (ClassDB::is_parent_class(p_class_name, "Object"))
icon = ui_service->get_icon("Object", "EditorIcons");*/
text = p_class_name + "." + p_text; text = p_class_name + "." + p_text;
} }

2
editor/editor_inspector.cpp
View File

@ -2425,7 +2425,7 @@ void EditorInspector::update_tree() {
if (!ClassDB::class_exists(type) && !ScriptServer::is_global_class(type) && p.hint_string.length() && FileAccess::exists(p.hint_string)) { if (!ClassDB::class_exists(type) && !ScriptServer::is_global_class(type) && p.hint_string.length() && FileAccess::exists(p.hint_string)) {
// If we have a category inside a script, search for the first script with a valid icon. // If we have a category inside a script, search for the first script with a valid icon.
Ref<Script> script = ResourceLoader::load(p.hint_string, "Script"); Ref<Script> script = ResourceLoader::load(p.hint_string, "Script");
String base_type; StringName base_type;
if (script.is_valid()) { if (script.is_valid()) {
base_type = script->get_instance_base_type(); base_type = script->get_instance_base_type();
} }

14
editor/editor_node.cpp
View File

@ -745,7 +745,6 @@ void EditorNode::_notification(int p_what) {
bottom_panel_raise->set_icon(gui_base->get_theme_icon(SNAME("ExpandBottomDock"), SNAME("EditorIcons"))); bottom_panel_raise->set_icon(gui_base->get_theme_icon(SNAME("ExpandBottomDock"), SNAME("EditorIcons")));
// clear_button->set_icon(gui_base->get_icon("Close", "EditorIcons")); don't have access to that node. needs to become a class property
if (gui_base->is_layout_rtl()) { if (gui_base->is_layout_rtl()) {
dock_tab_move_left->set_icon(theme->get_icon(SNAME("Forward"), SNAME("EditorIcons"))); dock_tab_move_left->set_icon(theme->get_icon(SNAME("Forward"), SNAME("EditorIcons")));
dock_tab_move_right->set_icon(theme->get_icon(SNAME("Back"), SNAME("EditorIcons"))); dock_tab_move_right->set_icon(theme->get_icon(SNAME("Back"), SNAME("EditorIcons")));
@ -2280,7 +2279,7 @@ void EditorNode::_edit_current(bool p_skip_foreign) {
if (main_plugin) { if (main_plugin) {
// special case if use of external editor is true // special case if use of external editor is true
Resource *current_res = Object::cast_to<Resource>(current_obj); Resource *current_res = Object::cast_to<Resource>(current_obj);
if (main_plugin->get_name() == "Script" && current_obj->get_class_name() != StringName("VisualScript") && current_res && !current_res->is_built_in() && (bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor")) || overrides_external_editor(current_obj))) { if (main_plugin->get_name() == "Script" && current_obj->is_class("VisualScript") && current_res && !current_res->is_built_in() && (bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor")) || overrides_external_editor(current_obj))) {
if (!changing_scene) { if (!changing_scene) {
main_plugin->edit(current_obj); main_plugin->edit(current_obj);
} }
@ -3293,8 +3292,8 @@ void EditorNode::set_addon_plugin_enabled(const String &p_addon, bool p_enabled,
return; return;
} }
// Errors in the script cause the base_type to be an empty string. // Errors in the script cause the base_type to be an empty StringName.
if (String(script->get_instance_base_type()) == "") { if (script->get_instance_base_type() == StringName()) {
show_warning(vformat(TTR("Unable to load addon script from path: '%s'. This might be due to a code error in that script.\nDisabling the addon at '%s' to prevent further errors."), script_path, p_addon)); show_warning(vformat(TTR("Unable to load addon script from path: '%s'. This might be due to a code error in that script.\nDisabling the addon at '%s' to prevent further errors."), script_path, p_addon));
_remove_plugin_from_enabled(p_addon); _remove_plugin_from_enabled(p_addon);
return; return;
@ -3937,7 +3936,7 @@ StringName EditorNode::get_object_custom_type_name(const Object *p_object) const
ERR_FAIL_COND_V(!p_object, StringName()); ERR_FAIL_COND_V(!p_object, StringName());
Ref<Script> script = p_object->get_script(); Ref<Script> script = p_object->get_script();
if (script.is_null() && p_object->is_class("Script")) { if (script.is_null() && Object::cast_to<Script>(p_object)) {
script = p_object; script = p_object;
} }
@ -4148,13 +4147,12 @@ Ref<Texture2D> EditorNode::_file_dialog_get_icon(const String &p_path) {
void EditorNode::_build_icon_type_cache() { void EditorNode::_build_icon_type_cache() {
List<StringName> tl; List<StringName> tl;
StringName ei = "EditorIcons"; theme_base->get_theme()->get_icon_list(SNAME("EditorIcons"), &tl);
theme_base->get_theme()->get_icon_list(ei, &tl);
for (const StringName &E : tl) { for (const StringName &E : tl) {
if (!ClassDB::class_exists(E)) { if (!ClassDB::class_exists(E)) {
continue; continue;
} }
icon_type_cache[E] = theme_base->get_theme()->get_icon(E, ei); icon_type_cache[E] = theme_base->get_theme()->get_icon(E, SNAME("EditorIcons"));
} }
} }

16
editor/editor_resource_picker.cpp
View File

@ -77,16 +77,16 @@ void EditorResourcePicker::_update_resource_preview(const String &p_path, const
return; return;
} }
String type = edited_resource->get_class_name(); Ref<Script> script = edited_resource;
if (ClassDB::is_parent_class(type, "Script")) { if (script.is_valid()) {
assign_button->set_text(edited_resource->get_path().get_file()); assign_button->set_text(script->get_path().get_file());
return; return;
} }
if (p_preview.is_valid()) { if (p_preview.is_valid()) {
preview_rect->set_offset(SIDE_LEFT, assign_button->get_icon()->get_width() + assign_button->get_theme_stylebox(SNAME("normal"))->get_default_margin(SIDE_LEFT) + get_theme_constant(SNAME("hseparation"), SNAME("Button"))); preview_rect->set_offset(SIDE_LEFT, assign_button->get_icon()->get_width() + assign_button->get_theme_stylebox(SNAME("normal"))->get_default_margin(SIDE_LEFT) + get_theme_constant(SNAME("hseparation"), SNAME("Button")));
if (type == "GradientTexture1D") { if (Ref<GradientTexture1D>(edited_resource).is_valid()) {
preview_rect->set_stretch_mode(TextureRect::STRETCH_SCALE); preview_rect->set_stretch_mode(TextureRect::STRETCH_SCALE);
assign_button->set_custom_minimum_size(Size2(1, 1)); assign_button->set_custom_minimum_size(Size2(1, 1));
} else { } else {
@ -642,7 +642,7 @@ void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_
for (Set<String>::Element *E = allowed_types.front(); E; E = E->next()) { for (Set<String>::Element *E = allowed_types.front(); E; E = E->next()) {
String at = E->get().strip_edges(); String at = E->get().strip_edges();
if (at == "BaseMaterial3D" && ClassDB::is_parent_class(dropped_resource->get_class(), "Texture2D")) { if (at == "BaseMaterial3D" && Ref<Texture2D>(dropped_resource).is_valid()) {
// Use existing resource if possible and only replace its data. // Use existing resource if possible and only replace its data.
Ref<StandardMaterial3D> mat = edited_resource; Ref<StandardMaterial3D> mat = edited_resource;
if (!mat.is_valid()) { if (!mat.is_valid()) {
@ -653,7 +653,7 @@ void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_
break; break;
} }
if (at == "ShaderMaterial" && ClassDB::is_parent_class(dropped_resource->get_class(), "Shader")) { if (at == "ShaderMaterial" && Ref<Shader>(dropped_resource).is_valid()) {
Ref<ShaderMaterial> mat = edited_resource; Ref<ShaderMaterial> mat = edited_resource;
if (!mat.is_valid()) { if (!mat.is_valid()) {
mat.instantiate(); mat.instantiate();
@ -663,7 +663,7 @@ void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_
break; break;
} }
if (at == "Font" && ClassDB::is_parent_class(dropped_resource->get_class(), "FontData")) { if (at == "Font" && Ref<FontData>(dropped_resource).is_valid()) {
Ref<Font> font = edited_resource; Ref<Font> font = edited_resource;
if (!font.is_valid()) { if (!font.is_valid()) {
font.instantiate(); font.instantiate();
@ -673,7 +673,7 @@ void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_
break; break;
} }
if (at == "Texture2D" && ClassDB::is_parent_class(dropped_resource->get_class(), "Image")) { if (at == "Texture2D" && Ref<Image>(dropped_resource).is_valid()) {
Ref<ImageTexture> texture = edited_resource; Ref<ImageTexture> texture = edited_resource;
if (!texture.is_valid()) { if (!texture.is_valid()) {
texture.instantiate(); texture.instantiate();

61
editor/filesystem_dock.cpp
View File

@ -338,30 +338,28 @@ void FileSystemDock::_notification(int p_what) {
EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &FileSystemDock::_fs_changed)); EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &FileSystemDock::_fs_changed));
EditorResourcePreview::get_singleton()->connect("preview_invalidated", callable_mp(this, &FileSystemDock::_preview_invalidated)); EditorResourcePreview::get_singleton()->connect("preview_invalidated", callable_mp(this, &FileSystemDock::_preview_invalidated));
String ei = "EditorIcons"; button_reload->set_icon(get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")));
button_toggle_display_mode->set_icon(get_theme_icon(SNAME("Panels2"), SNAME("EditorIcons")));
button_reload->set_icon(get_theme_icon(SNAME("Reload"), ei));
button_toggle_display_mode->set_icon(get_theme_icon(SNAME("Panels2"), ei));
button_file_list_display_mode->connect("pressed", callable_mp(this, &FileSystemDock::_toggle_file_display)); button_file_list_display_mode->connect("pressed", callable_mp(this, &FileSystemDock::_toggle_file_display));
files->connect("item_activated", callable_mp(this, &FileSystemDock::_file_list_activate_file)); files->connect("item_activated", callable_mp(this, &FileSystemDock::_file_list_activate_file));
button_hist_next->connect("pressed", callable_mp(this, &FileSystemDock::_fw_history)); button_hist_next->connect("pressed", callable_mp(this, &FileSystemDock::_fw_history));
button_hist_prev->connect("pressed", callable_mp(this, &FileSystemDock::_bw_history)); button_hist_prev->connect("pressed", callable_mp(this, &FileSystemDock::_bw_history));
tree_search_box->set_right_icon(get_theme_icon(SNAME("Search"), ei)); tree_search_box->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
tree_search_box->set_clear_button_enabled(true); tree_search_box->set_clear_button_enabled(true);
tree_button_sort->set_icon(get_theme_icon(SNAME("Sort"), ei)); tree_button_sort->set_icon(get_theme_icon(SNAME("Sort"), SNAME("EditorIcons")));
file_list_search_box->set_right_icon(get_theme_icon(SNAME("Search"), ei)); file_list_search_box->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
file_list_search_box->set_clear_button_enabled(true); file_list_search_box->set_clear_button_enabled(true);
file_list_button_sort->set_icon(get_theme_icon(SNAME("Sort"), ei)); file_list_button_sort->set_icon(get_theme_icon(SNAME("Sort"), SNAME("EditorIcons")));
if (is_layout_rtl()) { if (is_layout_rtl()) {
button_hist_next->set_icon(get_theme_icon(SNAME("Back"), ei)); button_hist_next->set_icon(get_theme_icon(SNAME("Back"), SNAME("EditorIcons")));
button_hist_prev->set_icon(get_theme_icon(SNAME("Forward"), ei)); button_hist_prev->set_icon(get_theme_icon(SNAME("Forward"), SNAME("EditorIcons")));
} else { } else {
button_hist_next->set_icon(get_theme_icon(SNAME("Forward"), ei)); button_hist_next->set_icon(get_theme_icon(SNAME("Forward"), SNAME("EditorIcons")));
button_hist_prev->set_icon(get_theme_icon(SNAME("Back"), ei)); button_hist_prev->set_icon(get_theme_icon(SNAME("Back"), SNAME("EditorIcons")));
} }
file_list_popup->connect("id_pressed", callable_mp(this, &FileSystemDock::_file_list_rmb_option)); file_list_popup->connect("id_pressed", callable_mp(this, &FileSystemDock::_file_list_rmb_option));
tree_popup->connect("id_pressed", callable_mp(this, &FileSystemDock::_tree_rmb_option)); tree_popup->connect("id_pressed", callable_mp(this, &FileSystemDock::_tree_rmb_option));
@ -412,15 +410,14 @@ void FileSystemDock::_notification(int p_what) {
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
// Update icons. // Update icons.
String ei = "EditorIcons"; button_reload->set_icon(get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")));
button_reload->set_icon(get_theme_icon(SNAME("Reload"), ei)); button_toggle_display_mode->set_icon(get_theme_icon(SNAME("Panels2"), SNAME("EditorIcons")));
button_toggle_display_mode->set_icon(get_theme_icon(SNAME("Panels2"), ei));
if (is_layout_rtl()) { if (is_layout_rtl()) {
button_hist_next->set_icon(get_theme_icon(SNAME("Back"), ei)); button_hist_next->set_icon(get_theme_icon(SNAME("Back"), SNAME("EditorIcons")));
button_hist_prev->set_icon(get_theme_icon(SNAME("Forward"), ei)); button_hist_prev->set_icon(get_theme_icon(SNAME("Forward"), SNAME("EditorIcons")));
} else { } else {
button_hist_next->set_icon(get_theme_icon(SNAME("Forward"), ei)); button_hist_next->set_icon(get_theme_icon(SNAME("Forward"), SNAME("EditorIcons")));
button_hist_prev->set_icon(get_theme_icon(SNAME("Back"), ei)); button_hist_prev->set_icon(get_theme_icon(SNAME("Back"), SNAME("EditorIcons")));
} }
if (file_list_display_mode == FILE_LIST_DISPLAY_LIST) { if (file_list_display_mode == FILE_LIST_DISPLAY_LIST) {
button_file_list_display_mode->set_icon(get_theme_icon(SNAME("FileThumbnail"), SNAME("EditorIcons"))); button_file_list_display_mode->set_icon(get_theme_icon(SNAME("FileThumbnail"), SNAME("EditorIcons")));
@ -428,13 +425,13 @@ void FileSystemDock::_notification(int p_what) {
button_file_list_display_mode->set_icon(get_theme_icon(SNAME("FileList"), SNAME("EditorIcons"))); button_file_list_display_mode->set_icon(get_theme_icon(SNAME("FileList"), SNAME("EditorIcons")));
} }
tree_search_box->set_right_icon(get_theme_icon(SNAME("Search"), ei)); tree_search_box->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
tree_search_box->set_clear_button_enabled(true); tree_search_box->set_clear_button_enabled(true);
tree_button_sort->set_icon(get_theme_icon(SNAME("Sort"), ei)); tree_button_sort->set_icon(get_theme_icon(SNAME("Sort"), SNAME("EditorIcons")));
file_list_search_box->set_right_icon(get_theme_icon(SNAME("Search"), ei)); file_list_search_box->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
file_list_search_box->set_clear_button_enabled(true); file_list_search_box->set_clear_button_enabled(true);
file_list_button_sort->set_icon(get_theme_icon(SNAME("Sort"), ei)); file_list_button_sort->set_icon(get_theme_icon(SNAME("Sort"), SNAME("EditorIcons")));
// Update always show folders. // Update always show folders.
bool new_always_show_folders = bool(EditorSettings::get_singleton()->get("docks/filesystem/always_show_folders")); bool new_always_show_folders = bool(EditorSettings::get_singleton()->get("docks/filesystem/always_show_folders"));
@ -718,7 +715,6 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
String directory = path; String directory = path;
String file = ""; String file = "";
String ei = "EditorIcons";
int thumbnail_size = EditorSettings::get_singleton()->get("docks/filesystem/thumbnail_size"); int thumbnail_size = EditorSettings::get_singleton()->get("docks/filesystem/thumbnail_size");
thumbnail_size *= EDSCALE; thumbnail_size *= EDSCALE;
Ref<Texture2D> folder_thumbnail; Ref<Texture2D> folder_thumbnail;
@ -736,13 +732,13 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
files->set_fixed_icon_size(Size2(thumbnail_size, thumbnail_size)); files->set_fixed_icon_size(Size2(thumbnail_size, thumbnail_size));
if (thumbnail_size < 64) { if (thumbnail_size < 64) {
folder_thumbnail = get_theme_icon(SNAME("FolderMediumThumb"), ei); folder_thumbnail = get_theme_icon(SNAME("FolderMediumThumb"), SNAME("EditorIcons"));
file_thumbnail = get_theme_icon(SNAME("FileMediumThumb"), ei); file_thumbnail = get_theme_icon(SNAME("FileMediumThumb"), SNAME("EditorIcons"));
file_thumbnail_broken = get_theme_icon(SNAME("FileDeadMediumThumb"), ei); file_thumbnail_broken = get_theme_icon(SNAME("FileDeadMediumThumb"), SNAME("EditorIcons"));
} else { } else {
folder_thumbnail = get_theme_icon(SNAME("FolderBigThumb"), ei); folder_thumbnail = get_theme_icon(SNAME("FolderBigThumb"), SNAME("EditorIcons"));
file_thumbnail = get_theme_icon(SNAME("FileBigThumb"), ei); file_thumbnail = get_theme_icon(SNAME("FileBigThumb"), SNAME("EditorIcons"));
file_thumbnail_broken = get_theme_icon(SNAME("FileDeadBigThumb"), ei); file_thumbnail_broken = get_theme_icon(SNAME("FileDeadBigThumb"), SNAME("EditorIcons"));
} }
} else { } else {
// No thumbnails. // No thumbnails.
@ -871,7 +867,6 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
// Fills the ItemList control node from the FileInfos. // Fills the ItemList control node from the FileInfos.
String main_scene = ProjectSettings::get_singleton()->get("application/run/main_scene"); String main_scene = ProjectSettings::get_singleton()->get("application/run/main_scene");
String oi = "Object";
for (FileInfo &E : file_list) { for (FileInfo &E : file_list) {
FileInfo *finfo = &(E); FileInfo *finfo = &(E);
String fname = finfo->name; String fname = finfo->name;
@ -885,10 +880,10 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
// Select the icons. // Select the icons.
if (!finfo->import_broken) { if (!finfo->import_broken) {
type_icon = (has_theme_icon(ftype, ei)) ? get_theme_icon(ftype, ei) : get_theme_icon(oi, ei); type_icon = (has_theme_icon(ftype, SNAME("EditorIcons"))) ? get_theme_icon(ftype, SNAME("EditorIcons")) : get_theme_icon(SNAME("Object"), SNAME("EditorIcons"));
big_icon = file_thumbnail; big_icon = file_thumbnail;
} else { } else {
type_icon = get_theme_icon(SNAME("ImportFail"), ei); type_icon = get_theme_icon(SNAME("ImportFail"), SNAME("EditorIcons"));
big_icon = file_thumbnail_broken; big_icon = file_thumbnail_broken;
tooltip += "\n" + TTR("Status: Import of file failed. Please fix file and reimport manually."); tooltip += "\n" + TTR("Status: Import of file failed. Please fix file and reimport manually.");
} }

2
editor/plugins/animation_blend_tree_editor_plugin.cpp
View File

@ -300,7 +300,7 @@ void AnimationNodeBlendTreeEditor::_add_node(int p_idx) {
base_name = add_options[p_idx].name; base_name = add_options[p_idx].name;
} else { } else {
ERR_FAIL_COND(add_options[p_idx].script.is_null()); ERR_FAIL_COND(add_options[p_idx].script.is_null());
String base_type = add_options[p_idx].script->get_instance_base_type(); StringName base_type = add_options[p_idx].script->get_instance_base_type();
AnimationNode *an = Object::cast_to<AnimationNode>(ClassDB::instantiate(base_type)); AnimationNode *an = Object::cast_to<AnimationNode>(ClassDB::instantiate(base_type));
ERR_FAIL_COND(!an); ERR_FAIL_COND(!an);
anode = Ref<AnimationNode>(an); anode = Ref<AnimationNode>(an);

25
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -5804,7 +5804,7 @@ void CanvasItemEditorViewport::_create_nodes(Node *parent, Node *child, String &
} }
// make visible for certain node type // make visible for certain node type
if (ClassDB::is_parent_class(child->get_class(), "Control")) { if (Object::cast_to<Control>(child)) {
Size2 texture_size = texture->get_size(); Size2 texture_size = texture->get_size();
editor_data->get_undo_redo().add_do_property(child, "rect_size", texture_size); editor_data->get_undo_redo().add_do_property(child, "rect_size", texture_size);
} else if (Object::cast_to<Polygon2D>(child)) { } else if (Object::cast_to<Polygon2D>(child)) {
@ -5935,30 +5935,33 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian
if (String(d["type"]) == "files") { if (String(d["type"]) == "files") {
Vector<String> files = d["files"]; Vector<String> files = d["files"];
bool can_instantiate = false; bool can_instantiate = false;
for (int i = 0; i < files.size(); i++) { // check if dragged files contain resource or scene can be created at least once
List<String> scene_extensions;
ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions);
List<String> texture_extensions;
ResourceLoader::get_recognized_extensions_for_type("Texture2D", &texture_extensions);
for (int i = 0; i < files.size(); i++) {
// Check if dragged files with texture or scene extension can be created at least once.
if (texture_extensions.find(files[i].get_extension()) || scene_extensions.find(files[i].get_extension())) {
RES res = ResourceLoader::load(files[i]); RES res = ResourceLoader::load(files[i]);
if (res.is_null()) { if (res.is_null()) {
continue; continue;
} }
String type = res->get_class(); Ref<PackedScene> scn = res;
if (type == "PackedScene") { if (scn.is_valid()) {
Ref<PackedScene> sdata = Ref<PackedScene>(Object::cast_to<PackedScene>(*res)); Node *instantiated_scene = scn->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
Node *instantiated_scene = sdata->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
if (!instantiated_scene) { if (!instantiated_scene) {
continue; continue;
} }
memdelete(instantiated_scene); memdelete(instantiated_scene);
} else if (ClassDB::is_parent_class(type, "Texture2D")) {
Ref<Texture2D> texture = Ref<Texture2D>(Object::cast_to<Texture2D>(*res));
if (!texture.is_valid()) {
continue;
}
} else { } else {
continue; continue;
} }
can_instantiate = true; can_instantiate = true;
break; break;
} }
}
if (can_instantiate) { if (can_instantiate) {
if (!preview_node->get_parent()) { // create preview only once if (!preview_node->get_parent()) { // create preview only once
_create_preview(files); _create_preview(files);

6
editor/plugins/editor_preview_plugins.cpp
View File

@ -188,7 +188,7 @@ bool EditorImagePreviewPlugin::generate_small_preview_automatically() const {
} }
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////
bool EditorBitmapPreviewPlugin::handles(const String &p_type) const { bool EditorBitmapPreviewPlugin::handles(const String &p_type) const {
return ClassDB::is_parent_class(p_type, "BitMap"); return ClassDB::is_parent_class(p_type, "BitMap");
} }
@ -308,7 +308,7 @@ void EditorMaterialPreviewPlugin::_preview_done() {
} }
bool EditorMaterialPreviewPlugin::handles(const String &p_type) const { bool EditorMaterialPreviewPlugin::handles(const String &p_type) const {
return ClassDB::is_parent_class(p_type, "Material"); //any material return ClassDB::is_parent_class(p_type, "Material"); // Any material.
} }
bool EditorMaterialPreviewPlugin::generate_small_preview_automatically() const { bool EditorMaterialPreviewPlugin::generate_small_preview_automatically() const {
@ -699,7 +699,7 @@ void EditorMeshPreviewPlugin::_preview_done() {
} }
bool EditorMeshPreviewPlugin::handles(const String &p_type) const { bool EditorMeshPreviewPlugin::handles(const String &p_type) const {
return ClassDB::is_parent_class(p_type, "Mesh"); //any Mesh return ClassDB::is_parent_class(p_type, "Mesh"); // Any mesh.
} }
Ref<Texture2D> EditorMeshPreviewPlugin::generate(const RES &p_from, const Size2 &p_size) const { Ref<Texture2D> EditorMeshPreviewPlugin::generate(const RES &p_from, const Size2 &p_size) const {

18
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -3978,7 +3978,7 @@ AABB Node3DEditorViewport::_calculate_spatial_bounds(const Node3D *p_parent, boo
if (child) { if (child) {
AABB child_bounds = _calculate_spatial_bounds(child, false); AABB child_bounds = _calculate_spatial_bounds(child, false);
if (bounds.size == Vector3() && p_parent->get_class_name() == StringName("Node3D")) { if (bounds.size == Vector3() && Object::cast_to<Node3D>(p_parent)) {
bounds = child_bounds; bounds = child_bounds;
} else { } else {
bounds.merge_with(child_bounds); bounds.merge_with(child_bounds);
@ -3986,7 +3986,7 @@ AABB Node3DEditorViewport::_calculate_spatial_bounds(const Node3D *p_parent, boo
} }
} }
if (bounds.size == Vector3() && p_parent->get_class_name() != StringName("Node3D")) { if (bounds.size == Vector3() && !Object::cast_to<Node3D>(p_parent)) {
bounds = AABB(Vector3(-0.2, -0.2, -0.2), Vector3(0.4, 0.4, 0.4)); bounds = AABB(Vector3(-0.2, -0.2, -0.2), Vector3(0.4, 0.4, 0.4));
} }
@ -4213,25 +4213,19 @@ bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant
ResourceLoader::get_recognized_extensions_for_type("Mesh", &mesh_extensions); ResourceLoader::get_recognized_extensions_for_type("Mesh", &mesh_extensions);
for (int i = 0; i < files.size(); i++) { for (int i = 0; i < files.size(); i++) {
// Check if dragged files with mesh or scene extension can be created at least once.
if (mesh_extensions.find(files[i].get_extension()) || scene_extensions.find(files[i].get_extension())) { if (mesh_extensions.find(files[i].get_extension()) || scene_extensions.find(files[i].get_extension())) {
RES res = ResourceLoader::load(files[i]); RES res = ResourceLoader::load(files[i]);
if (res.is_null()) { if (res.is_null()) {
continue; continue;
} }
Ref<PackedScene> scn = res;
String type = res->get_class(); if (scn.is_valid()) {
if (type == "PackedScene") { Node *instantiated_scene = scn->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
Ref<PackedScene> sdata = ResourceLoader::load(files[i]);
Node *instantiated_scene = sdata->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
if (!instantiated_scene) { if (!instantiated_scene) {
continue; continue;
} }
memdelete(instantiated_scene); memdelete(instantiated_scene);
} else if (ClassDB::is_parent_class(type, "Mesh")) {
Ref<Mesh> mesh = ResourceLoader::load(files[i]);
if (!mesh.is_valid()) {
continue;
}
} else { } else {
continue; continue;
} }

9
editor/plugins/packed_scene_translation_parser_plugin.cpp
View File

@ -132,10 +132,7 @@ PackedSceneEditorTranslationParserPlugin::PackedSceneEditorTranslationParserPlug
lookup_properties.insert("script"); lookup_properties.insert("script");
// Exception list (to prevent false positives). // Exception list (to prevent false positives).
exception_list.insert("LineEdit", Vector<StringName>()); exception_list.insert("LineEdit", { "text" });
exception_list["LineEdit"].append("text"); exception_list.insert("TextEdit", { "text" });
exception_list.insert("TextEdit", Vector<StringName>()); exception_list.insert("CodeEdit", { "text" });
exception_list["TextEdit"].append("text");
exception_list.insert("CodeEdit", Vector<StringName>());
exception_list["CodeEdit"].append("text");
} }

4
editor/plugins/packed_scene_translation_parser_plugin.h
View File

@ -37,9 +37,9 @@ class PackedSceneEditorTranslationParserPlugin : public EditorTranslationParserP
GDCLASS(PackedSceneEditorTranslationParserPlugin, EditorTranslationParserPlugin); GDCLASS(PackedSceneEditorTranslationParserPlugin, EditorTranslationParserPlugin);
// Scene Node's properties that contain translation strings. // Scene Node's properties that contain translation strings.
Set<StringName> lookup_properties; Set<String> lookup_properties;
// Properties from specific Nodes that should be ignored. // Properties from specific Nodes that should be ignored.
Map<StringName, Vector<StringName>> exception_list; Map<String, Vector<String>> exception_list;
public: public:
virtual Error parse_file(const String &p_path, Vector<String> *r_ids, Vector<Vector<String>> *r_ids_ctx_plural) override; virtual Error parse_file(const String &p_path, Vector<String> *r_ids, Vector<Vector<String>> *r_ids_ctx_plural) override;

4
editor/plugins/script_editor_plugin.cpp
View File

@ -2265,7 +2265,7 @@ bool ScriptEditor::edit(const RES &p_resource, int p_line, int p_col, bool p_gra
if (use_external_editor && if (use_external_editor &&
(EditorDebuggerNode::get_singleton()->get_dump_stack_script() != p_resource || EditorDebuggerNode::get_singleton()->get_debug_with_external_editor()) && (EditorDebuggerNode::get_singleton()->get_dump_stack_script() != p_resource || EditorDebuggerNode::get_singleton()->get_debug_with_external_editor()) &&
p_resource->get_path().is_resource_file() && p_resource->get_path().is_resource_file() &&
p_resource->get_class_name() != StringName("VisualScript")) { !Ref<VisualScript>(p_resource).is_valid()) {
String path = EditorSettings::get_singleton()->get("text_editor/external/exec_path"); String path = EditorSettings::get_singleton()->get("text_editor/external/exec_path");
String flags = EditorSettings::get_singleton()->get("text_editor/external/exec_flags"); String flags = EditorSettings::get_singleton()->get("text_editor/external/exec_flags");
@ -2364,7 +2364,7 @@ bool ScriptEditor::edit(const RES &p_resource, int p_line, int p_col, bool p_gra
se->set_edited_resource(p_resource); se->set_edited_resource(p_resource);
if (p_resource->get_class_name() != StringName("VisualScript")) { if (!Ref<VisualScript>(p_resource).is_valid()) {
bool highlighter_set = false; bool highlighter_set = false;
for (int i = 0; i < syntax_highlighters.size(); i++) { for (int i = 0; i < syntax_highlighters.size(); i++) {
Ref<EditorSyntaxHighlighter> highlighter = syntax_highlighters[i]->_create(); Ref<EditorSyntaxHighlighter> highlighter = syntax_highlighters[i]->_create();

2
editor/plugins/script_text_editor.cpp
View File

@ -1373,7 +1373,7 @@ void ScriptTextEditor::reload(bool p_soft) {
return; return;
} }
scr->set_source_code(te->get_text()); scr->set_source_code(te->get_text());
bool soft = p_soft || scr->get_instance_base_type() == "EditorPlugin"; //always soft-reload editor plugins bool soft = p_soft || scr->get_instance_base_type() == "EditorPlugin"; // Always soft-reload editor plugins.
scr->get_language()->reload_tool_script(scr, soft); scr->get_language()->reload_tool_script(scr, soft);
} }

2
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -2584,7 +2584,7 @@ void VisualShaderEditor::_add_node(int p_idx, const Vector<Variant> &p_ops, Stri
vsnode = Ref<VisualShaderNode>(vsn); vsnode = Ref<VisualShaderNode>(vsn);
} else { } else {
ERR_FAIL_COND(add_options[p_idx].script.is_null()); ERR_FAIL_COND(add_options[p_idx].script.is_null());
String base_type = add_options[p_idx].script->get_instance_base_type(); StringName base_type = add_options[p_idx].script->get_instance_base_type();
VisualShaderNode *vsn = Object::cast_to<VisualShaderNode>(ClassDB::instantiate(base_type)); VisualShaderNode *vsn = Object::cast_to<VisualShaderNode>(ClassDB::instantiate(base_type));
ERR_FAIL_COND(!vsn); ERR_FAIL_COND(!vsn);
vsnode = Ref<VisualShaderNode>(vsn); vsnode = Ref<VisualShaderNode>(vsn);

2
editor/project_export.cpp
View File

@ -1275,8 +1275,6 @@ ProjectExportDialog::ProjectExportDialog() {
set_hide_on_ok(false); set_hide_on_ok(false);
editor_icons = "EditorIcons";
default_filename = EditorSettings::get_singleton()->get_project_metadata("export_options", "default_filename", ""); default_filename = EditorSettings::get_singleton()->get_project_metadata("export_options", "default_filename", "");
// If no default set, use project name // If no default set, use project name
if (default_filename.is_empty()) { if (default_filename.is_empty()) {

2
editor/project_export.h
View File

@ -85,8 +85,6 @@ private:
Label *include_label; Label *include_label;
MarginContainer *include_margin; MarginContainer *include_margin;
StringName editor_icons;
Button *export_button; Button *export_button;
Button *export_all_button; Button *export_all_button;
AcceptDialog *export_all_dialog; AcceptDialog *export_all_dialog;

15
main/main.cpp
View File

@ -2250,9 +2250,8 @@ bool Main::start() {
} }
} }
if (main_loop->is_class("SceneTree")) {
SceneTree *sml = Object::cast_to<SceneTree>(main_loop); SceneTree *sml = Object::cast_to<SceneTree>(main_loop);
if (sml) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (debug_collisions) { if (debug_collisions) {
sml->set_debug_collisions_hint(true); sml->set_debug_collisions_hint(true);
@ -2294,20 +2293,18 @@ bool Main::start() {
RES res = ResourceLoader::load(info.path); RES res = ResourceLoader::load(info.path);
ERR_CONTINUE_MSG(res.is_null(), "Can't autoload: " + info.path); ERR_CONTINUE_MSG(res.is_null(), "Can't autoload: " + info.path);
Node *n = nullptr; Node *n = nullptr;
if (res->is_class("PackedScene")) { Ref<PackedScene> scn = res;
Ref<PackedScene> ps = res;
n = ps->instantiate();
} else if (res->is_class("Script")) {
Ref<Script> script_res = res; Ref<Script> script_res = res;
if (scn.is_valid()) {
n = scn->instantiate();
} else if (script_res.is_valid()) {
StringName ibt = script_res->get_instance_base_type(); StringName ibt = script_res->get_instance_base_type();
bool valid_type = ClassDB::is_parent_class(ibt, "Node"); bool valid_type = ClassDB::is_parent_class(ibt, "Node");
ERR_CONTINUE_MSG(!valid_type, "Script does not inherit a Node: " + info.path); ERR_CONTINUE_MSG(!valid_type, "Script does not inherit a Node: " + info.path);
Object *obj = ClassDB::instantiate(ibt); Object *obj = ClassDB::instantiate(ibt);
ERR_CONTINUE_MSG(obj == nullptr, ERR_CONTINUE_MSG(!obj, "Cannot instance script for autoload, expected 'Node' inheritance, got: " + String(ibt) + ".");
"Cannot instance script for autoload, expected 'Node' inheritance, got: " +
String(ibt));
n = Object::cast_to<Node>(obj); n = Object::cast_to<Node>(obj);
n->set_script(script_res); n->set_script(script_res);

2
modules/gdnative/nativescript/nativescript.cpp
View File

@ -766,7 +766,7 @@ Variant NativeScriptInstance::call(const StringName &p_method, const Variant **p
void NativeScriptInstance::notification(int p_notification) { void NativeScriptInstance::notification(int p_notification) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (p_notification == MainLoop::NOTIFICATION_CRASH) { if (p_notification == MainLoop::NOTIFICATION_CRASH) {
if (current_method_call != StringName("")) { if (current_method_call != StringName()) {
ERR_PRINT("NativeScriptInstance detected crash on method: " + current_method_call); ERR_PRINT("NativeScriptInstance detected crash on method: " + current_method_call);
current_method_call = ""; current_method_call = "";
} }

2
modules/gdnative/pluginscript/pluginscript_script.cpp
View File

@ -93,7 +93,7 @@ Variant PluginScript::_new(const Variant **p_args, int p_argcount, Callable::Cal
REF ref; REF ref;
Object *owner = nullptr; Object *owner = nullptr;
if (get_instance_base_type() == "") { if (get_instance_base_type() == StringName()) {
owner = memnew(RefCounted); owner = memnew(RefCounted);
} else { } else {
owner = ClassDB::instantiate(get_instance_base_type()); owner = ClassDB::instantiate(get_instance_base_type());

14
modules/gdscript/gdscript_analyzer.cpp
View File

@ -196,7 +196,7 @@ Error GDScriptAnalyzer::check_class_member_name_conflict(const GDScriptParser::C
} }
if (current_data_type && current_data_type->kind == GDScriptParser::DataType::Kind::NATIVE) { if (current_data_type && current_data_type->kind == GDScriptParser::DataType::Kind::NATIVE) {
if (current_data_type->native_type != StringName("")) { if (current_data_type->native_type != StringName()) {
return check_native_member_name_conflict( return check_native_member_name_conflict(
p_member_name, p_member_name,
p_member_node, p_member_node,
@ -250,7 +250,7 @@ Error GDScriptAnalyzer::resolve_inheritance(GDScriptParser::ClassNode *p_class,
if (!p_class->extends_used) { if (!p_class->extends_used) {
result.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED; result.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED;
result.kind = GDScriptParser::DataType::NATIVE; result.kind = GDScriptParser::DataType::NATIVE;
result.native_type = "RefCounted"; result.native_type = SNAME("RefCounted");
} else { } else {
result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT; result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
@ -438,7 +438,7 @@ GDScriptParser::DataType GDScriptAnalyzer::resolve_datatype(GDScriptParser::Type
StringName first = p_type->type_chain[0]->name; StringName first = p_type->type_chain[0]->name;
if (first == "Variant") { if (first == SNAME("Variant")) {
result.kind = GDScriptParser::DataType::VARIANT; result.kind = GDScriptParser::DataType::VARIANT;
if (p_type->type_chain.size() > 1) { if (p_type->type_chain.size() > 1) {
push_error(R"("Variant" type don't contain nested types.)", p_type->type_chain[1]); push_error(R"("Variant" type don't contain nested types.)", p_type->type_chain[1]);
@ -447,9 +447,9 @@ GDScriptParser::DataType GDScriptAnalyzer::resolve_datatype(GDScriptParser::Type
return result; return result;
} }
if (first == "Object") { if (first == SNAME("Object")) {
result.kind = GDScriptParser::DataType::NATIVE; result.kind = GDScriptParser::DataType::NATIVE;
result.native_type = "Object"; result.native_type = SNAME("Object");
if (p_type->type_chain.size() > 1) { if (p_type->type_chain.size() > 1) {
push_error(R"("Object" type don't contain nested types.)", p_type->type_chain[1]); push_error(R"("Object" type don't contain nested types.)", p_type->type_chain[1]);
return GDScriptParser::DataType(); return GDScriptParser::DataType();
@ -2552,7 +2552,7 @@ void GDScriptAnalyzer::reduce_get_node(GDScriptParser::GetNodeNode *p_get_node)
GDScriptParser::DataType result; GDScriptParser::DataType result;
result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT; result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
result.kind = GDScriptParser::DataType::NATIVE; result.kind = GDScriptParser::DataType::NATIVE;
result.native_type = "Node"; result.native_type = SNAME("Node");
result.builtin_type = Variant::OBJECT; result.builtin_type = Variant::OBJECT;
if (!ClassDB::is_parent_class(parser->current_class->base_type.native_type, result.native_type)) { if (!ClassDB::is_parent_class(parser->current_class->base_type.native_type, result.native_type)) {
@ -3524,7 +3524,7 @@ GDScriptParser::DataType GDScriptAnalyzer::type_from_property(const PropertyInfo
result.builtin_type = p_property.type; result.builtin_type = p_property.type;
if (p_property.type == Variant::OBJECT) { if (p_property.type == Variant::OBJECT) {
result.kind = GDScriptParser::DataType::NATIVE; result.kind = GDScriptParser::DataType::NATIVE;
result.native_type = p_property.class_name == StringName() ? "Object" : p_property.class_name; result.native_type = p_property.class_name == StringName() ? SNAME("Object") : p_property.class_name;
} else { } else {
result.kind = GDScriptParser::DataType::BUILTIN; result.kind = GDScriptParser::DataType::BUILTIN;
result.builtin_type = p_property.type; result.builtin_type = p_property.type;

16
modules/gdscript/gdscript_editor.cpp
View File

@ -652,7 +652,7 @@ static void _get_directory_contents(EditorFileSystemDirectory *p_dir, Map<String
} }
static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_annotation, int p_argument, const String p_quote_style, Map<String, ScriptCodeCompletionOption> &r_result) { static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_annotation, int p_argument, const String p_quote_style, Map<String, ScriptCodeCompletionOption> &r_result) {
if (p_annotation->name == "@export_range") { if (p_annotation->name == SNAME("@export_range")) {
if (p_argument == 3 || p_argument == 4) { if (p_argument == 3 || p_argument == 4) {
// Slider hint. // Slider hint.
ScriptCodeCompletionOption slider1("or_greater", ScriptCodeCompletionOption::KIND_PLAIN_TEXT); ScriptCodeCompletionOption slider1("or_greater", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
@ -662,7 +662,7 @@ static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_a
slider2.insert_text = slider2.display.quote(p_quote_style); slider2.insert_text = slider2.display.quote(p_quote_style);
r_result.insert(slider2.display, slider2); r_result.insert(slider2.display, slider2);
} }
} else if (p_annotation->name == "@export_exp_easing") { } else if (p_annotation->name == SNAME("@export_exp_easing")) {
if (p_argument == 0 || p_argument == 1) { if (p_argument == 0 || p_argument == 1) {
// Easing hint. // Easing hint.
ScriptCodeCompletionOption hint1("attenuation", ScriptCodeCompletionOption::KIND_PLAIN_TEXT); ScriptCodeCompletionOption hint1("attenuation", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
@ -672,7 +672,7 @@ static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_a
hint2.insert_text = hint2.display.quote(p_quote_style); hint2.insert_text = hint2.display.quote(p_quote_style);
r_result.insert(hint2.display, hint2); r_result.insert(hint2.display, hint2);
} }
} else if (p_annotation->name == "@export_node_path") { } else if (p_annotation->name == SNAME("@export_node_path")) {
ScriptCodeCompletionOption node("Node", ScriptCodeCompletionOption::KIND_CLASS); ScriptCodeCompletionOption node("Node", ScriptCodeCompletionOption::KIND_CLASS);
r_result.insert(node.display, node); r_result.insert(node.display, node);
List<StringName> node_types; List<StringName> node_types;
@ -684,7 +684,7 @@ static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_a
ScriptCodeCompletionOption option(E, ScriptCodeCompletionOption::KIND_CLASS); ScriptCodeCompletionOption option(E, ScriptCodeCompletionOption::KIND_CLASS);
r_result.insert(option.display, option); r_result.insert(option.display, option);
} }
} else if (p_annotation->name == "@warning_ignore") { } else if (p_annotation->name == SNAME("@warning_ignore")) {
for (int warning_code = 0; warning_code < GDScriptWarning::WARNING_MAX; warning_code++) { for (int warning_code = 0; warning_code < GDScriptWarning::WARNING_MAX; warning_code++) {
ScriptCodeCompletionOption warning(GDScriptWarning::get_name_from_code((GDScriptWarning::Code)warning_code).to_lower(), ScriptCodeCompletionOption::KIND_PLAIN_TEXT); ScriptCodeCompletionOption warning(GDScriptWarning::get_name_from_code((GDScriptWarning::Code)warning_code).to_lower(), ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
r_result.insert(warning.display, warning); r_result.insert(warning.display, warning);
@ -1384,7 +1384,7 @@ static bool _guess_expression_type(GDScriptParser::CompletionContext &p_context,
Object *baseptr = base.value; Object *baseptr = base.value;
if (all_is_const && String(call->function_name) == "get_node" && ClassDB::is_parent_class(native_type.native_type, "Node") && args.size()) { if (all_is_const && call->function_name == SNAME("get_node") && ClassDB::is_parent_class(native_type.native_type, SNAME("Node")) && args.size()) {
String arg1 = args[0]; String arg1 = args[0];
if (arg1.begins_with("/root/")) { if (arg1.begins_with("/root/")) {
String which = arg1.get_slice("/", 2); String which = arg1.get_slice("/", 2);
@ -2085,7 +2085,7 @@ static bool _guess_method_return_type_from_base(GDScriptParser::CompletionContex
GDScriptParser::DataType base_type = p_base.type; GDScriptParser::DataType base_type = p_base.type;
bool is_static = base_type.is_meta_type; bool is_static = base_type.is_meta_type;
if (is_static && p_method == "new") { if (is_static && p_method == SNAME("new")) {
r_type.type = base_type; r_type.type = base_type;
r_type.type.is_meta_type = false; r_type.type.is_meta_type = false;
r_type.type.is_constant = false; r_type.type.is_constant = false;
@ -2274,7 +2274,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
r_arghint = _make_arguments_hint(info, p_argidx); r_arghint = _make_arguments_hint(info, p_argidx);
} }
if (p_argidx == 0 && ClassDB::is_parent_class(class_name, "Node") && (p_method == "get_node" || p_method == "has_node")) { if (p_argidx == 0 && ClassDB::is_parent_class(class_name, SNAME("Node")) && (p_method == SNAME("get_node") || p_method == SNAME("has_node"))) {
// Get autoloads // Get autoloads
List<PropertyInfo> props; List<PropertyInfo> props;
ProjectSettings::get_singleton()->get_property_list(&props); ProjectSettings::get_singleton()->get_property_list(&props);
@ -2291,7 +2291,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
} }
} }
if (p_argidx == 0 && method_args > 0 && ClassDB::is_parent_class(class_name, "InputEvent") && p_method.operator String().contains("action")) { if (p_argidx == 0 && method_args > 0 && ClassDB::is_parent_class(class_name, SNAME("InputEvent")) && p_method.operator String().contains("action")) {
// Get input actions // Get input actions
List<PropertyInfo> props; List<PropertyInfo> props;
ProjectSettings::get_singleton()->get_property_list(&props); ProjectSettings::get_singleton()->get_property_list(&props);

8
modules/gdscript/gdscript_parser.cpp
View File

@ -519,7 +519,7 @@ void GDScriptParser::parse_program() {
// Check for @tool annotation. // Check for @tool annotation.
AnnotationNode *annotation = parse_annotation(AnnotationInfo::SCRIPT | AnnotationInfo::CLASS_LEVEL); AnnotationNode *annotation = parse_annotation(AnnotationInfo::SCRIPT | AnnotationInfo::CLASS_LEVEL);
if (annotation != nullptr) { if (annotation != nullptr) {
if (annotation->name == "@tool") { if (annotation->name == SNAME("@tool")) {
// TODO: don't allow @tool anywhere else. (Should all script annotations be the first thing?). // TODO: don't allow @tool anywhere else. (Should all script annotations be the first thing?).
_is_tool = true; _is_tool = true;
if (previous.type != GDScriptTokenizer::Token::NEWLINE) { if (previous.type != GDScriptTokenizer::Token::NEWLINE) {
@ -573,7 +573,7 @@ void GDScriptParser::parse_program() {
// Check for @icon annotation. // Check for @icon annotation.
AnnotationNode *annotation = parse_annotation(AnnotationInfo::SCRIPT | AnnotationInfo::CLASS_LEVEL); AnnotationNode *annotation = parse_annotation(AnnotationInfo::SCRIPT | AnnotationInfo::CLASS_LEVEL);
if (annotation != nullptr) { if (annotation != nullptr) {
if (annotation->name == "@icon") { if (annotation->name == SNAME("@icon")) {
if (previous.type != GDScriptTokenizer::Token::NEWLINE) { if (previous.type != GDScriptTokenizer::Token::NEWLINE) {
push_error(R"(Expected newline after "@icon" annotation.)"); push_error(R"(Expected newline after "@icon" annotation.)");
} }
@ -3503,7 +3503,7 @@ bool GDScriptParser::export_annotations(const AnnotationNode *p_annotation, Node
// This is called after the analyzer is done finding the type, so this should be set here. // This is called after the analyzer is done finding the type, so this should be set here.
DataType export_type = variable->get_datatype(); DataType export_type = variable->get_datatype();
if (p_annotation->name == "@export") { if (p_annotation->name == SNAME("@export")) {
if (variable->datatype_specifier == nullptr && variable->initializer == nullptr) { if (variable->datatype_specifier == nullptr && variable->initializer == nullptr) {
push_error(R"(Cannot use simple "@export" annotation with variable without type or initializer, since type can't be inferred.)", p_annotation); push_error(R"(Cannot use simple "@export" annotation with variable without type or initializer, since type can't be inferred.)", p_annotation);
return false; return false;
@ -3528,7 +3528,7 @@ bool GDScriptParser::export_annotations(const AnnotationNode *p_annotation, Node
variable->export_info.hint_string = Variant::get_type_name(export_type.builtin_type); variable->export_info.hint_string = Variant::get_type_name(export_type.builtin_type);
break; break;
case GDScriptParser::DataType::NATIVE: case GDScriptParser::DataType::NATIVE:
if (ClassDB::is_parent_class(export_type.native_type, "Resource")) { if (ClassDB::is_parent_class(export_type.native_type, SNAME("Resource"))) {
variable->export_info.type = Variant::OBJECT; variable->export_info.type = Variant::OBJECT;
variable->export_info.hint = PROPERTY_HINT_RESOURCE_TYPE; variable->export_info.hint = PROPERTY_HINT_RESOURCE_TYPE;
variable->export_info.hint_string = export_type.native_type; variable->export_info.hint_string = export_type.native_type;

18
modules/gdscript/tests/gdscript_test_runner.cpp
View File

@ -73,23 +73,21 @@ void init_autoloads() {
RES res = ResourceLoader::load(info.path); RES res = ResourceLoader::load(info.path);
ERR_CONTINUE_MSG(res.is_null(), "Can't autoload: " + info.path); ERR_CONTINUE_MSG(res.is_null(), "Can't autoload: " + info.path);
Node *n = nullptr; Node *n = nullptr;
if (res->is_class("PackedScene")) { Ref<PackedScene> scn = res;
Ref<PackedScene> ps = res; Ref<Script> script = res;
n = ps->instantiate(); if (scn.is_valid()) {
} else if (res->is_class("Script")) { n = scn->instantiate();
Ref<Script> script_res = res; } else if (script.is_valid()) {
StringName ibt = script_res->get_instance_base_type(); StringName ibt = script->get_instance_base_type();
bool valid_type = ClassDB::is_parent_class(ibt, "Node"); bool valid_type = ClassDB::is_parent_class(ibt, "Node");
ERR_CONTINUE_MSG(!valid_type, "Script does not inherit a Node: " + info.path); ERR_CONTINUE_MSG(!valid_type, "Script does not inherit a Node: " + info.path);
Object *obj = ClassDB::instantiate(ibt); Object *obj = ClassDB::instantiate(ibt);
ERR_CONTINUE_MSG(obj == nullptr, ERR_CONTINUE_MSG(!obj, "Cannot instance script for autoload, expected 'Node' inheritance, got: " + String(ibt) + ".");
"Cannot instance script for autoload, expected 'Node' inheritance, got: " +
String(ibt));
n = Object::cast_to<Node>(obj); n = Object::cast_to<Node>(obj);
n->set_script(script_res); n->set_script(script);
} }
ERR_CONTINUE_MSG(!n, "Path in autoload not a node or script: " + info.path); ERR_CONTINUE_MSG(!n, "Path in autoload not a node or script: " + info.path);

1
modules/visual_script/editor/visual_script_editor.cpp
View File

@ -653,7 +653,6 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
List<int> ids; List<int> ids;
script->get_node_list(&ids); script->get_node_list(&ids);
StringName editor_icons = "EditorIcons";
for (int &E : ids) { for (int &E : ids) {
if (p_only_id >= 0 && p_only_id != E) { if (p_only_id >= 0 && p_only_id != E) {

3
modules/visual_script/visual_script.cpp
View File

@ -1164,9 +1164,6 @@ void VisualScript::_bind_methods() {
ClassDB::bind_method(D_METHOD("remove_custom_signal", "name"), &VisualScript::remove_custom_signal); ClassDB::bind_method(D_METHOD("remove_custom_signal", "name"), &VisualScript::remove_custom_signal);
ClassDB::bind_method(D_METHOD("rename_custom_signal", "name", "new_name"), &VisualScript::rename_custom_signal); ClassDB::bind_method(D_METHOD("rename_custom_signal", "name", "new_name"), &VisualScript::rename_custom_signal);
//ClassDB::bind_method(D_METHOD("set_variable_info","name","info"),&VScript::set_variable_info);
//ClassDB::bind_method(D_METHOD("get_variable_info","name"),&VScript::set_variable_info);
ClassDB::bind_method(D_METHOD("set_instance_base_type", "type"), &VisualScript::set_instance_base_type); ClassDB::bind_method(D_METHOD("set_instance_base_type", "type"), &VisualScript::set_instance_base_type);
ClassDB::bind_method(D_METHOD("_set_data", "data"), &VisualScript::_set_data); ClassDB::bind_method(D_METHOD("_set_data", "data"), &VisualScript::_set_data);

10
modules/visual_script/visual_script_nodes.cpp
View File

@ -2495,7 +2495,7 @@ static Node *_find_script_node(Node *p_edited_scene, Node *p_current_node, const
VisualScriptSceneNode::TypeGuess VisualScriptSceneNode::guess_output_type(TypeGuess *p_inputs, int p_output) const { VisualScriptSceneNode::TypeGuess VisualScriptSceneNode::guess_output_type(TypeGuess *p_inputs, int p_output) const {
VisualScriptSceneNode::TypeGuess tg; VisualScriptSceneNode::TypeGuess tg;
tg.type = Variant::OBJECT; tg.type = Variant::OBJECT;
tg.gdclass = "Node"; tg.gdclass = SNAME("Node");
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
Ref<Script> script = get_visual_script(); Ref<Script> script = get_visual_script();
@ -2649,7 +2649,7 @@ VisualScriptNodeInstance *VisualScriptSceneTree::instantiate(VisualScriptInstanc
VisualScriptSceneTree::TypeGuess VisualScriptSceneTree::guess_output_type(TypeGuess *p_inputs, int p_output) const { VisualScriptSceneTree::TypeGuess VisualScriptSceneTree::guess_output_type(TypeGuess *p_inputs, int p_output) const {
TypeGuess tg; TypeGuess tg;
tg.type = Variant::OBJECT; tg.type = Variant::OBJECT;
tg.gdclass = "SceneTree"; tg.gdclass = SNAME("SceneTree");
return tg; return tg;
} }
@ -2766,11 +2766,11 @@ PropertyInfo VisualScriptSelf::get_input_value_port_info(int p_idx) const {
} }
PropertyInfo VisualScriptSelf::get_output_value_port_info(int p_idx) const { PropertyInfo VisualScriptSelf::get_output_value_port_info(int p_idx) const {
String type_name; StringName type_name;
if (get_visual_script().is_valid()) { if (get_visual_script().is_valid()) {
type_name = get_visual_script()->get_instance_base_type(); type_name = get_visual_script()->get_instance_base_type();
} else { } else {
type_name = "instance"; type_name = SNAME("instance");
} }
return PropertyInfo(Variant::OBJECT, type_name); return PropertyInfo(Variant::OBJECT, type_name);
@ -2801,7 +2801,7 @@ VisualScriptNodeInstance *VisualScriptSelf::instantiate(VisualScriptInstance *p_
VisualScriptSelf::TypeGuess VisualScriptSelf::guess_output_type(TypeGuess *p_inputs, int p_output) const { VisualScriptSelf::TypeGuess VisualScriptSelf::guess_output_type(TypeGuess *p_inputs, int p_output) const {
VisualScriptSceneNode::TypeGuess tg; VisualScriptSceneNode::TypeGuess tg;
tg.type = Variant::OBJECT; tg.type = Variant::OBJECT;
tg.gdclass = "Object"; tg.gdclass = SNAME("Object");
Ref<Script> script = get_visual_script(); Ref<Script> script = get_visual_script();
if (!script.is_valid()) { if (!script.is_valid()) {

10
scene/resources/resource_format_text.cpp
View File

@ -1951,7 +1951,7 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path, const RES &p_r
} }
Error ResourceFormatSaverText::save(const String &p_path, const RES &p_resource, uint32_t p_flags) { Error ResourceFormatSaverText::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
if (p_path.ends_with(".sct") && p_resource->get_class() != "PackedScene") { if (p_path.ends_with(".tscn") && !Ref<PackedScene>(p_resource).is_valid()) {
return ERR_FILE_UNRECOGNIZED; return ERR_FILE_UNRECOGNIZED;
} }
@ -1960,14 +1960,14 @@ Error ResourceFormatSaverText::save(const String &p_path, const RES &p_resource,
} }
bool ResourceFormatSaverText::recognize(const RES &p_resource) const { bool ResourceFormatSaverText::recognize(const RES &p_resource) const {
return true; // all recognized! return true; // All resources recognized!
} }
void ResourceFormatSaverText::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const { void ResourceFormatSaverText::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
if (p_resource->get_class() == "PackedScene") { if (Ref<PackedScene>(p_resource).is_valid()) {
p_extensions->push_back("tscn"); //text scene p_extensions->push_back("tscn"); // Text scene.
} else { } else {
p_extensions->push_back("tres"); //text resource p_extensions->push_back("tres"); // Text resource.
} }
} }