mirror of
https://github.com/EyeTrackVR/EyeTrackVR.git
synced 2025-11-04 14:39:42 +08:00
* initial changes * Mostly clean up, refactor registering listeners to make sense, backport tests * Add initial implementation of VRCFTModuleSender * Add basic GUI for the modules settings * Fix tooltip descriptions # TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao * Fix type validation bugs, fix typos # TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao * Add checkbox to switch to ETVR Module # TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao * Black stuff # TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao * Remove coverage by default # TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao * Fix timeout in tests # TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao * HEAVY WIP: Refactor native output, NOTE: I brought back the entire old OSC implementation as a live reference, this will be removed once I'm done. This also lays ground for other modes as they're pretty similar # TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao * HEAVY WIP: Refactor v1 params output, # TODO: # - min/maxing will require field combinators in the modules lmao * HEAVY WIP: Refactor v2 params output # TODO: # - min/maxing will require field combinators in the modules lmao * Finish refactoring v2 and v1, fixup tests, refactor native # TODO: # - min/maxing will require field combinators in the modules lmao * Add tests for v1 params # TODO: # - min/maxing will require field combinators in the modules lmao * Add tests for native params # TODO: # - min/maxing will require field combinators in the modules lmao * Fix OSC not getting up after config reset. Remove reset command, config sends everything changed anyway, sunset the idea of using single client and thus simplify the code a bit # TODO: # - min/maxing will require field combinators in the modules lmao * Rename gui_PortNumber to gui_VRCFTModulePort for readability # TODO: # - min/maxing will require field combinators in the modules lmao * Cleanup EyeID usage # TODO: # - min/maxing will require field combinators in the modules lmao * Cleanup osc after rebase # TODO: # - min/maxing will require field combinators in the modules lmao * Make VRChatOSCSender a bit more readable # TODO: # - min/maxing will require field combinators in the modules lmao * Remove unsued VRChatOSCReceiver, this is taken care of by generic OSCReceiver # TODO: # - min/maxing will require field combinators in the modules lmao * Commit crimes with try_convert_to_float to make osc, pysimplegui and pydantic happy * Cleanup after merge * Disable emulation by default * Fix OSCReceiver crashing on unknown addresses * Adjust VRCFT Module settings to look better in game * Fix recalibrate and recenter for OSC only working for the right eye * Fix save and restart button not restarting the tracking * Fix broken tracking on v1 params for eye_x, clean up implementation * Fix regular value being passed to OSC listeners instead of OSCMessage * Add a TODO, probably to be ignored * Add support for custom ETVR VRCFT Module listening address
145 lines
4.8 KiB
Python
145 lines
4.8 KiB
Python
from datetime import datetime, timedelta
|
|
from typing import Iterable
|
|
|
|
import PySimpleGUI as sg
|
|
from colorama import Fore
|
|
|
|
from config import EyeTrackConfig, EyeTrackSettingsConfig
|
|
from threading import Event
|
|
from eye import EyeId
|
|
|
|
|
|
class BaseSettingsWidget:
|
|
def __init__(
|
|
self,
|
|
widget_id: EyeId,
|
|
main_config: EyeTrackConfig,
|
|
settings_modules: Iterable,
|
|
):
|
|
# we put the last time an error was printed in the past so whenever a newone appears
|
|
self.last_error_printout = datetime.now() - timedelta(seconds=20)
|
|
self.error_printout_timeout = 2
|
|
self.gui_general_settings_layout = f"-GENERALSETTINGSLAYOUT{widget_id}-"
|
|
self.reset_button_key = f"RESET_SETTINGS{widget_id}"
|
|
self.is_saving = False
|
|
self.main_config = main_config
|
|
self.config = main_config.settings
|
|
|
|
self.initialized_modules = self._initialize_modules(settings_modules=settings_modules, widget_id=widget_id)
|
|
|
|
self.general_settings_layout = []
|
|
for module in self.initialized_modules:
|
|
self.general_settings_layout.extend(module.get_layout())
|
|
|
|
self.widget_layout = [
|
|
[
|
|
sg.Column(
|
|
self.general_settings_layout,
|
|
key=self.gui_general_settings_layout,
|
|
background_color="#424042",
|
|
),
|
|
],
|
|
[
|
|
sg.Text("", background_color="#424042"),
|
|
],
|
|
[
|
|
sg.Button(
|
|
"Reset settings to default",
|
|
key=self.reset_button_key,
|
|
button_color="#c40e23",
|
|
)
|
|
],
|
|
]
|
|
|
|
self.cancellation_event = (
|
|
Event()
|
|
) # Set the event until start is called, otherwise we can block if shutdown is called.
|
|
self.cancellation_event.set()
|
|
|
|
def started(self):
|
|
return not self.cancellation_event.is_set()
|
|
|
|
def start(self):
|
|
# If we're already running, bail
|
|
if not self.cancellation_event.is_set():
|
|
return
|
|
self.cancellation_event.clear()
|
|
|
|
def stop(self):
|
|
# If we're not running yet, bail
|
|
if self.cancellation_event.is_set():
|
|
return
|
|
self.cancellation_event.set()
|
|
|
|
def _update_and_save_config(self, validated_data: dict):
|
|
self.main_config.update(validated_data, save=True)
|
|
self.is_saving = False
|
|
|
|
def _handle_errors(self, errors):
|
|
now = datetime.now()
|
|
elapsed_seconds = (datetime.now() - self.last_error_printout).seconds
|
|
if elapsed_seconds > self.error_printout_timeout:
|
|
self.last_error_printout = now
|
|
|
|
messages = []
|
|
for module_errors in errors:
|
|
for error in module_errors:
|
|
messages.append(f"{Fore.RED}[ERROR]{Fore.RESET} {error['msg']} \n")
|
|
print("".join(messages))
|
|
|
|
def render(self, window, event, values):
|
|
validated_data, errors = {}, []
|
|
# we might want to think about event driven architecture here eventually, validate only
|
|
# if anything changes instead of checking for changes
|
|
for module in self.initialized_modules:
|
|
module_validated_data = module.validate(values)
|
|
if module_validated_data.changes:
|
|
validated_data.update(module_validated_data.changes)
|
|
if module_validated_data.errors:
|
|
errors.append(module_validated_data.errors)
|
|
|
|
if not errors and validated_data and not self.is_saving:
|
|
self.is_saving = True
|
|
self._update_and_save_config(validated_data)
|
|
|
|
if errors:
|
|
self._handle_errors(errors)
|
|
|
|
self.handle_events(event, window)
|
|
|
|
def _initialize_modules(self, settings_modules, widget_id):
|
|
return [
|
|
module(
|
|
config=self.config,
|
|
settings=self.main_config,
|
|
widget_id=widget_id,
|
|
)
|
|
for module in settings_modules
|
|
]
|
|
|
|
def get_layout(self) -> Iterable:
|
|
return self.widget_layout
|
|
|
|
def handle_events(self, event, window):
|
|
if event == "__TIMEOUT__":
|
|
return
|
|
|
|
if event == self.reset_button_key:
|
|
self.reset_config(window)
|
|
|
|
def reset_config(self, window):
|
|
|
|
default_values = {}
|
|
base_settings = EyeTrackSettingsConfig()
|
|
|
|
print(f"\033[92m[INFO] Resetting config to defaults\033[0m")
|
|
for module in self.initialized_modules:
|
|
for key in module.get_key_for_panel_defaults():
|
|
default_val = getattr(base_settings, key)
|
|
widget_key = getattr(module, key)
|
|
default_values[key] = default_val
|
|
window[widget_key].update(default_val)
|
|
print(f"\033[92m[INFO] Config reset, saving\033[0m")
|
|
|
|
self._update_and_save_config(default_values)
|