fix single eye

This commit is contained in:
Prohurtz 2022-09-12 17:08:35 -07:00 committed by GitHub
parent e607f73b27
commit dde7fe2d5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,6 +8,7 @@ class EyeId(IntEnum):
RIGHT = 0 RIGHT = 0
LEFT = 1 LEFT = 1
BOTH = 2 BOTH = 2
SETTINGS = 3
class VRChatOSC: class VRChatOSC:
@ -26,7 +27,6 @@ class VRChatOSC:
self.cancellation_event = cancellation_event self.cancellation_event = cancellation_event
self.msg_queue = msg_queue self.msg_queue = msg_queue
def run(self): def run(self):
yl = 621 yl = 621
@ -34,6 +34,8 @@ class VRChatOSC:
sx = 0 sx = 0
sy = 0 sy = 0
se = 0 se = 0
lec = 1
rec = 1
while True: while True:
if self.cancellation_event.is_set(): if self.cancellation_event.is_set():
print("Exiting OSC Queue") print("Exiting OSC Queue")
@ -50,6 +52,7 @@ class VRChatOSC:
sx = eye_info.x sx = eye_info.x
yr = eye_info.y yr = eye_info.y
sy = eye_info.y sy = eye_info.y
rec = 1
self.client.send_message("/avatar/parameters/RightEyeX", eye_info.x) self.client.send_message("/avatar/parameters/RightEyeX", eye_info.x)
self.client.send_message("/avatar/parameters/RightEyeLid", float(0))# old param open right self.client.send_message("/avatar/parameters/RightEyeLid", float(0))# old param open right
@ -62,6 +65,7 @@ class VRChatOSC:
sx = eye_info.x sx = eye_info.x
yl = eye_info.y yl = eye_info.y
sy = eye_info.y sy = eye_info.y
lec = 1
self.client.send_message("/avatar/parameters/LeftEyeX", eye_info.x) self.client.send_message("/avatar/parameters/LeftEyeX", eye_info.x)
self.client.send_message("/avatar/parameters/LeftEyeLid", float(0))# old param open left self.client.send_message("/avatar/parameters/LeftEyeLid", float(0))# old param open left
self.client.send_message("/avatar/parameters/LeftEyeLidExpandedSqueeze", float(0.8)) # open left eye self.client.send_message("/avatar/parameters/LeftEyeLidExpandedSqueeze", float(0.8)) # open left eye
@ -71,13 +75,14 @@ class VRChatOSC:
self.client.send_message("/avatar/parameters/EyesY", y) self.client.send_message("/avatar/parameters/EyesY", y)
se = 0 se = 0
else: if rec == 1 and lec == 1:
se = 1 se = 1
self.client.send_message("/avatar/parameters/LeftEyeX", sx) # only one eye is detected or there is an error. Send mirrored data to both eyes. self.client.send_message("/avatar/parameters/LeftEyeX", sx) # only one eye is detected or there is an error. Send mirrored data to both eyes.
self.client.send_message("/avatar/parameters/RightEyeX", sx) self.client.send_message("/avatar/parameters/RightEyeX", sx)
self.client.send_message("/avatar/parameters/EyesY", sy) self.client.send_message("/avatar/parameters/EyesY", sy)
else: else:
if eye_id in [EyeId.LEFT, EyeId.BOTH]: if eye_id in [EyeId.LEFT, EyeId.BOTH]: