fix: dual eye jitter in GUI off

This commit is contained in:
Prohurtz 2024-07-30 15:21:10 -05:00
parent 8a0ba4dfb4
commit e927fd25ce
2 changed files with 20 additions and 20 deletions

View File

@ -135,13 +135,6 @@ def create_window(config, settings, eyes):
default=(config.eye_display_id == EyeId.VRCFTMODULESETTINGS),
key=key_manager.VRCFT_MODULE_SETTINGS_RADIO_NAME,
),
sg.Radio(
"GUI OFF",
"EYESELECTRADIO",
background_color="#292929",
default=(config.eye_display_id == EyeId.GUIOFF),
key=key_manager.GUIOFF_RADIO_NAME,
),
],
[
sg.Column(
@ -180,6 +173,13 @@ def create_window(config, settings, eyes):
background_color="#424042",
),
],
[
sg.Button(
"GUI OFF",
key=key_manager.GUIOFF_RADIO_NAME,
button_color="#6f4ca1",
),
],
]
@ -420,7 +420,17 @@ def main():
window[key_manager.ALGO_SETTINGS_NAME].update(visible=False)
config.eye_display_id = EyeId.VRCFTMODULESETTINGS
config.save()
elif values[key_manager.GUIOFF_RADIO_NAME] and config.eye_display_id != EyeId.GUIOFF:
else:
# Otherwise, render all
for eye in eyes:
if eye.started():
eye.render(window, event, values)
for setting in settings:
if setting.started():
setting.render(window, event, values)
if event == key_manager.GUIOFF_RADIO_NAME:
config.settings.gui_disable_gui = True
# eyes[0].stop()
# eyes[1].stop()
@ -432,20 +442,10 @@ def main():
window[key_manager.SETTINGS_NAME].update(visible=False)
window[key_manager.VRCFT_MODULE_SETTINGS_NAME].update(visible=False)
window[key_manager.ALGO_SETTINGS_NAME].update(visible=False)
config.eye_display_id = EyeId.GUIOFF
#config.eye_display_id = EyeId.GUIOFF
config.save()
window.close()
break
else:
# Otherwise, render all
for eye in eyes:
if eye.started():
eye.render(window, event, values)
for setting in settings:
if setting.started():
setting.render(window, event, values)
if __name__ == "__main__":
main()

View File

@ -73,7 +73,7 @@ class VRChatOSCSender:
@staticmethod
def get_is_single_eye(eye_display_id):
return eye_display_id in [EyeId.RIGHT, EyeId.LEFT, 0, 1, 6]
return eye_display_id in [EyeId.RIGHT, EyeId.LEFT, 0, 1]
def update_eye_state(self, eye_id, eye_x, eye_y, eye_blink, avg_velocity, pupil_dilation):
if eye_id == EyeId.LEFT: