AnotherFoxGuy/bounce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade bounce

Browse Source
This commit is contained in:
Luke Benstead
2020-01-30 18:42:47 +00:00
parent 1509b9bd0e
commit e5897d433d
459 changed files with 98378 additions and 48427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
examples/testbed/framework/main.cpp
View File

@@ -24,6 +24,8 @@
// error
#endif
#include <stdio.h>
#include <glfw/glfw3.h>
#include <testbed/framework/model.h>
@@ -103,14 +105,12 @@ static void Run()
while (glfwWindowShouldClose(g_window) == 0)
{
g_frameAllocator->Reset();
g_profiler->Begin();
g_profilerSt->Begin();
g_profiler->BeginScope("Frame");
g_profilerSt->BeginScope("Frame");
g_view->BeginInterface();
if (g_model->IsPaused())
@@ -126,22 +126,13 @@ static void Run()
g_model->Update();
g_profilerSt->EndScope();
g_profiler->EndScope();
if (g_settings->drawProfileTree)
if (g_settings->drawProfiler)
{
g_view->InterfaceProfileTree();
g_view->InterfaceProfiler();
}
if (g_settings->drawProfileTreeStats)
{
g_view->InterfaceProfileTreeStats();
}
g_profilerSt->End();
#if PROFILE_JSON == 1
g_model->UpdateJson();
#endif
@@ -160,7 +151,7 @@ int main(int argc, char** args)
#if defined(_WIN32)
// Report memory leaks
_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG));
//_CrtSetBreakAlloc(0);
//_CrtSetBreakAlloc();
#endif
if (glfwInit() == 0)
@@ -186,7 +177,7 @@ int main(int argc, char** args)
glfwSwapInterval(1);
glfwMakeContextCurrent(g_window);
if (gladLoadGL() == 0)
{
fprintf(stderr, "Failed to load OpenGL extensions\n");