From 2d44bba88becef02aa2a3ab4884deba4e58e5879 Mon Sep 17 00:00:00 2001 From: Guillaume Meunier Date: Sat, 17 Feb 2024 00:26:16 +0100 Subject: [PATCH] Stop sending mDNS queries when the application loses focus --- client/application.cpp | 9 ++++++--- client/application.h | 2 +- client/scenes/lobby.cpp | 15 ++++++++++++++- client/scenes/lobby.h | 1 + 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/client/application.cpp b/client/application.cpp index f76df4cf..62afb513 100644 --- a/client/application.cpp +++ b/client/application.cpp @@ -1327,6 +1327,9 @@ void application::session_state_changed(XrSessionState new_state, XrTime timesta default: break; } + + if (std::shared_ptr s = current_scene()) + s->on_session_state_changed(new_state); } void application::interaction_profile_changed() @@ -1372,11 +1375,11 @@ void application::interaction_profile_changed() } } - if (current_scene()) + if (std::shared_ptr s = current_scene()) { - spdlog::info("Actions for current scene ({}):", current_scene()->current_meta.name); + s->on_interaction_profile_changed(); - for(auto& [name, action_and_type]: current_scene()->current_meta.actions_by_name) + for(auto& [name, action_and_type]: s->current_meta.actions_by_name) { auto [action, type] = action_and_type; diff --git a/client/application.h b/client/application.h index 20be2d2b..e2ca3052 100644 --- a/client/application.h +++ b/client/application.h @@ -19,7 +19,6 @@ #pragma once -#include #ifdef __ANDROID__ #include #endif @@ -27,6 +26,7 @@ #include "xr/xr.h" #include #include +#include #include #include #include diff --git a/client/scenes/lobby.cpp b/client/scenes/lobby.cpp index 5365fe05..9fa4a195 100644 --- a/client/scenes/lobby.cpp +++ b/client/scenes/lobby.cpp @@ -404,6 +404,14 @@ static glm::mat4 view_matrix(XrPosef pose) void scenes::lobby::update_server_list() { + if (application::is_focused() && !discover) + discover.emplace(); + else if (!application::is_focused() && discover) + discover.reset(); + + if (!discover) + return; + std::vector discovered_services = discover->get_services(); // TODO: only if discovered_services changed @@ -599,7 +607,6 @@ void scenes::lobby::render(XrTime predicted_display_time, bool should_render) void scenes::lobby::on_focused() { - discover.emplace(discover_service); move_gui_first_time = true; auto views = system.view_configuration_views(viewconfig); @@ -681,6 +688,12 @@ void scenes::lobby::on_unfocused() swapchain_imgui.reset(); } +void scenes::lobby::on_session_state_changed(XrSessionState state) +{ + if (state == XR_SESSION_STATE_STOPPING) + discover.reset(); +} + scene::meta& scenes::lobby::get_meta_scene() { static meta m{ diff --git a/client/scenes/lobby.h b/client/scenes/lobby.h index bcb19ca5..291d8dcb 100644 --- a/client/scenes/lobby.h +++ b/client/scenes/lobby.h @@ -131,6 +131,7 @@ public: void render(XrTime predicted_display_time, bool should_render) override; void on_unfocused() override; void on_focused() override; + void on_session_state_changed(XrSessionState state) override; static meta& get_meta_scene(); };