Linux fixes: win10toast_click dependency is now included only in windows compilation; Added pandas dependency as it was required in clean build for runtime; Added platform specific checks to disable winsound and triggers for it in codebase.

This commit is contained in:
plyshka 2023-01-28 22:20:48 +05:00
parent 7b869abc3b
commit 28f06b4640
4 changed files with 530 additions and 445 deletions

View File

@ -8,7 +8,9 @@ from queue import Queue, Empty
from camera import Camera, CameraState from camera import Camera, CameraState
from osc import EyeId from osc import EyeId
import cv2 import cv2
from winsound import PlaySound, SND_FILENAME, SND_ASYNC import sys
if sys.platform.startswith("win"):
from winsound import PlaySound, SND_FILENAME, SND_ASYNC
import traceback import traceback
import numpy as np import numpy as np
@ -241,7 +243,8 @@ class CameraWidget:
if event == self.gui_restart_calibration: if event == self.gui_restart_calibration:
self.ransac.calibration_frame_counter = 300 self.ransac.calibration_frame_counter = 300
PlaySound('Audio/start.wav', SND_FILENAME | SND_ASYNC) if sys.platform.startswith("win"):
PlaySound('Audio/start.wav', SND_FILENAME | SND_ASYNC)
if event == self.gui_recenter_eyes: if event == self.gui_recenter_eyes:
self.settings.gui_recenter_eyes = True self.settings.gui_recenter_eyes = True

View File

@ -1,7 +1,10 @@
from pythonosc import udp_client from pythonosc import udp_client
from pythonosc import osc_server from pythonosc import osc_server
from pythonosc import dispatcher from pythonosc import dispatcher
from winsound import PlaySound, SND_FILENAME, SND_ASYNC import sys
if sys.platform.startswith("win"):
from winsound import PlaySound, SND_FILENAME, SND_ASYNC
import queue import queue
import threading import threading
from enum import IntEnum from enum import IntEnum
@ -181,7 +184,8 @@ class VRChatOSCReceiver:
if osc_value: if osc_value:
for eye in self.eyes: for eye in self.eyes:
eye.ransac.calibration_frame_counter = 300 eye.ransac.calibration_frame_counter = 300
PlaySound('Audio/start.wav', SND_FILENAME | SND_ASYNC) if sys.platform.startswith("win"):
PlaySound('Audio/start.wav', SND_FILENAME | SND_ASYNC)
def run(self): def run(self):

954
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -10,12 +10,14 @@ repository = "https://github.com/RedHawk989/EyeTrackVR"
python = "~3.11.0" python = "~3.11.0"
python-osc = "^1.8.0" python-osc = "^1.8.0"
opencv-python = "^4.6.0.66" opencv-python = "^4.6.0.66"
numpy = "^1.23.4" numpy = "~1.23.5"
pye3d = "^0.3.1.post1" pye3d = "^0.3.1.post1"
requests = "^2.28.1" requests = "^2.28.1"
pysimplegui = "^4.60.4" pysimplegui = "^4.60.4"
pydantic = "^1.10.2" pydantic = "^1.10.2"
win10toast_click = "^0.1.2" win10toast_click = [
{ version = "^0.1.2", platform = 'win32' }
]
beautifulsoup4 = "^4.11.1" beautifulsoup4 = "^4.11.1"
[tool.poetry.group.dev.dependencies] [tool.poetry.group.dev.dependencies]