From 2721e1a0e391dd947df0cb9055f2e05012a62bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Sat, 13 Feb 2021 12:35:45 +0100 Subject: Add position parameter of sample selection to settings. --- src/settings.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/settings.h') diff --git a/src/settings.h b/src/settings.h index 7507827..d4a2295 100644 --- a/src/settings.h +++ b/src/settings.h @@ -76,12 +76,14 @@ struct Settings static float constexpr velocity_modifier_weight_default = 0.25f; static float constexpr velocity_stddev_default = .45f; static float constexpr sample_selection_f_close_default = .85f; + static float constexpr sample_selection_f_position_default = 1.f; static float constexpr sample_selection_f_diverse_default = .16f; static float constexpr sample_selection_f_random_default = .07f; Atomic velocity_modifier_falloff{velocity_modifier_falloff_default}; Atomic velocity_modifier_weight{velocity_modifier_weight_default}; Atomic velocity_stddev{velocity_stddev_default}; Atomic sample_selection_f_close{sample_selection_f_close_default}; + Atomic sample_selection_f_position{sample_selection_f_position_default}; Atomic sample_selection_f_diverse{sample_selection_f_diverse_default}; Atomic sample_selection_f_random{sample_selection_f_random_default}; @@ -200,6 +202,7 @@ struct SettingsGetter SettingRef velocity_modifier_weight; SettingRef velocity_stddev; SettingRef sample_selection_f_close; + SettingRef sample_selection_f_position; SettingRef sample_selection_f_diverse; SettingRef sample_selection_f_random; @@ -275,6 +278,7 @@ struct SettingsGetter , velocity_modifier_weight{settings.velocity_modifier_weight} , velocity_stddev{settings.velocity_stddev} , sample_selection_f_close{settings.sample_selection_f_close} + , sample_selection_f_position{settings.sample_selection_f_position} , sample_selection_f_diverse{settings.sample_selection_f_diverse} , sample_selection_f_random{settings.sample_selection_f_random} , sample_selection_retry_count(settings.sample_selection_retry_count) @@ -345,6 +349,7 @@ public: Notifier velocity_modifier_weight; Notifier velocity_stddev; Notifier sample_selection_f_close; + Notifier sample_selection_f_position; Notifier sample_selection_f_diverse; Notifier sample_selection_f_random; Notifier sample_selection_retry_count; @@ -424,6 +429,7 @@ public: EVAL(velocity_modifier_weight); EVAL(velocity_stddev); EVAL(sample_selection_f_close); + EVAL(sample_selection_f_position); EVAL(sample_selection_f_diverse); EVAL(sample_selection_f_random); EVAL(sample_selection_retry_count); -- cgit v1.2.3 From 7cd15102c30398f952196cfdfb42f90661762e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Sat, 13 Feb 2021 13:17:39 +0100 Subject: Add position filter. --- src/settings.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/settings.h') diff --git a/src/settings.h b/src/settings.h index d4a2295..0b7c5de 100644 --- a/src/settings.h +++ b/src/settings.h @@ -75,6 +75,7 @@ struct Settings static float constexpr velocity_modifier_falloff_default = 0.5f; static float constexpr velocity_modifier_weight_default = 0.25f; static float constexpr velocity_stddev_default = .45f; + static float constexpr position_stddev_default = 0.f; // FIXME: set to something sensible static float constexpr sample_selection_f_close_default = .85f; static float constexpr sample_selection_f_position_default = 1.f; static float constexpr sample_selection_f_diverse_default = .16f; @@ -82,6 +83,7 @@ struct Settings Atomic velocity_modifier_falloff{velocity_modifier_falloff_default}; Atomic velocity_modifier_weight{velocity_modifier_weight_default}; Atomic velocity_stddev{velocity_stddev_default}; + Atomic position_stddev{position_stddev_default}; Atomic sample_selection_f_close{sample_selection_f_close_default}; Atomic sample_selection_f_position{sample_selection_f_position_default}; Atomic sample_selection_f_diverse{sample_selection_f_diverse_default}; @@ -201,6 +203,7 @@ struct SettingsGetter SettingRef velocity_modifier_falloff; SettingRef velocity_modifier_weight; SettingRef velocity_stddev; + SettingRef position_stddev; SettingRef sample_selection_f_close; SettingRef sample_selection_f_position; SettingRef sample_selection_f_diverse; @@ -277,6 +280,7 @@ struct SettingsGetter , velocity_modifier_falloff{settings.velocity_modifier_falloff} , velocity_modifier_weight{settings.velocity_modifier_weight} , velocity_stddev{settings.velocity_stddev} + , position_stddev{settings.position_stddev} , sample_selection_f_close{settings.sample_selection_f_close} , sample_selection_f_position{settings.sample_selection_f_position} , sample_selection_f_diverse{settings.sample_selection_f_diverse} @@ -348,6 +352,7 @@ public: Notifier velocity_modifier_falloff; Notifier velocity_modifier_weight; Notifier velocity_stddev; + Notifier position_stddev; Notifier sample_selection_f_close; Notifier sample_selection_f_position; Notifier sample_selection_f_diverse; @@ -428,6 +433,7 @@ public: EVAL(velocity_modifier_falloff); EVAL(velocity_modifier_weight); EVAL(velocity_stddev); + EVAL(position_stddev); EVAL(sample_selection_f_close); EVAL(sample_selection_f_position); EVAL(sample_selection_f_diverse); -- cgit v1.2.3