Tidy UI & Move clamp after processing

This commit is contained in:
Blabzillaweasel 2025-02-08 23:52:49 +13:00
parent e65631820e
commit 4018879d37
2 changed files with 6 additions and 10 deletions

View File

@ -336,6 +336,8 @@ class cal:
var.past_x = out_x_mult
var.past_y = out_y_mult
out_x, out_y = velocity_falloff(self, var, out_x, out_y)
#Clamps the right eye's X values
if self.eye_id == EyeId.LEFT:
out_x = clamp(out_x, -self.settings.gui_eyetune_maxout, self.settings.gui_eyetune_maxin)
@ -345,10 +347,6 @@ class cal:
#Clamps both eye's Y values
out_y = clamp(out_y, -self.settings.gui_eyetune_maxdown, self.settings.gui_eyetune_maxup)
out_x, out_y = velocity_falloff(self, var, out_x, out_y)
try:
noisy_point = np.array([float(out_x), float(out_y)]) # fliter our values with a One Euro Filter
point_hat = self.one_euro_filter(noisy_point)

View File

@ -30,7 +30,7 @@ class EyeTuneSettingsModule(BaseSettingsModule):
sg.Text("Eye Tuning (Max Rotation):", background_color='#242224'),
],
[
sg.Text("Max. Inwards", background_color=BACKGROUND_COLOR),
sg.Text("In:", background_color=BACKGROUND_COLOR),
sg.InputText(
self.config.gui_eyetune_maxin,
key=self.gui_eyetune_maxin,
@ -40,7 +40,7 @@ class EyeTuneSettingsModule(BaseSettingsModule):
"\nSet between 0 and 1"
)
),
sg.Text("Max. Outwards", background_color=BACKGROUND_COLOR),
sg.Text("Out:", background_color=BACKGROUND_COLOR),
sg.InputText(
self.config.gui_eyetune_maxout,
key=self.gui_eyetune_maxout,
@ -50,9 +50,7 @@ class EyeTuneSettingsModule(BaseSettingsModule):
"\nSet between 0 and 1"
)
),
],
[
sg.Text("Max. Upwards", background_color=BACKGROUND_COLOR),
sg.Text("Up:", background_color=BACKGROUND_COLOR),
sg.InputText(
self.config.gui_eyetune_maxup,
key=self.gui_eyetune_maxup,
@ -62,7 +60,7 @@ class EyeTuneSettingsModule(BaseSettingsModule):
"\nSet between 0 and 1"
)
),
sg.Text("Max. Down", background_color=BACKGROUND_COLOR),
sg.Text("Down:", background_color=BACKGROUND_COLOR),
sg.InputText(
self.config.gui_eyetune_maxdown,
key=self.gui_eyetune_maxdown,