Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Refactoring scene tree to make unordered set of unique pointers #605

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
+940 −914
Open

WIP: Refactoring scene tree to make unordered set of unique pointers #605

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c2fe22
three nodes
Jan 24, 2023
f43806f
store children as unordered set
Jan 25, 2023
7a65531
unordered set bug fixes
Jan 31, 2023
1124f54
lint fix
Jan 31, 2023
a8af29c
revert commits to unstage json and imgui
Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
unordered set bug fixes
root authored and root committed Jan 31, 2023
commit 7a655317ad77d886bf9b9a58c360c2cb2ff1e542
8 changes: 4 additions & 4 deletions editor/editor.app.json
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
}
},
"InputSystem": {
"height": 991,
"height": 793,
"inputSchemes": {
"Editor": {
"bools": [
@@ -74,7 +74,7 @@
}
},
"startScheme": "Editor",
"width": 1920
"width": 1536
},
"ParticleSystem": {
"culling": {
@@ -91,8 +91,8 @@
},
"PhysicsSystem": {},
"UISystem": {
"height": 991,
"width": 1920
"height": 793,
"width": 1536
}
},
"version": 1.0,
4 changes: 2 additions & 2 deletions editor/gui/scene_dock.cpp
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
#include "vendor/ImGUI/imgui_impl_dx11.h"
#include "vendor/ImGUI/imgui_impl_win32.h"

void SceneDock::showSceneTree(Ptr<Scene>& scene)
void SceneDock::showSceneTree(const Ptr<Scene>& scene)
{
ZoneScoped;

@@ -88,7 +88,7 @@ void SceneDock::showSceneTree(Ptr<Scene>& scene)
ImGui::EndDragDropTarget();
}

for (auto& child : scene->getChildren())
for (auto&& child : scene->getChildren())
{
showSceneTree(child);
}
2 changes: 1 addition & 1 deletion editor/gui/scene_dock.h
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ class SceneDock
SceneDockSettings m_SceneDockSettings;
SceneID m_OpenedSceneID;

void showSceneTree(Ptr<Scene>& scene);
void showSceneTree(const Ptr<Scene>& scene);
void openScene(Scene* scene);

Variant selectOpenScene(const Event* event);
Loading