Merge branch 'develop' of https://github.com/antopilo/Nuake into develop

This commit is contained in:
Antoine Pilote
2024-09-02 18:12:49 -04:00
23 changed files with 202 additions and 30 deletions

View File

@@ -15,6 +15,7 @@
#include <imgui/imgui_impl_glfw.h>
#include <imgui/imgui_impl_opengl3.h>
#include <Tracy.hpp>
namespace Nuake
{
@@ -49,6 +50,8 @@ namespace Nuake
void Engine::Tick()
{
ZoneScoped;
JobSystem::Get().Update();
s_Time = static_cast<float>(glfwGetTime());
@@ -119,12 +122,18 @@ namespace Nuake
void Engine::Draw()
{
ZoneScoped;
RenderCommand::Clear();
// Start imgui frame
ImGui_ImplOpenGL3_NewFrame();
ImGui_ImplGlfw_NewFrame();
ImGui::NewFrame();
{
ZoneScopedN("ImGui New Frame");
ImGui_ImplOpenGL3_NewFrame();
ImGui_ImplGlfw_NewFrame();
ImGui::NewFrame();
}
// Draw scene
Window::Get()->Draw();
@@ -132,6 +141,7 @@ namespace Nuake
void Engine::EndDraw()
{
ZoneScoped;
Window::Get()->EndDraw();
}