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' of https://github.com/antopilo/Nuake

Browse Source 
# Conflicts:
#	Editor/Editor.cpp
This commit is contained in:
Antoine Pilote
2023-09-21 10:53:33 -04:00
parent ef2034b66c 2efb2febac
commit e9c9e5f5c3
12 changed files with 236 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Editor/Editor.cpp
View File

@@ -34,11 +34,12 @@
#include "src/Misc/WindowTheming.h"
const std::string WindowTitle = "Nuake Editor";
std::string WindowTitle = "Nuake Editor ";
int ApplicationMain(int argc, char* argv[])
{
bool playMode = false;
using namespace Nuake;
std::string projectPath = "";
Vector2 editorResolution = Vector2(1280, 720);
@@ -48,15 +49,6 @@ int ApplicationMain(int argc, char* argv[])
char* arg = argv[i];
std::string args = std::string(arg);
if (args == "--play")
{
if (argc > 2)
{
projectPath = std::string(argv[i + 1]);
}
playMode = true;
}
if (args == "--resolution")
{
if (argc >= i + 1)
@@ -84,7 +76,7 @@ int ApplicationMain(int argc, char* argv[])
}
bool shouldLoadProject = false;
if (!playMode && argc > 1)
if (argc > 1)
{
shouldLoadProject = true;
projectPath = std::string(argv[1]);
@@ -136,8 +128,8 @@ int ApplicationMain(int argc, char* argv[])
WindowTheming::SetWindowDarkMode(window);
Nuake::EditorInterface editor;
editor.BuildFonts();
Nuake::EditorInterface editor;
editor.BuildFonts();
if (monitorIdx != -1)
{
@@ -173,45 +165,45 @@ int ApplicationMain(int argc, char* argv[])
Nuake::Engine::Tick();
Nuake::Engine::Draw();
Timestep ts = Nuake::Engine::GetTimestep();
Timestep ts = Nuake::Engine::GetTimestep();
Nuake::Vector2 WindowSize = window->GetSize();
glViewport(0, 0, WindowSize.x, WindowSize.y);
Nuake::Renderer2D::BeginDraw(WindowSize);
Nuake::Vector2 WindowSize = window->GetSize();
glViewport(0, 0, WindowSize.x, WindowSize.y);
Nuake::Renderer2D::BeginDraw(WindowSize);
auto sceneFramebuffer = window->GetFrameBuffer();
sceneFramebuffer->Bind();
auto sceneFramebuffer = window->GetFrameBuffer();
sceneFramebuffer->Bind();
{
Ref<Nuake::Scene> currentScene = Nuake::Engine::GetCurrentScene();
Ref<EditorCamera> camera;
if (currentScene)
{
Ref<Nuake::Scene> currentScene = Nuake::Engine::GetCurrentScene();
Ref<EditorCamera> camera;
if (currentScene)
camera = currentScene->m_EditorCamera;
}
if (currentScene && !Nuake::Engine::IsPlayMode())
{
glEnable(GL_LINE_SMOOTH);
if (editor.ShouldDrawAxis())
{
camera = currentScene->m_EditorCamera;
//gizmoDrawer.DrawAxis(currentScene);
}
if (currentScene && !Nuake::Engine::IsPlayMode())
if (editor.ShouldDrawCollision())
{
glEnable(GL_LINE_SMOOTH);
if (editor.ShouldDrawAxis())
{
//gizmoDrawer.DrawAxis(currentScene);
}
if (editor.ShouldDrawCollision())
{
gizmoDrawer.DrawGizmos(currentScene);
}
gizmoDrawer.DrawGizmos(currentScene);
}
}
sceneFramebuffer->Unbind();
editor.Update(ts);
editor.Draw();
Nuake::Engine::EndDraw();
}
sceneFramebuffer->Unbind();
editor.Update(ts);
editor.Draw();
Nuake::Engine::EndDraw();
}
Nuake::Engine::Close();