From 8a40f3e5f8ef8dcdebffe97b453089c2ef3769e1 Mon Sep 17 00:00:00 2001 From: redstrate <54911369+redstrate@users.noreply.github.com> Date: Tue, 22 Sep 2020 13:28:08 -0400 Subject: [PATCH] Add quit command --- engine/core/src/engine.cpp | 6 +++++- platforms/mac/main.mm.in | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/engine/core/src/engine.cpp b/engine/core/src/engine.cpp index cda4865..3e02a5e 100755 --- a/engine/core/src/engine.cpp +++ b/engine/core/src/engine.cpp @@ -25,10 +25,14 @@ Engine::Engine(const int argc, char* argv[]) { console::info(System::Core, "Prism Engine loading..."); - console::register_command("test_cmd", console::ArgumentFormat(0), [](const console::Arguments arguments) { + console::register_command("test_cmd", console::ArgumentFormat(0), [](const console::Arguments) { console::info(System::Core, "Test cmd!"); }); + console::register_command("quit", console::ArgumentFormat(0), [this](const console::Arguments) { + quit(); + }); + console::invoke_command("test_cmd", console::Arguments()); for(int i = 0; i < argc; i++) diff --git a/platforms/mac/main.mm.in b/platforms/mac/main.mm.in index c1e60ba..7cb6f18 100755 --- a/platforms/mac/main.mm.in +++ b/platforms/mac/main.mm.in @@ -598,6 +598,9 @@ int main(int argc, char* argv[]) { const uint64_t current = clock_gettime_nsec_np(CLOCK_UPTIME_RAW); const uint64_t elapsed = current - last_time; + + if(engine->is_quitting()) + is_qutting = true; for(auto& window : windows) { if(window != nullptr)