summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaoyu Qiu <timothyqiu32@gmail.com>2022-03-29 15:00:43 +0800
committerHaoyu Qiu <timothyqiu32@gmail.com>2022-03-29 15:00:43 +0800
commitc17d9f05f822b344b9b48be21b2091a955ad2e06 (patch)
tree361d22e0574234484ef82903e410af629f395fe9
parent29a946ee91b7a0ebfee35504436d177630c0924f (diff)
Simplify FBX importer project settings registering
-rw-r--r--editor/editor_property_name_processor.cpp1
-rw-r--r--modules/fbx/editor_scene_importer_fbx.cpp24
-rw-r--r--modules/fbx/editor_scene_importer_fbx.h3
3 files changed, 8 insertions, 20 deletions
diff --git a/editor/editor_property_name_processor.cpp b/editor/editor_property_name_processor.cpp
index d89247b429..af4ae3e576 100644
--- a/editor/editor_property_name_processor.cpp
+++ b/editor/editor_property_name_processor.cpp
@@ -125,6 +125,7 @@ EditorPropertyNameProcessor::EditorPropertyNameProcessor() {
capitalize_string_remaps["dtls"] = "DTLS";
capitalize_string_remaps["etc"] = "ETC";
capitalize_string_remaps["etc2"] = "ETC2";
+ capitalize_string_remaps["fbx"] = "FBX";
capitalize_string_remaps["fft"] = "FFT";
capitalize_string_remaps["fov"] = "FOV";
capitalize_string_remaps["fps"] = "FPS";
diff --git a/modules/fbx/editor_scene_importer_fbx.cpp b/modules/fbx/editor_scene_importer_fbx.cpp
index ca10594a42..afaeb15708 100644
--- a/modules/fbx/editor_scene_importer_fbx.cpp
+++ b/modules/fbx/editor_scene_importer_fbx.cpp
@@ -58,24 +58,8 @@
void EditorSceneFormatImporterFBX::get_extensions(List<String> *r_extensions) const {
// register FBX as the one and only format for FBX importing
- const String import_setting_string = "filesystem/import/fbx/";
- const String fbx_str = "fbx";
- Vector<String> exts;
- exts.push_back(fbx_str);
- _register_project_setting_import(fbx_str, import_setting_string, exts, r_extensions, true);
-}
-
-void EditorSceneFormatImporterFBX::_register_project_setting_import(const String generic,
- const String import_setting_string,
- const Vector<String> &exts,
- List<String> *r_extensions,
- const bool p_enabled) const {
- const String use_generic = "use_" + generic;
- _GLOBAL_DEF(import_setting_string + use_generic, p_enabled, true);
- if (ProjectSettings::get_singleton()->get(import_setting_string + use_generic)) {
- for (int32_t i = 0; i < exts.size(); i++) {
- r_extensions->push_back(exts[i]);
- }
+ if (GLOBAL_GET("filesystem/import/fbx/use_fbx")) {
+ r_extensions->push_back("fbx");
}
}
@@ -1473,3 +1457,7 @@ Ref<Animation> EditorSceneFormatImporterFBX::import_animation(const String &p_pa
int p_bake_fps) {
return Ref<Animation>();
}
+
+EditorSceneFormatImporterFBX::EditorSceneFormatImporterFBX() {
+ _GLOBAL_DEF("filesystem/import/fbx/use_fbx", true, true);
+}
diff --git a/modules/fbx/editor_scene_importer_fbx.h b/modules/fbx/editor_scene_importer_fbx.h
index eebcb86409..fb72f93feb 100644
--- a/modules/fbx/editor_scene_importer_fbx.h
+++ b/modules/fbx/editor_scene_importer_fbx.h
@@ -119,10 +119,9 @@ private:
template <class T>
T _interpolate_track(const Vector<float> &p_times, const Vector<T> &p_values, float p_time, AssetImportAnimation::Interpolation p_interp);
- void _register_project_setting_import(const String generic, const String import_setting_string, const Vector<String> &exts, List<String> *r_extensions, const bool p_enabled) const;
public:
- EditorSceneFormatImporterFBX() {}
+ EditorSceneFormatImporterFBX();
~EditorSceneFormatImporterFBX() {}
virtual void get_extensions(List<String> *r_extensions) const override;