celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-15 20:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/NK-95-billboard-component

Browse Source
This commit is contained in:
Antoine Pilote
2023-08-01 19:59:14 -04:00
parent e5603c5111 3156499f54
commit 3cb207c851
5 changed files with 61 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Editor/src/Windows/EditorInterface.cpp
View File

@@ -246,7 +246,7 @@ namespace Nuake {
}
m_IsViewportFocused = ImGui::IsWindowFocused();
if (m_IsHoveringViewport && Input::IsMouseButtonPressed(GLFW_MOUSE_BUTTON_2) && !ImGuizmo::IsUsing())
if (m_IsHoveringViewport && Input::IsMouseButtonPressed(GLFW_MOUSE_BUTTON_1) && !ImGuizmo::IsUsing())
{
ImGui::FocusWindow(ImGui::GetCurrentWindow());
@@ -1375,7 +1375,7 @@ namespace Nuake {
Selection = EditorSelection();
}
if (ImGui::MenuItem("Open...", "CTRL+O"))
if (ImGui::MenuItem("Open..."))
{
OpenProject();
@@ -1406,7 +1406,7 @@ namespace Nuake {
Engine::LoadScene(Scene::New());
Selection = EditorSelection();
}
if (ImGui::MenuItem("Open scene...", "CTRL+SHIFT+O"))
if (ImGui::MenuItem("Open scene...", "CTRL+O"))
{
OpenScene();
Selection = EditorSelection();
@@ -1528,6 +1528,31 @@ namespace Nuake {
return;
}
// Shortcuts
if(ImGui::IsKeyDown(ImGuiKey_LeftCtrl))
{
if(ImGui::IsKeyPressed(ImGuiKey_S))
{
Engine::GetProject()->Save();
Engine::GetCurrentScene()->Save();
Selection = EditorSelection();
}
else if(ImGui::IsKeyPressed(ImGuiKey_O))
{
OpenScene();
Selection = EditorSelection();
}
else if(ImGui::IsKeyDown(ImGuiKey_LeftShift) && ImGui::IsKeyPressed(ImGuiKey_S))
{
std::string savePath = FileDialog::SaveFile("*.project");
Engine::GetProject()->SaveAs(savePath);
Selection = EditorSelection();
}
}
if (_WelcomeWindow->IsProjectQueued() && frameCount > 0)
{
// draw splash