diff --git a/client/application.cpp b/client/application.cpp index 123a961b..da994655 100644 --- a/client/application.cpp +++ b/client/application.cpp @@ -1369,7 +1369,7 @@ void application::load_locale() std::locale::global(loc); } -std::pair application::get_action(const std::string & requested_name) +std::pair application::get_action(std::string_view requested_name) { for (const auto & [action, type, name]: instance().actions) { @@ -1567,15 +1567,21 @@ void application::loop() poll_events(); auto scene = current_scene(); - if (!is_session_running()) + if (not is_session_running()) { - if (scene) + if (not timestamp_unsynchronized) + timestamp_unsynchronized = std::chrono::steady_clock::now(); + + if (scene and std::chrono::steady_clock::now() - *timestamp_unsynchronized > 3s) scene->set_focused(false); + // Throttle loop since xrWaitFrame won't be called. std::this_thread::sleep_for(250ms); } else { + timestamp_unsynchronized.reset(); + if (scene) { poll_actions(); diff --git a/client/application.h b/client/application.h index 68daf6ff..766df916 100644 --- a/client/application.h +++ b/client/application.h @@ -132,6 +132,8 @@ class application : public singleton bool session_running = false; bool session_focused = false; bool session_visible = false; + std::optional timestamp_unsynchronized; // Timestamp when session_synchronized becomes false + bool debug_extensions_found = false; std::vector vk_device_extensions; std::atomic exit_requested = false; @@ -231,7 +233,7 @@ public: { return instance().actions; } - static std::pair get_action(const std::string & name); + static std::pair get_action(std::string_view name); static std::optional> locate_controller(XrSpace space, XrSpace reference, XrTime time) {