diff options
Diffstat (limited to 'editor/editor_node.cpp')
-rw-r--r-- | editor/editor_node.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 86964b3ca0..fb3c52e773 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -930,7 +930,7 @@ void EditorNode::_save_scene(String p_file, int idx) { // we must update it, but also let the previous scene state go, as // old version still work for referencing changes in instanced or inherited scenes - sdata = Ref<PackedScene>(ResourceCache::get(p_file)->cast_to<PackedScene>()); + sdata = Ref<PackedScene>(Object::cast_to<PackedScene>(ResourceCache::get(p_file))); if (sdata.is_valid()) sdata->recreate_state(); else @@ -1291,9 +1291,9 @@ void EditorNode::_dialog_action(String p_file) { uint32_t current = editor_history.get_current(); Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL; - ERR_FAIL_COND(!current_obj->cast_to<Resource>()) + ERR_FAIL_COND(!Object::cast_to<Resource>(current_obj)) - RES current_res = RES(current_obj->cast_to<Resource>()); + RES current_res = RES(Object::cast_to<Resource>(current_obj)); save_resource_in_path(current_res, p_file); @@ -1428,8 +1428,8 @@ void EditorNode::_prepare_history() { icon = base_icon; String text; - if (obj->cast_to<Resource>()) { - Resource *r = obj->cast_to<Resource>(); + if (Object::cast_to<Resource>(obj)) { + Resource *r = Object::cast_to<Resource>(obj); if (r->get_path().is_resource_file()) text = r->get_path().get_file(); else if (r->get_name() != String()) { @@ -1437,8 +1437,8 @@ void EditorNode::_prepare_history() { } else { text = r->get_class(); } - } else if (obj->cast_to<Node>()) { - text = obj->cast_to<Node>()->get_name(); + } else if (Object::cast_to<Node>(obj)) { + text = Object::cast_to<Node>(obj)->get_name(); } else { text = obj->get_class(); } @@ -1536,7 +1536,7 @@ void EditorNode::_edit_current() { if (is_resource) { - Resource *current_res = current_obj->cast_to<Resource>(); + Resource *current_res = Object::cast_to<Resource>(current_obj); ERR_FAIL_COND(!current_res); scene_tree_dock->set_selected(NULL); property_editor->edit(current_res); @@ -1548,7 +1548,7 @@ void EditorNode::_edit_current() { //top_pallete->set_current_tab(1); } else if (is_node) { - Node *current_node = current_obj->cast_to<Node>(); + Node *current_node = Object::cast_to<Node>(current_obj); ERR_FAIL_COND(!current_node); // ERR_FAIL_COND(!current_node->is_inside_tree()); @@ -1688,7 +1688,7 @@ void EditorNode::_resource_created() { Object *c = create_dialog->instance_selected(); ERR_FAIL_COND(!c); - Resource *r = c->cast_to<Resource>(); + Resource *r = Object::cast_to<Resource>(c); ERR_FAIL_COND(!r); REF res(r); @@ -2273,9 +2273,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { uint32_t current = editor_history.get_current(); Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL; - ERR_FAIL_COND(!current_obj->cast_to<Resource>()) + ERR_FAIL_COND(!Object::cast_to<Resource>(current_obj)) - RES current_res = RES(current_obj->cast_to<Resource>()); + RES current_res = RES(Object::cast_to<Resource>(current_obj)); save_resource(current_res); @@ -2285,9 +2285,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { uint32_t current = editor_history.get_current(); Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL; - ERR_FAIL_COND(!current_obj->cast_to<Resource>()) + ERR_FAIL_COND(!Object::cast_to<Resource>(current_obj)) - RES current_res = RES(current_obj->cast_to<Resource>()); + RES current_res = RES(Object::cast_to<Resource>(current_obj)); save_resource_as(current_res); @@ -2297,9 +2297,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { uint32_t current = editor_history.get_current(); Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL; - ERR_FAIL_COND(!current_obj->cast_to<Resource>()) + ERR_FAIL_COND(!Object::cast_to<Resource>(current_obj)) - RES current_res = RES(current_obj->cast_to<Resource>()); + RES current_res = RES(Object::cast_to<Resource>(current_obj)); current_res->set_path(""); _edit_current(); } break; @@ -2308,9 +2308,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { uint32_t current = editor_history.get_current(); Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL; - ERR_FAIL_COND(!current_obj->cast_to<Resource>()) + ERR_FAIL_COND(!Object::cast_to<Resource>(current_obj)) - RES current_res = RES(current_obj->cast_to<Resource>()); + RES current_res = RES(Object::cast_to<Resource>(current_obj)); EditorSettings::get_singleton()->set_resource_clipboard(current_res); @@ -3038,8 +3038,8 @@ void EditorNode::set_edited_scene(Node *p_scene) { } get_editor_data().set_edited_scene_root(p_scene); - if (p_scene && p_scene->cast_to<Popup>()) - p_scene->cast_to<Popup>()->show(); //show popups + if (Object::cast_to<Popup>(p_scene)) + Object::cast_to<Popup>(p_scene)->show(); //show popups scene_tree_dock->set_edited_scene(p_scene); if (get_tree()) get_tree()->set_edited_scene_root(p_scene); @@ -3182,8 +3182,8 @@ void EditorNode::set_current_scene(int p_idx) { Node *new_scene = editor_data.get_edited_scene_root(); - if (new_scene && new_scene->cast_to<Popup>()) - new_scene->cast_to<Popup>()->show(); //show popups + if (Object::cast_to<Popup>(new_scene)) + Object::cast_to<Popup>(new_scene)->show(); //show popups //print_line("set current 3 "); @@ -3333,7 +3333,7 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b if (ResourceCache::has(lpath)) { //used from somewhere else? no problem! update state and replace sdata - Ref<PackedScene> ps = Ref<PackedScene>(ResourceCache::get(lpath)->cast_to<PackedScene>()); + Ref<PackedScene> ps = Ref<PackedScene>(Object::cast_to<PackedScene>(ResourceCache::get(lpath))); if (ps.is_valid()) { ps->replace_state(sdata->get_state()); ps->set_last_modified_time(sdata->get_last_modified_time()); @@ -3461,7 +3461,7 @@ void EditorNode::_property_keyed(const String &p_keyed, const Variant &p_value, void EditorNode::_transform_keyed(Object *sp, const String &p_sub, const Transform &p_key) { - Spatial *s = sp->cast_to<Spatial>(); + Spatial *s = Object::cast_to<Spatial>(sp); if (!s) return; AnimationPlayerEditor::singleton->get_key_editor()->insert_transform_key(s, p_sub, p_key); @@ -3478,7 +3478,7 @@ void EditorNode::update_keying() { if (editor_history.get_path_size() >= 1) { Object *obj = ObjectDB::get_instance(editor_history.get_path_object(0)); - if (obj && obj->cast_to<Node>()) { + if (Object::cast_to<Node>(obj)) { valid = true; } @@ -4200,7 +4200,7 @@ void EditorNode::_load_docks_from_config(Ref<ConfigFile> p_layout, const String for (int k = 0; k < DOCK_SLOT_MAX; k++) { if (!dock_slot[k]->has_node(name)) continue; - node = dock_slot[k]->get_node(name)->cast_to<Control>(); + node = Object::cast_to<Control>(dock_slot[k]->get_node(name)); if (!node) continue; atidx = k; @@ -4785,7 +4785,7 @@ void EditorNode::reload_scene(const String &p_path) { if (E->get()->get_path().begins_with(p_path + "::")) //subresources of existing scene to_clear.push_back(E->get()); - if (!E->get()->cast_to<Texture>()) + if (!cast_to<Texture>(E->get().ptr())) continue; if (!E->get()->get_path().is_resource_file() && !E->get()->get_path().is_abs_path()) continue; @@ -4926,13 +4926,13 @@ void EditorNode::_dim_timeout() { void EditorNode::_check_gui_base_size() { if (gui_base->get_size().width > 1200 * EDSCALE) { for (int i = 0; i < singleton->main_editor_button_vb->get_child_count(); i++) { - ToolButton *btn = singleton->main_editor_button_vb->get_child(i)->cast_to<ToolButton>(); + ToolButton *btn = Object::cast_to<ToolButton>(singleton->main_editor_button_vb->get_child(i)); if (btn == singleton->distraction_free) continue; btn->set_text(btn->get_name()); } } else { for (int i = 0; i < singleton->main_editor_button_vb->get_child_count(); i++) { - ToolButton *btn = singleton->main_editor_button_vb->get_child(i)->cast_to<ToolButton>(); + ToolButton *btn = Object::cast_to<ToolButton>(singleton->main_editor_button_vb->get_child(i)); if (btn == singleton->distraction_free) continue; btn->set_text(""); } @@ -5056,7 +5056,7 @@ EditorNode::EditorNode() { ResourceLoader::clear_translation_remaps(); //no remaps using during editor editor_initialize_certificates(); //for asset sharing - InputDefault *id = Input::get_singleton()->cast_to<InputDefault>(); + InputDefault *id = Object::cast_to<InputDefault>(Input::get_singleton()); if (id) { |