Browse Source

Merge pull request #11869 from marcelofg55/conv_fonts

Godot3 Exporter now converts .fnt to .font

[ci skip]
Rémi Verschelde 8 years ago
parent
commit
c7f7ac3a10
1 changed files with 15 additions and 2 deletions
  1. 15 2
      editor/editor_export_godot3.cpp

+ 15 - 2
editor/editor_export_godot3.cpp

@@ -1275,7 +1275,7 @@ void EditorExportGodot3::_save_text(const String &p_path, ExportData &resource)
 
 	for (Map<int, ExportData::Dependency>::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<int, ExportData::Dependency>::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);