godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63265 from reduz/stream-bpm-support

Browse Source 
Implement BPM support in AudioStream files.
This commit is contained in:
Rémi Verschelde
2022-07-23 11:21:14 +02:00
committed by GitHub
parent 01c866a599 d1ddee2258
commit a5bc65bbad
41 changed files with 1548 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
editor/filesystem_dock.cpp
View File

@@ -985,7 +985,9 @@ void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorit
}
}
if (ResourceLoader::get_resource_type(fpath) == "PackedScene") {
String resource_type = ResourceLoader::get_resource_type(fpath);
if (resource_type == "PackedScene") {
bool is_imported = false;
{
@@ -1005,7 +1007,7 @@ void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorit
} else {
EditorNode::get_singleton()->open_request(fpath);
}
} else if (ResourceLoader::get_resource_type(fpath) == "AnimationLibrary") {
} else if (resource_type == "AnimationLibrary") {
bool is_imported = false;
{
@@ -1025,6 +1027,25 @@ void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorit
} else {
EditorNode::get_singleton()->open_request(fpath);
}
} else if (ResourceLoader::is_imported(fpath)) {
// If the importer has advanced settings, show them.
int order;
bool can_threads;
String name;
Error err = ResourceFormatImporter::get_singleton()->get_import_order_threads_and_importer(fpath, order, can_threads, name);
bool used_advanced_settings = false;
if (err == OK) {
Ref<ResourceImporter> importer = ResourceFormatImporter::get_singleton()->get_importer_by_name(name);
if (importer.is_valid() && importer->has_advanced_options()) {
importer->show_advanced_options(fpath);
used_advanced_settings = true;
}
}
if (!used_advanced_settings) {
EditorNode::get_singleton()->load_resource(fpath);
}
} else {
EditorNode::get_singleton()->load_resource(fpath);
}