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

Merge pull request #46392 from YeldhamDev/here_comes_another_rc

Browse Source 
Backport the Import Defaults Editor
This commit is contained in:
Rémi Verschelde 2021-02-25 15:45:34 +01:00 committed by GitHub
commit dadba2b391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 310 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/resource_importer.cpp
View File

@ -375,6 +375,12 @@ void ResourceFormatImporter::get_importers_for_extension(const String &p_extensi
}
}
void ResourceFormatImporter::get_importers(List<Ref<ResourceImporter> > *r_importers) {
for (int i = 0; i < importers.size(); i++) {
r_importers->push_back(importers[i]);
}
}
Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_extension(const String &p_extension) const {
Ref<ResourceImporter> importer;

1
core/io/resource_importer.h
View File

@ -84,6 +84,7 @@ public:
Ref<ResourceImporter> get_importer_by_name(const String &p_name) const;
Ref<ResourceImporter> get_importer_by_extension(const String &p_extension) const;
void get_importers_for_extension(const String &p_extension, List<Ref<ResourceImporter> > *r_importers);
void get_importers(List<Ref<ResourceImporter> > *r_importers);
bool are_import_settings_valid(const String &p_path) const;
String get_import_settings_hash() const;

222
editor/import_defaults_editor.cpp Normal file
View File

@ -0,0 +1,222 @@
/*************************************************************************/
/* import_defaults_editor.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "import_defaults_editor.h"
class ImportDefaultsEditorSettings : public Object {
GDCLASS(ImportDefaultsEditorSettings, Object)
friend class ImportDefaultsEditor;
List<PropertyInfo> properties;
Map<StringName, Variant> values;
Map<StringName, Variant> default_values;
Ref<ResourceImporter> importer;
protected:
bool _set(const StringName &p_name, const Variant &p_value) {
if (values.has(p_name)) {
values[p_name] = p_value;
return true;
} else {
return false;
}
}
bool _get(const StringName &p_name, Variant &r_ret) const {
if (values.has(p_name)) {
r_ret = values[p_name];
return true;
} else {
r_ret = Variant();
return false;
}
}
void _get_property_list(List<PropertyInfo> *p_list) const {
if (importer.is_null()) {
return;
}
for (const List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
if (importer->get_option_visibility(E->get().name, values)) {
p_list->push_back(E->get());
}
}
}
};
void ImportDefaultsEditor::_notification(int p_what) {
if (p_what == NOTIFICATION_PREDELETE) {
if (inspector) {
inspector->edit(nullptr);
}
}
}
void ImportDefaultsEditor::_reset() {
if (settings->importer.is_valid()) {
settings->values = settings->default_values;
settings->_change_notify();
}
}
void ImportDefaultsEditor::_save() {
if (settings->importer.is_valid()) {
Dictionary modified;
for (Map<StringName, Variant>::Element *E = settings->values.front(); E; E = E->next()) {
if (E->get() != settings->default_values[E->key()]) {
modified[E->key()] = E->get();
}
}
if (modified.size()) {
ProjectSettings::get_singleton()->set("importer_defaults/" + settings->importer->get_importer_name(), modified);
} else {
ProjectSettings::get_singleton()->set("importer_defaults/" + settings->importer->get_importer_name(), Variant());
}
emit_signal("project_settings_changed");
}
}
void ImportDefaultsEditor::_update_importer() {
List<Ref<ResourceImporter> > importer_list;
ResourceFormatImporter::get_singleton()->get_importers(&importer_list);
Ref<ResourceImporter> importer;
for (List<Ref<ResourceImporter> >::Element *E = importer_list.front(); E; E = E->next()) {
if (E->get()->get_visible_name() == importers->get_item_text(importers->get_selected())) {
importer = E->get();
break;
}
}
settings->properties.clear();
settings->values.clear();
settings->importer = importer;
if (importer.is_valid()) {
List<ResourceImporter::ImportOption> options;
importer->get_import_options(&options);
Dictionary d;
if (ProjectSettings::get_singleton()->has_setting("importer_defaults/" + importer->get_importer_name())) {
d = ProjectSettings::get_singleton()->get("importer_defaults/" + importer->get_importer_name());
}
for (List<ResourceImporter::ImportOption>::Element *E = options.front(); E; E = E->next()) {
settings->properties.push_back(E->get().option);
if (d.has(E->get().option.name)) {
settings->values[E->get().option.name] = d[E->get().option.name];
} else {
settings->values[E->get().option.name] = E->get().default_value;
}
settings->default_values[E->get().option.name] = E->get().default_value;
}
save_defaults->set_disabled(false);
reset_defaults->set_disabled(false);
} else {
save_defaults->set_disabled(true);
reset_defaults->set_disabled(true);
}
settings->_change_notify();
inspector->edit(settings);
}
void ImportDefaultsEditor::_importer_selected(int p_index) {
_update_importer();
}
void ImportDefaultsEditor::clear() {
String last_selected;
if (importers->get_selected() > 0) {
last_selected = importers->get_item_text(importers->get_selected());
}
importers->clear();
importers->add_item("<" + TTR("Select Importer") + ">");
importers->set_item_disabled(0, true);
List<Ref<ResourceImporter> > importer_list;
ResourceFormatImporter::get_singleton()->get_importers(&importer_list);
Vector<String> names;
for (List<Ref<ResourceImporter> >::Element *E = importer_list.front(); E; E = E->next()) {
String vn = E->get()->get_visible_name();
names.push_back(vn);
}
names.sort();
for (int i = 0; i < names.size(); i++) {
importers->add_item(names[i]);
if (names[i] == last_selected) {
importers->select(i + 1);
}
}
}
void ImportDefaultsEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_reset"), &ImportDefaultsEditor::_reset);
ClassDB::bind_method(D_METHOD("_save"), &ImportDefaultsEditor::_save);
ClassDB::bind_method(D_METHOD("_importer_selected"), &ImportDefaultsEditor::_importer_selected);
ADD_SIGNAL(MethodInfo("project_settings_changed"));
}
ImportDefaultsEditor::ImportDefaultsEditor() {
HBoxContainer *hb = memnew(HBoxContainer);
hb->add_child(memnew(Label(TTR("Importer:"))));
importers = memnew(OptionButton);
hb->add_child(importers);
hb->add_spacer();
importers->connect("item_selected", this, "_importer_selected");
reset_defaults = memnew(Button);
reset_defaults->set_text(TTR("Reset to Defaults"));
reset_defaults->set_disabled(true);
reset_defaults->connect("pressed", this, "_reset");
hb->add_child(reset_defaults);
add_child(hb);
inspector = memnew(EditorInspector);
add_child(inspector);
inspector->set_v_size_flags(SIZE_EXPAND_FILL);
CenterContainer *cc = memnew(CenterContainer);
save_defaults = memnew(Button);
save_defaults->set_text(TTR("Save"));
save_defaults->connect("pressed", this, "_save");
cc->add_child(save_defaults);
add_child(cc);
settings = memnew(ImportDefaultsEditorSettings);
}
ImportDefaultsEditor::~ImportDefaultsEditor() {
memdelete(settings);
}

72
editor/import_defaults_editor.h Normal file
View File

@ -0,0 +1,72 @@
/*************************************************************************/
/* import_defaults_editor.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef IMPORT_DEFAULTS_EDITOR_H
#define IMPORT_DEFAULTS_EDITOR_H
#include "core/undo_redo.h"
#include "editor/editor_data.h"
#include "editor/editor_plugin_settings.h"
#include "editor/editor_sectioned_inspector.h"
#include "editor_autoload_settings.h"
#include "scene/gui/center_container.h"
#include "scene/gui/option_button.h"
class ImportDefaultsEditorSettings;
class ImportDefaultsEditor : public VBoxContainer {
GDCLASS(ImportDefaultsEditor, VBoxContainer)
OptionButton *importers;
Button *save_defaults;
Button *reset_defaults;
EditorInspector *inspector;
ImportDefaultsEditorSettings *settings;
void _update_importer();
void _importer_selected(int p_index);
void _reset();
void _save();
protected:
void _notification(int p_what);
static void _bind_methods();
public:
void clear();
ImportDefaultsEditor();
~ImportDefaultsEditor();
};
#endif // IMPORT_DEFAULTS_EDITOR_H

6
editor/project_settings_editor.cpp
View File

@ -815,6 +815,7 @@ void ProjectSettingsEditor::popup_project_settings() {
_update_translations();
autoload_settings->update_autoload();
plugin_settings->update_plugins();
import_defaults_editor->clear();
set_process_unhandled_input(true);
}
@ -2137,6 +2138,11 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
plugin_settings->set_name(TTR("Plugins"));
tab_container->add_child(plugin_settings);
import_defaults_editor = memnew(ImportDefaultsEditor);
import_defaults_editor->set_name(TTR("Import Defaults"));
tab_container->add_child(import_defaults_editor);
import_defaults_editor->connect("project_settings_changed", this, "_settings_changed");
timer = memnew(Timer);
timer->set_wait_time(1.5);
timer->connect("timeout", ProjectSettings::get_singleton(), "save");

3
editor/project_settings_editor.h
View File

@ -36,6 +36,7 @@
#include "editor/editor_data.h"
#include "editor/editor_plugin_settings.h"
#include "editor/editor_sectioned_inspector.h"
#include "editor/import_defaults_editor.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/tab_container.h"
@ -173,6 +174,8 @@ class ProjectSettingsEditor : public AcceptDialog {
PanelContainer *restart_container;
ToolButton *restart_close_button;
ImportDefaultsEditor *import_defaults_editor;
void _editor_restart_request();
void _editor_restart();
void _editor_restart_close();