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

Merge pull request #59661 from timothyqiu/fbx-reg-3.x 

[3.x] Simplify FBX importer project settings registering
This commit is contained in:
Rémi Verschelde 2022-03-29 09:21:45 +02:00 committed by GitHub
parent eb837f8cb4 17ce0fcc7c
commit 2ad82982ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/editor_property_name_processor.cpp
View File

@ -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";

24
modules/fbx/editor_scene_importer_fbx.cpp
View File

@ -58,24 +58,8 @@
void EditorSceneImporterFBX::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 EditorSceneImporterFBX::_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");
}
}
@ -1462,3 +1446,7 @@ void EditorSceneImporterFBX::BuildDocumentNodes(
}
}
}
EditorSceneImporterFBX::EditorSceneImporterFBX() {
_GLOBAL_DEF("filesystem/import/fbx/use_fbx", true, true);
}

3
modules/fbx/editor_scene_importer_fbx.h
View File

@ -121,10 +121,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:
EditorSceneImporterFBX() {}
EditorSceneImporterFBX();
~EditorSceneImporterFBX() {}
virtual void get_extensions(List<String> *r_extensions) const;