From 2f49e553f015e004320197aff9e61567ff41ebc6 Mon Sep 17 00:00:00 2001 From: Marcelo Fernandez Date: Thu, 5 Oct 2017 22:50:43 -0300 Subject: [PATCH] Godot3 Exporter now converts .fnt to .font --- editor/editor_export_godot3.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/editor/editor_export_godot3.cpp b/editor/editor_export_godot3.cpp index 12ae5591265..4fd809ed8d2 100644 --- a/editor/editor_export_godot3.cpp +++ b/editor/editor_export_godot3.cpp @@ -1275,7 +1275,7 @@ void EditorExportGodot3::_save_text(const String &p_path, ExportData &resource) for (Map::Element *E = resource.dependencies.front(); E; E = E->next()) { - f->store_line("[ext_resource path=\"" + E->get().path + "\" type=\"" + E->get().type + "\" id=" + itos(E->key()) + "]"); + f->store_line("[ext_resource path=\"" + resource_replace_map[E->get().path] + "\" type=\"" + E->get().type + "\" id=" + itos(E->key()) + "]"); } for (int i = 0; i < resource.resources.size(); i++) { @@ -1875,7 +1875,7 @@ void EditorExportGodot3::_save_binary(const String &p_path, ExportData &resource for (Map::Element *E = resource.dependencies.front(); E; E = E->next()) { save_unicode_string(E->get().type, f.operator->()); - save_unicode_string(E->get().path, f.operator->()); + save_unicode_string(resource_replace_map[E->get().path], f.operator->()); } // save internal resource table @@ -2014,6 +2014,10 @@ Error EditorExportGodot3::export_godot3(const String &p_path) { String file = E->get(); String file_local = file.replace("res://", ""); + + resource_replace_map[file] = file; + resource_replace_map[file_local] = file_local; + if (xml_extensions.has(file.extension().to_lower())) { if (ResourceLoader::get_resource_type(file) == "PackedScene") { resource_replace_map[file] = file.basename() + ".tscn"; @@ -2023,6 +2027,11 @@ Error EditorExportGodot3::export_godot3(const String &p_path) { resource_replace_map[file_local] = file_local.basename() + ".tres"; } } + + if (file.extension().to_lower() == "fnt") { + resource_replace_map[file] = file.basename() + ".font"; + resource_replace_map[file_local] = file_local.basename() + ".font"; + } } DirAccess *directory = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); @@ -2043,6 +2052,10 @@ Error EditorExportGodot3::export_godot3(const String &p_path) { target_path = p_path.plus_file(path.replace("res://", "")); + if (extension == "fnt") { + target_path = target_path.basename() + ".font"; + } + progress.step(target_path.get_file(), idx++); print_line("exporting: " + target_path);