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

Merge pull request #43550 from KoBeWi/resourcism

Browse Source 
Add option to exclude selected resources on export
This commit is contained in:
Rémi Verschelde 2021-04-01 00:20:54 +02:00 committed by GitHub
commit 7db85fffb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/editor_export.cpp
View File

@ -730,6 +730,12 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
if (p_preset->get_export_filter() == EditorExportPreset::EXPORT_ALL_RESOURCES) { if (p_preset->get_export_filter() == EditorExportPreset::EXPORT_ALL_RESOURCES) {
//find stuff //find stuff
_export_find_resources(EditorFileSystem::get_singleton()->get_filesystem(), paths); _export_find_resources(EditorFileSystem::get_singleton()->get_filesystem(), paths);
} else if (p_preset->get_export_filter() == EditorExportPreset::EXCLUDE_SELECTED_RESOURCES) {
_export_find_resources(EditorFileSystem::get_singleton()->get_filesystem(), paths);
Vector<String> files = p_preset->get_files_to_export();
for (int i = 0; i < files.size(); i++) {
paths.erase(files[i]);
}
} else { } else {
bool scenes_only = p_preset->get_export_filter() == EditorExportPreset::EXPORT_SELECTED_SCENES; bool scenes_only = p_preset->get_export_filter() == EditorExportPreset::EXPORT_SELECTED_SCENES;
@ -1394,6 +1400,10 @@ void EditorExport::_save() {
config->set_value(section, "export_filter", "resources"); config->set_value(section, "export_filter", "resources");
save_files = true; save_files = true;
} break; } break;
case EditorExportPreset::EXCLUDE_SELECTED_RESOURCES: {
config->set_value(section, "export_filter", "exclude");
save_files = true;
} break;
} }
if (save_files) { if (save_files) {
@ -1572,6 +1582,9 @@ void EditorExport::load_config() {
} else if (export_filter == "resources") { } else if (export_filter == "resources") {
preset->set_export_filter(EditorExportPreset::EXPORT_SELECTED_RESOURCES); preset->set_export_filter(EditorExportPreset::EXPORT_SELECTED_RESOURCES);
get_files = true; get_files = true;
} else if (export_filter == "exclude") {
preset->set_export_filter(EditorExportPreset::EXCLUDE_SELECTED_RESOURCES);
get_files = true;
} }
if (get_files) { if (get_files) {

1
editor/editor_export.h
View File

@ -50,6 +50,7 @@ public:
EXPORT_ALL_RESOURCES, EXPORT_ALL_RESOURCES,
EXPORT_SELECTED_SCENES, EXPORT_SELECTED_SCENES,
EXPORT_SELECTED_RESOURCES, EXPORT_SELECTED_RESOURCES,
EXCLUDE_SELECTED_RESOURCES,
}; };
enum ScriptExportMode { enum ScriptExportMode {

1
editor/project_export.cpp
View File

@ -1082,6 +1082,7 @@ ProjectExportDialog::ProjectExportDialog() {
export_filter->add_item(TTR("Export all resources in the project")); export_filter->add_item(TTR("Export all resources in the project"));
export_filter->add_item(TTR("Export selected scenes (and dependencies)")); export_filter->add_item(TTR("Export selected scenes (and dependencies)"));
export_filter->add_item(TTR("Export selected resources (and dependencies)")); export_filter->add_item(TTR("Export selected resources (and dependencies)"));
export_filter->add_item(TTR("Export all resources in the project except resources checked below"));
resources_vb->add_margin_child(TTR("Export Mode:"), export_filter); resources_vb->add_margin_child(TTR("Export Mode:"), export_filter);
export_filter->connect("item_selected", callable_mp(this, &ProjectExportDialog::_export_type_changed)); export_filter->connect("item_selected", callable_mp(this, &ProjectExportDialog::_export_type_changed));