diff options
Diffstat (limited to 'editor')
40 files changed, 75 insertions, 186 deletions
diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index 6d444c5422..590621816e 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/editor/animation_track_editor_plugins.cpp @@ -974,8 +974,6 @@ void AnimationTrackEditTypeAudio::drop_data(const Point2 &p_point, const Variant ofs += 0.001; } - print_line("inserting"); - *get_block_animation_update_ptr() = true; get_undo_redo()->create_action("Add Audio Track Clip"); get_undo_redo()->add_do_method(get_animation().ptr(), "audio_track_insert_key", get_track(), ofs, stream); @@ -1124,7 +1122,6 @@ Rect2 AnimationTrackEditTypeAnimation::get_key_rect(int p_index, float p_pixels_ } String anim = get_animation()->animation_track_get_key_animation(get_track(), p_index); - print_line("anim " + anim + " has " + itos(ap->has_animation(anim))); if (anim != "[stop]" && ap->has_animation(anim)) { diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 9d4333bc29..2fecf24d7d 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -717,7 +717,6 @@ void CodeTextEditor::_complete_request() { if (code_complete_func) { code_complete_func(code_complete_ud, ctext, &entries, forced); } - // print_line("COMPLETE: "+p_request); if (entries.size() == 0) return; Vector<String> strs; diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index c4a17d5402..62ae14c988 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -336,12 +336,9 @@ void DependencyEditorOwners::_fill_owners(EditorFileSystemDirectory *efsd) { for (int i = 0; i < efsd->get_file_count(); i++) { Vector<String> deps = efsd->get_file_deps(i); - //print_line(":::"+efsd->get_file_path(i)); bool found = false; for (int j = 0; j < deps.size(); j++) { - //print_line("\t"+deps[j]+" vs "+editing); if (deps[j] == editing) { - //print_line("found"); found = true; break; } @@ -510,7 +507,7 @@ void DependencyRemoveDialog::ok_pressed() { res->set_path(""); } String path = OS::get_singleton()->get_resource_dir() + files_to_delete[i].replace_first("res://", "/"); - print_line("Moving to trash: " + path); + print_verbose("Moving to trash: " + path); Error err = OS::get_singleton()->move_to_trash(path); if (err != OK) { EditorNode::get_singleton()->add_io_error(TTR("Cannot remove:") + "\n" + files_to_delete[i] + "\n"); @@ -525,7 +522,7 @@ void DependencyRemoveDialog::ok_pressed() { for (int i = 0; i < dirs_to_delete.size(); ++i) { String path = OS::get_singleton()->get_resource_dir() + dirs_to_delete[i].replace_first("res://", "/"); - print_line("Moving to trash: " + path); + print_verbose("Moving to trash: " + path); Error err = OS::get_singleton()->move_to_trash(path); if (err != OK) { EditorNode::get_singleton()->add_io_error(TTR("Cannot remove:") + "\n" + dirs_to_delete[i] + "\n"); @@ -673,7 +670,6 @@ bool OrphanResourcesDialog::_fill_owners(EditorFileSystemDirectory *efsd, HashMa if (!p_parent) { Vector<String> deps = efsd->get_file_deps(i); - //print_line(":::"+efsd->get_file_path(i)); for (int j = 0; j < deps.size(); j++) { if (!refs.has(deps[j])) { diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 91a29f5717..fe1cf3484e 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -792,7 +792,6 @@ Error DocData::_load(Ref<XMLParser> parser) { class_list[name] = ClassDoc(); ClassDoc &c = class_list[name]; - //print_line("class: "+name); c.name = name; if (parser->has_attribute("inherits")) c.inherits = parser->get_attribute_value("inherits"); diff --git a/editor/editor_asset_installer.cpp b/editor/editor_asset_installer.cpp index f1c8c08d08..d99908a3c3 100644 --- a/editor/editor_asset_installer.cpp +++ b/editor/editor_asset_installer.cpp @@ -172,7 +172,6 @@ void EditorAssetInstaller::open(const String &p_path, int p_depth) { parent = root; } else { String ppath = path.substr(0, pp); - print_line("PPATH IS: " + ppath); ERR_CONTINUE(!dir_map.has(ppath)); parent = dir_map[ppath]; } diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index a084437226..9c775be87e 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -482,10 +482,8 @@ void EditorAudioBus::drop_data(const Point2 &p_point, const Variant &p_data) { Variant EditorAudioBus::get_drag_data_fw(const Point2 &p_point, Control *p_from) { - print_line("drag fw"); TreeItem *item = effects->get_item_at_position(p_point); if (!item) { - print_line("no item"); return Variant(); } diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index 721158cebb..e46fe96885 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -1486,8 +1486,6 @@ void EditorExportTextSceneToBinaryPlugin::_export_file(const String &p_path, con return; } - print_line("exporting " + p_path); - bool convert = GLOBAL_GET("editor/convert_text_resources_to_binary_on_export"); if (!convert) return; diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 50b3810e52..5a0a49d577 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -1907,8 +1907,6 @@ void EditorHelpBit::_go_to_help(String p_what) { void EditorHelpBit::_meta_clicked(String p_select) { - print_line("got meta " + p_select); - if (p_select.begins_with("$")) { //enum String select = p_select.substr(1, p_select.length()); diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 6818de8281..1f2e73654c 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -104,14 +104,12 @@ Vector<Ref<Texture> > EditorInterface::make_mesh_previews(const Vector<Ref<Mesh> continue; } AABB aabb = mesh->get_aabb(); - print_line("aabb: " + aabb); Vector3 ofs = aabb.position + aabb.size * 0.5; aabb.position -= ofs; Transform xform; xform.basis = Basis().rotated(Vector3(0, 1, 0), -Math_PI * 0.25); xform.basis = Basis().rotated(Vector3(1, 0, 0), Math_PI * 0.25) * xform.basis; AABB rot_aabb = xform.xform(aabb); - print_line("rot_aabb: " + rot_aabb); float m = MAX(rot_aabb.size.x, rot_aabb.size.y) * 0.5; if (m == 0) { textures.push_back(Ref<Texture>()); @@ -119,7 +117,6 @@ Vector<Ref<Texture> > EditorInterface::make_mesh_previews(const Vector<Ref<Mesh> } m = 1.0 / m; m *= 0.5; - print_line("scale: " + rtos(m)); xform.basis.scale(Vector3(m, m, m)); xform.origin = -xform.basis.xform(ofs); //-ofs*m; xform.origin.z -= rot_aabb.size.z * 2; @@ -133,7 +130,6 @@ Vector<Ref<Texture> > EditorInterface::make_mesh_previews(const Vector<Ref<Mesh> Ref<ImageTexture> it(memnew(ImageTexture)); it->create_from_image(img); - //print_line("loaded image, size: "+rtos(m)+" dist: "+rtos(dist)+" empty?"+itos(img.empty())+" w: "+itos(it->get_width())+" h: "+itos(it->get_height())); VS::get_singleton()->free(inst); textures.push_back(it); diff --git a/editor/editor_profiler.cpp b/editor/editor_profiler.cpp index a8d30d9cbe..f57c863bcf 100644 --- a/editor/editor_profiler.cpp +++ b/editor/editor_profiler.cpp @@ -344,7 +344,6 @@ void EditorProfiler::_update_plot() { } time = OS::get_singleton()->get_ticks_usec() - time; - //print_line("Taken: "+rtos(USEC_TO_SEC(time))); } wr = PoolVector<uint8_t>::Write(); diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index a9eaad47b7..bc56a95b47 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -152,8 +152,6 @@ Ref<Texture> EditorResourcePreview::_generate_preview(const QueueItem &p_item, c f->store_line(itos(FileAccess::get_modified_time(p_item.path))); f->store_line(FileAccess::get_md5(p_item.path)); memdelete(f); - } else { - //print_line("was not generated"); } } diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index bbc00dd542..5d3c6dd087 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -146,7 +146,7 @@ bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const { const VariantContainer *v = props.getptr(p_name); if (!v) { - print_line("EditorSettings::_get - Warning, not found: " + String(p_name)); + WARN_PRINTS("EditorSettings::_get - Property not found: " + String(p_name)); return false; } r_ret = v->variant; diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 50d71f1c98..7ed7b920d9 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -238,7 +238,7 @@ void editor_register_and_generate_icons(Ref<Theme> p_theme, bool p_dark_theme = clock_t end_time = clock(); #else - print_line("Sorry no icons for you"); + print_line("SVG support disabled, editor icons won't be rendered."); #endif } diff --git a/editor/fileserver/editor_file_server.cpp b/editor/fileserver/editor_file_server.cpp index b9e0c7d0fa..28b1095256 100644 --- a/editor/fileserver/editor_file_server.cpp +++ b/editor/fileserver/editor_file_server.cpp @@ -34,9 +34,10 @@ #include "io/marshalls.h" //#define DEBUG_PRINT(m_p) print_line(m_p) -#define DEBUG_TIME(m_what) printf("MS: %s - %lu\n", m_what, OS::get_singleton()->get_ticks_usec()); +//#define DEBUG_TIME(m_what) printf("MS: %s - %lu\n", m_what, OS::get_singleton()->get_ticks_usec()); -//#define DEBUG_TIME(m_what) +#define DEBUG_PRINT(m_what) +#define DEBUG_TIME(m_what) void EditorFileServer::_close_client(ClientData *cd) { @@ -107,7 +108,6 @@ void EditorFileServer::_subthread_start(void *s) { //wait for ID err = cd->connection->get_data(buf4, 4); - //#define DEBUG_PRINT(m_p) print_line(m_p) DEBUG_TIME("get_data") if (err != OK) { @@ -150,13 +150,13 @@ void EditorFileServer::_subthread_start(void *s) { s.parse_utf8(fileutf8.ptr()); if (cmd == FileAccessNetwork::COMMAND_FILE_EXISTS) { - print_line("FILE EXISTS: " + s); + DEBUG_PRINT("FILE EXISTS: " + s); } if (cmd == FileAccessNetwork::COMMAND_GET_MODTIME) { - print_line("MOD TIME: " + s); + DEBUG_PRINT("MOD TIME: " + s); } if (cmd == FileAccessNetwork::COMMAND_OPEN_FILE) { - print_line("OPEN: " + s); + DEBUG_PRINT("OPEN: " + s); } if (!s.begins_with("res://")) { @@ -243,7 +243,7 @@ void EditorFileServer::_subthread_start(void *s) { int read = cd->files[id]->get_buffer(buf.ptrw(), blocklen); ERR_CONTINUE(read < 0); - print_line("GET BLOCK - offset: " + itos(offset) + ", blocklen: " + itos(blocklen)); + DEBUG_PRINT("GET BLOCK - offset: " + itos(offset) + ", blocklen: " + itos(blocklen)); //not found, continue encode_uint32(id, buf4); @@ -259,7 +259,7 @@ void EditorFileServer::_subthread_start(void *s) { } break; case FileAccessNetwork::COMMAND_CLOSE: { - print_line("CLOSED"); + DEBUG_PRINT("CLOSED"); ERR_CONTINUE(!cd->files.has(id)); memdelete(cd->files[id]); cd->files.erase(id); diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index ec1153a015..cb38c2f85e 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -809,7 +809,7 @@ void FileSystemDock::_try_move_item(const FileOrFolder &p_item, const String &p_ } DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); - print_line("Moving " + old_path + " -> " + new_path); + print_verbose("Moving " + old_path + " -> " + new_path); Error err = da->rename(old_path, new_path); if (err == OK) { //Move/Rename any corresponding import settings too @@ -837,7 +837,7 @@ void FileSystemDock::_try_move_item(const FileOrFolder &p_item, const String &p_ //Only treat as a changed dependency if it was successfully moved for (int i = 0; i < file_changed_paths.size(); ++i) { p_file_renames[file_changed_paths[i]] = file_changed_paths[i].replace_first(old_path, new_path); - print_line(" Remap: " + file_changed_paths[i] + " -> " + p_file_renames[file_changed_paths[i]]); + print_verbose(" Remap: " + file_changed_paths[i] + " -> " + p_file_renames[file_changed_paths[i]]); } for (int i = 0; i < folder_changed_paths.size(); ++i) { p_folder_renames[folder_changed_paths[i]] = folder_changed_paths[i].replace_first(old_path, new_path); @@ -865,7 +865,7 @@ void FileSystemDock::_try_duplicate_item(const FileOrFolder &p_item, const Strin } DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); - print_line("Duplicating " + old_path + " -> " + new_path); + print_verbose("Duplicating " + old_path + " -> " + new_path); Error err = p_item.is_file ? da->copy(old_path, new_path) : da->copy_dir(old_path, new_path); if (err == OK) { //Move/Rename any corresponding import settings too @@ -942,7 +942,7 @@ void FileSystemDock::_update_dependencies_after_move(const Map<String, String> & for (int i = 0; i < remaps.size(); ++i) { //Because we haven't called a rescan yet the found remap might still be an old path itself. String file = p_renames.has(remaps[i]) ? p_renames[remaps[i]] : remaps[i]; - print_line("Remapping dependencies for: " + file); + print_verbose("Remapping dependencies for: " + file); Error err = ResourceLoader::rename_dependencies(file, p_renames); if (err == OK) { if (ResourceLoader::get_resource_type(file) == "PackedScene") @@ -998,7 +998,7 @@ void FileSystemDock::_make_dir_confirm() { return; } - print_line("Making folder " + dir_name + " in " + path); + print_verbose("Making folder " + dir_name + " in " + path); DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); Error err = da->change_dir(path); if (err == OK) { @@ -1007,7 +1007,7 @@ void FileSystemDock::_make_dir_confirm() { memdelete(da); if (err == OK) { - print_line("call rescan!"); + print_verbose("FileSystem: calling rescan."); _rescan(); } else { EditorNode::get_singleton()->show_warning(TTR("Could not create folder.")); @@ -1054,7 +1054,7 @@ void FileSystemDock::_rename_operation_confirm() { _update_favorite_dirs_list_after_move(folder_renames); //Rescan everything - print_line("call rescan!"); + print_verbose("FileSystem: calling rescan."); _rescan(); } @@ -1089,7 +1089,7 @@ void FileSystemDock::_duplicate_operation_confirm() { _try_duplicate_item(to_duplicate, new_path); //Rescan everything - print_line("call rescan!"); + print_verbose("FileSystem: calling rescan."); _rescan(); } @@ -1146,7 +1146,7 @@ void FileSystemDock::_move_operation_confirm(const String &p_to_path, bool overw _update_project_settings_after_move(file_renames); _update_favorite_dirs_list_after_move(folder_renames); - print_line("call rescan!"); + print_verbose("FileSystem: calling rescan."); _rescan(); } } diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp index ef7409fd43..9ede8a05bc 100644 --- a/editor/find_in_files.cpp +++ b/editor/find_in_files.cpp @@ -123,12 +123,12 @@ void FindInFiles::_notification(int p_notification) { void FindInFiles::start() { if (_pattern == "") { - print_line("Nothing to search, pattern is empty"); + print_verbose("Nothing to search, pattern is empty"); emit_signal(SIGNAL_FINISHED); return; } if (_extension_filter.size() == 0) { - print_line("Nothing to search, filter matches no files"); + print_verbose("Nothing to search, filter matches no files"); emit_signal(SIGNAL_FINISHED); return; } @@ -207,7 +207,7 @@ void FindInFiles::_iterate() { _scan_file(fpath); } else { - print_line("Search complete"); + print_verbose("Search complete"); set_process(false); _current_dir = ""; _searching = false; @@ -226,7 +226,7 @@ void FindInFiles::_scan_dir(String path, PoolStringArray &out_folders) { DirAccess *dir = DirAccess::open(path); if (dir == NULL) { - print_line("Cannot open directory! " + path); + print_verbose("Cannot open directory! " + path); return; } @@ -258,7 +258,7 @@ void FindInFiles::_scan_file(String fpath) { FileAccess *f = FileAccess::open(fpath, FileAccess::READ); if (f == NULL) { - print_line(String("Cannot open file ") + fpath); + print_verbose(String("Cannot open file ") + fpath); return; } @@ -896,7 +896,7 @@ void FindInFilesPanel::apply_replaces_in_file(String fpath, const Vector<Result> int _; if (!find_next(line, search_text, repl_begin, _finder->is_match_case(), _finder->is_whole_words(), _, _)) { // Make sure the replace is still valid in case the file was tampered with. - print_line(String("Occurrence no longer matches, replace will be ignored in {0}: line {1}, col {2}").format(varray(fpath, repl_line_number, repl_begin))); + print_verbose(String("Occurrence no longer matches, replace will be ignored in {0}: line {1}, col {2}").format(varray(fpath, repl_line_number, repl_begin))); continue; } diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 22ea5883e8..d4bd4f85e6 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -119,7 +119,6 @@ Error ColladaImport::_populate_skeleton(Skeleton *p_skeleton, Collada::Node *p_n Collada::NodeJoint *joint = static_cast<Collada::NodeJoint *>(p_node); - print_line("populating joint " + joint->name); p_skeleton->add_bone(p_node->name); if (p_parent >= 0) p_skeleton->set_bone_parent(r_bone, p_parent); @@ -137,8 +136,7 @@ Error ColladaImport::_populate_skeleton(Skeleton *p_skeleton, Collada::Node *p_n p_skeleton->set_bone_rest(r_bone, collada.fix_transform(collada.state.bone_rest_map[joint->sid])); //should map this bone to something for animation? } else { - print_line("no rest: " + joint->sid); - WARN_PRINT("Joint has no rest..."); + WARN_PRINT("Collada: Joint has no rest."); } int id = r_bone++; @@ -585,9 +583,6 @@ static void _generate_tangents_and_binormals(const PoolVector<int> &p_indices, c binormals.write[index_arrayr[idx * 3 + 1]] += binormal; tangents.write[index_arrayr[idx * 3 + 2]] += tangent; binormals.write[index_arrayr[idx * 3 + 2]] += binormal; - - //print_line(itos(idx)+" tangent: "+tangent); - //print_line(itos(idx)+" binormal: "+binormal); } r_tangents.resize(vlen * 4); @@ -1028,7 +1023,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ArrayMesh> &p_me material = material_cache[target]; } else if (p.material != "") { - print_line("Warning, unreferenced material in geometry instance: " + p.material); + WARN_PRINTS("Collada: Unreferenced material in geometry instance: " + p.material); } } @@ -1352,7 +1347,7 @@ Error ColladaImport::_create_resources(Collada::Node *p_node, bool p_use_compres mesh_cache[meshid] = mesh; } else { - print_line("Warning, will not import geometry: " + meshid); + WARN_PRINTS("Collada: Will not import geometry: " + meshid); } } @@ -1379,7 +1374,7 @@ Error ColladaImport::_create_resources(Collada::Node *p_node, bool p_use_compres mi->set_surface_material(i, material); } else if (matname != "") { - print_line("Warning, unreferenced material in geometry instance: " + matname); + WARN_PRINTS("Collada: Unreferenced material in geometry instance: " + matname); } } } @@ -1541,7 +1536,6 @@ void ColladaImport::create_animations(bool p_make_tracks_in_all_bones, bool p_im for (int i = 0; i < collada.state.animation_tracks.size(); i++) { const Collada::AnimationTrack &at = collada.state.animation_tracks[i]; - //print_line("CHANNEL: "+at.target+" PARAM: "+at.param); String node; @@ -1551,7 +1545,7 @@ void ColladaImport::create_animations(bool p_make_tracks_in_all_bones, bool p_im node = node_name_map[at.target]; } else { - print_line("Couldn't find node: " + at.target); + WARN_PRINTS("Collada: Couldn't find node: " + at.target); continue; } } else { @@ -1570,7 +1564,6 @@ void ColladaImport::create_animations(bool p_make_tracks_in_all_bones, bool p_im } create_animation(-1, p_make_tracks_in_all_bones, p_import_value_tracks); - //print_line("clipcount: "+itos(collada.state.animation_clips.size())); for (int i = 0; i < collada.state.animation_clips.size(); i++) create_animation(i, p_make_tracks_in_all_bones, p_import_value_tracks); } @@ -1580,11 +1573,8 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones Ref<Animation> animation = Ref<Animation>(memnew(Animation)); if (p_clip == -1) { - - //print_line("default"); animation->set_name("default"); } else { - //print_line("clip name: "+collada.state.animation_clips[p_clip].name); animation->set_name(collada.state.animation_clips[p_clip].name); } @@ -1658,7 +1648,6 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones } } - //print_line("anim len: "+rtos(anim_length)); animation->set_length(anim_length); bool tracks_found = false; @@ -1736,7 +1725,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones } if (xform_idx == -1) { - print_line("couldn't find matching node " + at.target + " xform for track " + at.param); + WARN_PRINTS("Collada: Couldn't find matching node " + at.target + " xform for track " + at.param); continue; } @@ -1758,14 +1747,9 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones ERR_CONTINUE(data.size() > 1); xf.data.write[cn] = data[0]; } else if (data.size() == xf.data.size()) { - xf.data = data; } else { - - if (data.size() != xf.data.size()) { - print_line("component " + at.component + " datasize " + itos(data.size()) + " xfdatasize " + itos(xf.data.size())); - } - + ERR_EXPLAIN("Component " + at.component + " has datasize " + itos(data.size()) + ", xfdatasize " + itos(xf.data.size())); ERR_CONTINUE(data.size() != xf.data.size()); } } @@ -1781,7 +1765,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones xform = sk->get_bone_rest(nm.bone).affine_inverse() * xform; } else { - ERR_PRINT("INVALID SKELETON!!!!"); + ERR_PRINT("Collada: Invalid skeleton"); } } @@ -1812,8 +1796,6 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones if (E->get()) continue; - //print_line("BONE LACKS ANIM: "+E->key()); - NodeMap &nm = node_map[E->key()]; String path = scene->get_path_to(nm.node); ERR_CONTINUE(nm.bone < 0); @@ -1823,7 +1805,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones Collada::Node *cn = collada.state.scene_map[E->key()]; if (cn->ignore_anim) { - print_line("warning, ignoring animation on node: " + path); + WARN_PRINTS("Collada: Ignoring animation on node: " + path); continue; } @@ -1889,10 +1871,9 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones } else if (data.size() == 16) { //matrix - print_line("value keys for matrices not supported"); + WARN_PRINT("Collada: Value keys for matrices not supported."); } else { - - print_line("don't know what to do with this amount of value keys: " + itos(data.size())); + WARN_PRINTS("Collada: Unexpected amount of value keys: " + itos(data.size())); } animation->track_insert_key(track, time, value); @@ -1994,7 +1975,6 @@ Ref<Animation> EditorSceneImporterCollada::import_animation(const String &p_path if (state.animations.size() == 0) return Ref<Animation>(); Ref<Animation> anim = state.animations[0]; - print_line("Anim Load OK"); String base = p_path.get_basename().to_lower(); if (p_flags & IMPORT_ANIMATION_DETECT_LOOP) { diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index 906d902b4a..4d5c292847 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -323,7 +323,7 @@ Error EditorSceneImporterGLTF::_parse_buffers(GLTFState &state, const String &p_ } } - print_line("total buffers: " + itos(state.buffers.size())); + print_verbose("glTF: Total buffers: " + itos(state.buffers.size())); return OK; } @@ -359,7 +359,7 @@ Error EditorSceneImporterGLTF::_parse_buffer_views(GLTFState &state) { state.buffer_views.push_back(buffer_view); } - print_line("total buffer views: " + itos(state.buffer_views.size())); + print_verbose("glTF: Total buffer views: " + itos(state.buffer_views.size())); return OK; } @@ -451,7 +451,7 @@ Error EditorSceneImporterGLTF::_parse_accessors(GLTFState &state) { state.accessors.push_back(accessor); } - print_line("total accessors: " + itos(state.accessors.size())); + print_verbose("glTF: Total accessors: " + itos(state.accessors.size())); return OK; } @@ -501,8 +501,8 @@ Error EditorSceneImporterGLTF::_decode_buffer_view(GLTFState &state, int p_buffe const uint8_t *bufptr = buffer.ptr(); //use to debug - //print_line("type " + _get_type_name(type) + " component type: " + _get_component_type_name(component_type) + " stride: " + itos(stride) + " amount " + itos(count)); - print_line("accessor offset" + itos(byte_offset) + " view offset: " + itos(bv.byte_offset) + " total buffer len: " + itos(buffer.size()) + " view len " + itos(bv.byte_length)); + print_verbose("glTF: type " + _get_type_name(type) + " component type: " + _get_component_type_name(component_type) + " stride: " + itos(stride) + " amount " + itos(count)); + print_verbose("glTF: accessor offset" + itos(byte_offset) + " view offset: " + itos(bv.byte_offset) + " total buffer len: " + itos(buffer.size()) + " view len " + itos(bv.byte_length)); int buffer_end = (stride * (count - 1)) + element_size; ERR_FAIL_COND_V(buffer_end > bv.byte_length, ERR_PARSE_ERROR); @@ -853,7 +853,7 @@ Error EditorSceneImporterGLTF::_parse_meshes(GLTFState &state) { Array meshes = state.json["meshes"]; for (int i = 0; i < meshes.size(); i++) { - print_line("on mesh: " + itos(i)); + print_verbose("glTF: Parsing mesh: " + itos(i)); Dictionary d = meshes[i]; GLTFMesh mesh; @@ -935,7 +935,7 @@ Error EditorSceneImporterGLTF::_parse_meshes(GLTFState &state) { w[j + 3] /= total; } - //print_line(itos(j / 4) + ": " + itos(r[j + 0]) + ":" + rtos(w[j + 0]) + ", " + itos(r[j + 1]) + ":" + rtos(w[j + 1]) + ", " + itos(r[j + 2]) + ":" + rtos(w[j + 2]) + ", " + itos(r[j + 3]) + ":" + rtos(w[j + 3])); + //print_verbose(itos(j / 4) + ": " + itos(r[j + 0]) + ":" + rtos(w[j + 0]) + ", " + itos(r[j + 1]) + ":" + rtos(w[j + 1]) + ", " + itos(r[j + 2]) + ":" + rtos(w[j + 2]) + ", " + itos(r[j + 3]) + ":" + rtos(w[j + 3])); } } array[Mesh::ARRAY_WEIGHTS] = weights; @@ -996,7 +996,7 @@ Error EditorSceneImporterGLTF::_parse_meshes(GLTFState &state) { Array morphs; //blend shapes if (p.has("targets")) { - print_line("has targets!"); + print_verbose("glTF: Mesh has targets"); Array targets = p["targets"]; if (j == 0) { @@ -1091,7 +1091,7 @@ Error EditorSceneImporterGLTF::_parse_meshes(GLTFState &state) { state.meshes.push_back(mesh); } - print_line("total meshes: " + itos(state.meshes.size())); + print_verbose("glTF: Total meshes: " + itos(state.meshes.size())); return OK; } @@ -1183,7 +1183,7 @@ Error EditorSceneImporterGLTF::_parse_images(GLTFState &state, const String &p_b ERR_FAIL_V(ERR_FILE_CORRUPT); } - print_line("total images: " + itos(state.images.size())); + print_verbose("Total images: " + itos(state.images.size())); return OK; } @@ -1338,7 +1338,7 @@ Error EditorSceneImporterGLTF::_parse_materials(GLTFState &state) { state.materials.push_back(material); } - print_line("total materials: " + itos(state.materials.size())); + print_verbose("Total materials: " + itos(state.materials.size())); return OK; } @@ -1381,12 +1381,11 @@ Error EditorSceneImporterGLTF::_parse_skins(GLTFState &state) { skin.bones.push_back(bone); } - print_line("skin has skeleton? " + itos(d.has("skeleton"))); + print_verbose("glTF: Skin has skeleton? " + itos(d.has("skeleton"))); if (d.has("skeleton")) { int skeleton = d["skeleton"]; ERR_FAIL_INDEX_V(skeleton, state.nodes.size(), ERR_PARSE_ERROR); - //state.nodes[skeleton]->skeleton_skin = state.skins.size(); - print_line("setting skeleton skin to" + itos(skeleton)); + print_verbose("glTF: Setting skeleton skin to" + itos(skeleton)); skin.skeleton = skeleton; if (!state.skeleton_nodes.has(skeleton)) { state.skeleton_nodes[skeleton] = Vector<int>(); @@ -1443,7 +1442,7 @@ Error EditorSceneImporterGLTF::_parse_skins(GLTFState &state) { */ state.skins.push_back(skin); } - print_line("total skins: " + itos(state.skins.size())); + print_verbose("glTF: Total skins: " + itos(state.skins.size())); //now @@ -1496,7 +1495,7 @@ Error EditorSceneImporterGLTF::_parse_cameras(GLTFState &state) { state.cameras.push_back(camera); } - print_line("total cameras: " + itos(state.cameras.size())); + print_verbose("glTF: Total cameras: " + itos(state.cameras.size())); return OK; } @@ -1574,7 +1573,6 @@ Error EditorSceneImporterGLTF::_parse_animations(GLTFState &state) { } } - print_line("path: " + path); PoolVector<float> times = _decode_accessor_as_floats(state, input, false); if (path == "translation") { PoolVector<Vector3> translations = _decode_accessor_as_vec3(state, output, false); @@ -1624,7 +1622,7 @@ Error EditorSceneImporterGLTF::_parse_animations(GLTFState &state) { state.animations.push_back(animation); } - print_line("total animations: " + itos(state.animations.size())); + print_verbose("glTF: Total animations: " + itos(state.animations.size())); return OK; } @@ -1656,7 +1654,7 @@ void EditorSceneImporterGLTF::_generate_node(GLTFState &state, int p_node, Node if (n->mesh >= 0) { ERR_FAIL_INDEX(n->mesh, state.meshes.size()); MeshInstance *mi = memnew(MeshInstance); - print_line("**creating mesh for: " + n->name); + print_verbose("glTF: Creating mesh for: " + n->name); GLTFMesh &mesh = state.meshes.write[n->mesh]; mi->set_mesh(mesh.mesh); if (mesh.mesh->get_name() == "") { diff --git a/editor/import/resource_importer_obj.cpp b/editor/import/resource_importer_obj.cpp index 5babf6419c..3f101cd04d 100644 --- a/editor/import/resource_importer_obj.cpp +++ b/editor/import/resource_importer_obj.cpp @@ -63,7 +63,7 @@ static Error _parse_material_library(const String &p_path, Map<String, Ref<Spati material_map[current_name] = current; } else if (l.begins_with("Ka ")) { //uv - print_line("Warning: Ambient light for material '" + current_name + "' is ignored in PBR"); + WARN_PRINTS("OBJ: Ambient light for material '" + current_name + "' is ignored in PBR"); } else if (l.begins_with("Kd ")) { //normal @@ -119,7 +119,7 @@ static Error _parse_material_library(const String &p_path, Map<String, Ref<Spati } else if (l.begins_with("map_Ka ")) { //uv - print_line("Warning: Ambient light texture for material '" + current_name + "' is ignored in PBR"); + WARN_PRINTS("OBJ: Ambient light texture for material '" + current_name + "' is ignored in PBR"); } else if (l.begins_with("map_Kd ")) { //normal @@ -335,8 +335,8 @@ static Error _parse_obj(const String &p_path, List<Ref<Mesh> > &r_meshes, bool p surf_tool->index(); - print_line("current material library " + current_material_library + " has " + itos(material_map.has(current_material_library))); - print_line("current material " + current_material + " has " + itos(material_map.has(current_material_library) && material_map[current_material_library].has(current_material))); + print_verbose("OBJ: Current material library " + current_material_library + " has " + itos(material_map.has(current_material_library))); + print_verbose("OBJ: Current material " + current_material + " has " + itos(material_map.has(current_material_library) && material_map[current_material_library].has(current_material))); if (material_map.has(current_material_library) && material_map[current_material_library].has(current_material)) { surf_tool->set_material(material_map[current_material_library][current_material]); @@ -350,7 +350,7 @@ static Error _parse_obj(const String &p_path, List<Ref<Mesh> > &r_meshes, bool p mesh->surface_set_name(mesh->get_surface_count() - 1, current_group); } - print_line("Added surface :" + mesh->surface_get_name(mesh->get_surface_count() - 1)); + print_verbose("OBJ: Added surface :" + mesh->surface_get_name(mesh->get_surface_count() - 1)); surf_tool->clear(); surf_tool->begin(Mesh::PRIMITIVE_TRIANGLES); } diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index b5e3466b12..f544811eb0 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -281,12 +281,11 @@ static String _fixstr(const String &p_what, const String &p_str) { Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<ArrayMesh>, Ref<Shape> > &collision_map, LightBakeMode p_light_bake_mode) { - // children first.. + // children first for (int i = 0; i < p_node->get_child_count(); i++) { Node *r = _fix_node(p_node->get_child(i), p_root, collision_map, p_light_bake_mode); if (!r) { - print_line("was erased..."); i--; //was erased } } @@ -391,7 +390,6 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Array colshape->set_owner(p_node->get_owner()); } else if (p_node->has_meta("empty_draw_type")) { String empty_draw_type = String(p_node->get_meta("empty_draw_type")); - print_line(empty_draw_type); StaticBody *sb = memnew(StaticBody); sb->set_name(_fixstr(name, "colonly")); Object::cast_to<Spatial>(sb)->set_transform(Object::cast_to<Spatial>(p_node)->get_transform()); @@ -723,15 +721,11 @@ void ResourceImporterScene::_filter_anim_tracks(Ref<Animation> anim, Set<String> Ref<Animation> a = anim; ERR_FAIL_COND(!a.is_valid()); - print_line("From Anim " + anim->get_name() + ":"); - for (int j = 0; j < a->get_track_count(); j++) { String path = a->track_get_path(j); if (!keep.has(path)) { - - print_line("Remove: " + path); a->remove_track(j); j--; } @@ -899,8 +893,6 @@ void ResourceImporterScene::_find_meshes(Node *p_node, Map<Ref<ArrayMesh>, Trans } meshes[mesh] = transform; - - print_line("mesh transform: " + meshes[mesh]); } } for (int i = 0; i < p_node->get_child_count(); i++) { @@ -913,8 +905,6 @@ void ResourceImporterScene::_make_external_resources(Node *p_node, const String List<PropertyInfo> pi; - print_line("node: " + String(p_node->get_name())); - if (p_make_animations) { if (Object::cast_to<AnimationPlayer>(p_node)) { AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(p_node); @@ -1316,7 +1306,6 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p if (bool(p_options["external_files/store_in_subdir"])) { String subdir_name = p_source_file.get_file().get_basename(); DirAccess *da = DirAccess::open(base_path); - print_line("at path " + da->get_current_dir() + " making " + subdir_name); Error err = da->make_dir(subdir_name); memdelete(da); ERR_FAIL_COND_V(err != OK && err != ERR_ALREADY_EXISTS, err); @@ -1421,7 +1410,7 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p Ref<PackedScene> packer = memnew(PackedScene); packer->pack(scene); - print_line("SAVING TO: " + p_save_path + ".scn"); + print_verbose("Saving scene to: " + p_save_path + ".scn"); err = ResourceSaver::save(p_save_path + ".scn", packer); //do not take over, let the changed files reload themselves ERR_FAIL_COND_V(err != OK, err); diff --git a/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp index 9e99dcc5c8..d04f29ea5e 100644 --- a/editor/import/resource_importer_wav.cpp +++ b/editor/import/resource_importer_wav.cpp @@ -205,7 +205,7 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s /*print_line("chunksize: "+itos(chunksize)); print_line("channels: "+itos(format_channels)); print_line("bits: "+itos(format_bits)); -*/ + */ int len = frames; if (format_channels == 2) @@ -293,6 +293,7 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s bool is16 = format_bits != 8; int rate = format_freq; + /* print_line("Input Sample: "); print_line("\tframes: " + itos(frames)); print_line("\tformat_channels: " + itos(format_channels)); @@ -301,18 +302,16 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s print_line("\tloop: " + itos(loop)); print_line("\tloop begin: " + itos(loop_begin)); print_line("\tloop end: " + itos(loop_end)); + */ //apply frequency limit bool limit_rate = p_options["force/max_rate"]; int limit_rate_hz = p_options["force/max_rate_hz"]; if (limit_rate && rate > limit_rate_hz && rate > 0 && frames > 0) { - //resampleeee!!! + // resample! int new_data_frames = (int)(frames * (float)limit_rate_hz / (float)rate); - print_line("\tresampling ratio: " + rtos((float)limit_rate_hz / (float)rate)); - print_line("\tnew frames: " + itos(new_data_frames)); - Vector<float> new_data; new_data.resize(new_data_frames * format_channels); for (int c = 0; c < format_channels; c++) { @@ -492,8 +491,6 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s } } - //print_line("compressing ima-adpcm, resulting buffersize is "+itos(dst_data.size())+" from "+itos(data.size())); - } else { dst_format = is16 ? AudioStreamSample::FORMAT_16_BITS : AudioStreamSample::FORMAT_8_BITS; diff --git a/editor/plugin_config_dialog.cpp b/editor/plugin_config_dialog.cpp index 418936ac9f..93bed035a5 100644 --- a/editor/plugin_config_dialog.cpp +++ b/editor/plugin_config_dialog.cpp @@ -112,7 +112,6 @@ void PluginConfigDialog::_notification(int p_what) { void PluginConfigDialog::config(const String &p_config_path) { if (p_config_path.length()) { Ref<ConfigFile> cf = memnew(ConfigFile); - print_line(p_config_path); cf->load(p_config_path); name_edit->set_text(cf->get_value("plugin", "name", "")); diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp index e5476aaf08..2d240b5a5c 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/plugins/animation_blend_space_2d_editor.cpp @@ -349,7 +349,6 @@ void AnimationNodeBlendSpace2DEditor::_tool_switch(int p_tool) { points.push_back(blend_space->get_blend_point_position(i)); } Vector<Delaunay2D::Triangle> tr = Delaunay2D::triangulate(points); - print_line("triangleS: " + itos(tr.size())); for (int i = 0; i < tr.size(); i++) { blend_space->add_triangle(tr[i].points[0], tr[i].points[1], tr[i].points[2]); } diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index 9530fae8e4..dbb5fa578b 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -38,7 +38,6 @@ void AnimationNodeBlendTreeEditor::remove_custom_type(const Ref<Script> &p_scrip void AnimationNodeBlendTreeEditor::_update_options_menu() { - print_line("update options"); add_node->get_popup()->clear(); for (int i = 0; i < add_options.size(); i++) { add_node->get_popup()->add_item(add_options[i].name, i); diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp index ea8f921034..7b7e23531a 100644 --- a/editor/plugins/mesh_editor_plugin.cpp +++ b/editor/plugins/mesh_editor_plugin.cpp @@ -97,13 +97,11 @@ void MeshEditor::edit(Ref<Mesh> p_mesh) { _update_rotation(); AABB aabb = mesh->get_aabb(); - print_line("aabb: " + aabb); Vector3 ofs = aabb.position + aabb.size * 0.5; float m = aabb.get_longest_axis_size(); if (m != 0) { m = 1.0 / m; m *= 0.5; - //print_line("scale: "+rtos(m)); Transform xform; xform.basis.scale(Vector3(m, m, m)); xform.origin = -xform.basis.xform(ofs); //-ofs*m; diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/plugins/mesh_library_editor_plugin.cpp index 99a28be555..c24c96bdc5 100644 --- a/editor/plugins/mesh_library_editor_plugin.cpp +++ b/editor/plugins/mesh_library_editor_plugin.cpp @@ -169,8 +169,6 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library, void MeshLibraryEditor::_import_scene_cbk(const String &p_str) { - print_line("Impot Callback!"); - Ref<PackedScene> ps = ResourceLoader::load(p_str, "PackedScene"); ERR_FAIL_COND(ps.is_null()); Node *scene = ps->instance(); diff --git a/editor/plugins/particles_2d_editor_plugin.cpp b/editor/plugins/particles_2d_editor_plugin.cpp index b50e0dfe88..75c0127406 100644 --- a/editor/plugins/particles_2d_editor_plugin.cpp +++ b/editor/plugins/particles_2d_editor_plugin.cpp @@ -58,8 +58,6 @@ void Particles2DEditorPlugin::make_visible(bool p_visible) { void Particles2DEditorPlugin::_file_selected(const String &p_file) { - print_line("file: " + p_file); - source_emission_file = p_file; emission_mask->popup_centered_minsize(); } diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index 4840b1899d..a437cd5362 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -36,6 +36,7 @@ #include "os/input.h" #include "os/keyboard.h" #include "scene/2d/skeleton_2d.h" + Node2D *Polygon2DEditor::_get_node() const { return node; @@ -82,7 +83,6 @@ void Polygon2DEditor::_notification(int p_what) { void Polygon2DEditor::_sync_bones() { - print_line("syncinc"); if (!node->has_node(node->get_skeleton())) { error->set_text(TTR("The skeleton property of the Polygon2D does not point to a Skeleton2D node")); error->popup_centered_minsize(); @@ -101,8 +101,6 @@ void Polygon2DEditor::_sync_bones() { Array prev_bones = node->call("_get_bones"); node->clear_bones(); - print_line("bones in skeleton: " + itos(skeleton->get_bone_count())); - for (int i = 0; i < skeleton->get_bone_count(); i++) { NodePath path = skeleton->get_path_to(skeleton->get_bone(i)); PoolVector<float> weights; diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp index 89c1b3a978..af3c09afc5 100644 --- a/editor/plugins/root_motion_editor_plugin.cpp +++ b/editor/plugins/root_motion_editor_plugin.cpp @@ -276,7 +276,6 @@ void EditorInspectorRootMotionPlugin::parse_begin(Object *p_object) { bool EditorInspectorRootMotionPlugin::parse_property(Object *p_object, Variant::Type p_type, const String &p_path, PropertyHint p_hint, const String &p_hint_text, int p_usage) { if (p_path == "root_motion_track" && p_object->is_class("AnimationTree") && p_type == Variant::NODE_PATH) { - print_line("use custom!"); EditorPropertyRootMotion *editor = memnew(EditorPropertyRootMotion); if (p_hint == PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE && p_hint_text != String()) { editor->setup(p_hint_text); diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 522ce52234..4e7047ee38 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -60,7 +60,6 @@ void ScriptTextEditor::apply_code() { if (script.is_null()) return; - //print_line("applying code"); script->set_source_code(code_editor->get_text_edit()->get_text()); script->update_exports(); _update_member_keywords(); diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index ea1876c27a..7d6fa38a89 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -167,7 +167,6 @@ void ShaderTextEditor::_check_shader_mode() { String type = ShaderLanguage::get_shader_type(get_text_edit()->get_text()); - print_line("type is: " + type); Shader::Mode mode; if (type == "canvas_item") { diff --git a/editor/plugins/sprite_editor_plugin.cpp b/editor/plugins/sprite_editor_plugin.cpp index 9bf1178b58..58a1835e68 100644 --- a/editor/plugins/sprite_editor_plugin.cpp +++ b/editor/plugins/sprite_editor_plugin.cpp @@ -160,7 +160,6 @@ void SpriteEditor::_update_mesh_data() { Vector<Vector<Vector2> > lines = bm->clip_opaque_to_polygons(rect, epsilon); - print_line("lines: " + itos(lines.size())); uv_lines.clear(); computed_vertices.clear(); @@ -190,21 +189,6 @@ void SpriteEditor::_update_mesh_data() { computed_vertices.push_back(vtx); } -#if 0 - Vector<Vector<Vector2> > polys = Geometry::decompose_polygon(lines[j]); - print_line("polygon: " + itos(polys.size())); - - for (int i = 0; i < polys.size(); i++) { - for (int k = 0; k < polys[i].size(); k++) { - - int idxn = (k + 1) % polys[i].size(); - uv_lines.push_back(polys[i][k]); - uv_lines.push_back(polys[i][idxn]); - } - } -#endif - -#if 1 Vector<int> poly = Geometry::triangulate_polygon(lines[j]); @@ -218,14 +202,6 @@ void SpriteEditor::_update_mesh_data() { computed_indices.push_back(poly[idx] + index_ofs); } } -#endif - -#if 0 - for (int i = 0; i < lines[j].size() - 1; i++) { - uv_lines.push_back(lines[j][i]); - uv_lines.push_back(lines[j][i + 1]); - } -#endif } debug_uv->update(); diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index a9afc7a670..fcbbee2b9c 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -89,7 +89,6 @@ void SpriteFramesEditor::_file_load_request(const PoolVector<String> &p_path, in } if (resources.empty()) { - //print_line("added frames!"); return; } @@ -108,7 +107,6 @@ void SpriteFramesEditor::_file_load_request(const PoolVector<String> &p_path, in undo_redo->add_undo_method(this, "_update_library"); undo_redo->commit_action(); - //print_line("added frames!"); } void SpriteFramesEditor::_load_pressed() { diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index aad9258ed9..3a6a73d3cc 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -1390,7 +1390,7 @@ void ProjectManager::_open_project_confirm() { return; } - print_line("OPENING: " + path + " (" + selected + ")"); + print_line("Editing project: " + path + " (" + selected + ")"); List<String> args; @@ -1447,7 +1447,7 @@ void ProjectManager::_run_project_confirm() { return; } - print_line("OPENING: " + path + " (" + selected + ")"); + print_line("Running project: " + path + " (" + selected + ")"); List<String> args; @@ -1513,13 +1513,13 @@ void ProjectManager::_scan_dir(DirAccess *da, float pos, float total, List<Strin void ProjectManager::_scan_begin(const String &p_base) { - print_line("SCAN PROJECTS AT: " + p_base); + print_line("Scanning projects at: " + p_base); List<String> projects; DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); da->change_dir(p_base); _scan_dir(da, 0, 1, &projects); memdelete(da); - print_line("found: " + itos(projects.size()) + " projects."); + print_line("Found " + itos(projects.size()) + " projects."); for (List<String>::Element *E = projects.front(); E; E = E->next()) { String proj = E->get().replace("/", "::"); diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 65b2e2301b..a7c336eb16 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -891,7 +891,6 @@ void ProjectSettingsEditor::_item_del() { return; } - print_line("to delete.. " + property); undo_redo->create_action(TTR("Delete Item")); Variant value = ProjectSettings::get_singleton()->get(property); diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 408e67149a..d9812f7425 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -3992,7 +3992,6 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) { String prop = d["name"]; emit_signal("property_keyed", prop, obj->get(prop), false); } else if (p_button == 5) { - print_line("PB5"); if (!d.has("name")) return; String prop = d["name"]; @@ -4732,7 +4731,7 @@ double PropertyValueEvaluator::eval(const String &p_text) { script->set_source_code(_build_script(p_new_text)); Error err = script->reload(); if (err) { - print_line("[PropertyValueEvaluator] Error loading script for expression: " + p_new_text); + ERR_PRINTS("PropertyValueEvaluator: Error loading script for expression: " + p_new_text); return _default_eval(p_new_text); } @@ -4748,7 +4747,7 @@ double PropertyValueEvaluator::eval(const String &p_text) { if (call_err.error == Variant::CallError::CALL_OK) { return result; } - print_line("[PropertyValueEvaluator]: Error eval! Error code: " + itos(call_err.error)); + ERR_PRINTS("PropertyValueEvaluator: Eval failed, error code: " + itos(call_err.error)); return _default_eval(p_new_text); } diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index d927e07976..dae1bdeeb0 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -237,7 +237,6 @@ void PropertySelector::_update_search() { Ref<Texture> icon; script_methods = false; - print_line("name: " + E->get().name); String rep = E->get().name.replace("*", ""); if (E->get().name == "*Script Methods") { icon = get_icon("Script", "EditorIcons"); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 607d974025..39250ab391 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1512,7 +1512,6 @@ void SceneTreeDock::_script_created(Ref<Script> p_script) { } editor_data->get_undo_redo().commit_action(); - print_line("test: " + String(Variant(selected.front()->get()->get_meta("_editor_icon")))); editor->push_item(p_script.operator->()); } diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index 47db656017..a916ae23f6 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -968,7 +968,6 @@ void SceneTreeEditor::_warning_changed(Node *p_for_node) { //should use a timer update_timer->start(); - //print_line("WARNING CHANGED "+String(p_for_node->get_name())); } void SceneTreeEditor::_editor_settings_changed() { diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index 746e1cd28f..9db53fe5f5 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -1133,7 +1133,6 @@ void ScriptEditorDebugger::_notification(int p_what) { } message_type = cmd; - //print_line("GOT: "+message_type); ret = ppeer->get_var(cmd); if (ret != OK) { @@ -1285,15 +1284,13 @@ void ScriptEditorDebugger::_profiler_activate(bool p_enable) { max_funcs = CLAMP(max_funcs, 16, 512); msg.push_back(max_funcs); ppeer->put_var(msg); - - print_line("BEGIN PROFILING!"); + print_verbose("Starting profiling."); } else { Array msg; msg.push_back("stop_profiling"); ppeer->put_var(msg); - - print_line("END PROFILING!"); + print_verbose("Ending profiling."); } } @@ -1430,8 +1427,6 @@ void ScriptEditorDebugger::_method_changed(Object *p_base, const StringName &p_n return; } - - //print_line("method"); } void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p_property, const Variant &p_value) { @@ -1500,8 +1495,6 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p return; } - - //print_line("prop"); } void ScriptEditorDebugger::_method_changeds(void *p_ud, Object *p_base, const StringName &p_name, VARIANT_ARG_DECLARE) { |