summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkobewi <kobewi4e@gmail.com>2024-06-29 00:40:34 +0200
committerkobewi <kobewi4e@gmail.com>2024-06-29 21:30:38 +0200
commitb83c64faacd317bd375b90b5f24cfd62cf72d96c (patch)
tree98077fdfcabce5d2687cc63ebeafe8629bcb45a9
parent4ab8fb809396fa38ba929fec97cfcb7193f1c44d (diff)
downloadredot-engine-b83c64faacd317bd375b90b5f24cfd62cf72d96c.tar.gz
Speed up scene group scanning for text scenes
-rw-r--r--editor/editor_file_system.cpp8
-rw-r--r--editor/editor_file_system.h1
-rw-r--r--scene/resources/packed_scene.cpp50
-rw-r--r--scene/resources/packed_scene.h1
4 files changed, 52 insertions, 8 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index f0dc850af0..3dc3c660ce 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -1891,7 +1891,7 @@ void EditorFileSystem::_update_scene_groups() {
continue;
}
- const HashSet<StringName> scene_groups = _get_scene_groups(path);
+ const HashSet<StringName> scene_groups = PackedScene::get_scene_groups(path);
if (!scene_groups.is_empty()) {
ProjectSettings::get_singleton()->add_scene_groups_cache(path, scene_groups);
}
@@ -1935,12 +1935,6 @@ void EditorFileSystem::_get_all_scenes(EditorFileSystemDirectory *p_dir, HashSet
}
}
-HashSet<StringName> EditorFileSystem::_get_scene_groups(const String &p_path) {
- Ref<PackedScene> packed_scene = ResourceLoader::load(p_path);
- ERR_FAIL_COND_V(packed_scene.is_null(), HashSet<StringName>());
- return packed_scene->get_state()->get_all_groups();
-}
-
void EditorFileSystem::update_file(const String &p_file) {
ERR_FAIL_COND(p_file.is_empty());
update_files({ p_file });
diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h
index b0c6f0de51..aee40ed23d 100644
--- a/editor/editor_file_system.h
+++ b/editor/editor_file_system.h
@@ -290,7 +290,6 @@ class EditorFileSystem : public Node {
void _queue_update_scene_groups(const String &p_path);
void _update_scene_groups();
void _update_pending_scene_groups();
- HashSet<StringName> _get_scene_groups(const String &p_path);
void _get_all_scenes(EditorFileSystemDirectory *p_dir, HashSet<String> &r_list);
String _get_global_script_class(const String &p_type, const String &p_path, String *r_extends, String *r_icon_path) const;
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index b1742bd5a3..900629f5f8 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -2124,6 +2124,56 @@ void PackedScene::recreate_state() {
#endif
}
+#ifdef TOOLS_ENABLED
+HashSet<StringName> PackedScene::get_scene_groups(const String &p_path) {
+ {
+ Ref<PackedScene> packed_scene = ResourceCache::get_ref(p_path);
+ if (packed_scene.is_valid()) {
+ return packed_scene->get_state()->get_all_groups();
+ }
+ }
+
+ if (p_path.get_extension() == "tscn") {
+ Ref<FileAccess> scene_file = FileAccess::open(p_path, FileAccess::READ);
+ ERR_FAIL_COND_V(scene_file.is_null(), HashSet<StringName>());
+
+ HashSet<StringName> ret;
+ while (!scene_file->eof_reached()) {
+ const String line = scene_file->get_line();
+ if (!line.begins_with("[node")) {
+ continue;
+ }
+
+ int i = line.find("groups=[");
+ if (i == -1) {
+ continue;
+ }
+
+ int j = line.find_char(']', i);
+ while (i < j) {
+ i = line.find_char('"', i);
+ if (i == -1) {
+ break;
+ }
+
+ int k = line.find_char('"', i + 1);
+ if (k == -1) {
+ break;
+ }
+
+ ret.insert(line.substr(i + 1, k - i - 1));
+ i = k + 1;
+ }
+ }
+ return ret;
+ } else {
+ Ref<PackedScene> packed_scene = ResourceLoader::load(p_path);
+ ERR_FAIL_COND_V(packed_scene.is_null(), HashSet<StringName>());
+ return packed_scene->get_state()->get_all_groups();
+ }
+}
+#endif
+
Ref<SceneState> PackedScene::get_state() const {
return state;
}
diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h
index c46a4dd5fe..e26b9f7b90 100644
--- a/scene/resources/packed_scene.h
+++ b/scene/resources/packed_scene.h
@@ -270,6 +270,7 @@ public:
state->set_last_modified_time(p_time);
}
+ static HashSet<StringName> get_scene_groups(const String &p_path);
#endif
Ref<SceneState> get_state() const;