From ec7f50d92522e0fabbab11e6eefda4e4709f0db4 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 21 Dec 2024 12:12:14 +0100 Subject: [PATCH] ps move tracker: set max of radii to 50% It makes no sense to have a larger radius than half of the image size --- rpcs3/Emu/Cell/Modules/cellGem.cpp | 4 ++-- rpcs3/Input/ps_move_config.h | 4 ++-- rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp index 61c9020287..57858dd3b3 100644 --- a/rpcs3/Emu/Cell/Modules/cellGem.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp @@ -993,8 +993,8 @@ public: m_tracker.set_saturation_threshold(gem_num, config->saturation_threshold); } - m_tracker.set_min_radius(static_cast(g_cfg_move.min_radius.get() / g_cfg_move.min_radius.max)); - m_tracker.set_max_radius(static_cast(g_cfg_move.max_radius.get() / g_cfg_move.max_radius.max)); + m_tracker.set_min_radius(static_cast(g_cfg_move.min_radius) / 100.0f); + m_tracker.set_max_radius(static_cast(g_cfg_move.max_radius) / 100.0f); // Process camera image m_tracker.process_image(); diff --git a/rpcs3/Input/ps_move_config.h b/rpcs3/Input/ps_move_config.h index cdf70f9646..0e12889956 100644 --- a/rpcs3/Input/ps_move_config.h +++ b/rpcs3/Input/ps_move_config.h @@ -26,8 +26,8 @@ struct cfg_ps_moves final : cfg::node cfg_ps_move move3{ this, "PS Move 3" }; cfg_ps_move move4{ this, "PS Move 4" }; - cfg::_float<0, 100> min_radius{ this, "Minimum Radius", 1.0f, true }; // Percentage of image width - cfg::_float<0, 100> max_radius{ this, "Maximum Radius", 10.0f, true }; // Percentage of image width + cfg::_float<0, 50> min_radius{ this, "Minimum Radius", 1.0f, true }; // Percentage of image width + cfg::_float<0, 50> max_radius{ this, "Maximum Radius", 10.0f, true }; // Percentage of image width std::array move{ &move1, &move2, &move3, &move4 }; diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp index 8d16d40017..45fbe6f59e 100644 --- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp +++ b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp @@ -465,8 +465,8 @@ void ps_move_tracker_dialog::process_camera_frame() } m_ps_move_tracker->set_image_data(m_frame_frozen ? m_image_data_frozen.data() : m_image_data.data(), m_image_data.size(), width, height, m_camera_handler->format()); - m_ps_move_tracker->set_min_radius(static_cast(g_cfg_move.min_radius.get() / g_cfg_move.min_radius.max)); - m_ps_move_tracker->set_max_radius(static_cast(g_cfg_move.max_radius.get() / g_cfg_move.max_radius.max)); + m_ps_move_tracker->set_min_radius(static_cast(g_cfg_move.min_radius) / 100.0f); + m_ps_move_tracker->set_max_radius(static_cast(g_cfg_move.max_radius) / 100.0f); m_ps_move_tracker->set_filter_small_contours(m_filter_small_contours); m_ps_move_tracker->set_show_all_contours(m_show_all_contours); m_ps_move_tracker->set_draw_contours(m_draw_contours);