From f0fd2565f6c54c8350d2da26a7b06bac67ce81e0 Mon Sep 17 00:00:00 2001 From: Prohurtz <48768484+RedHawk989@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:12:21 -0500 Subject: [PATCH] fix: test pupil dilation fixes --- EyeTrackApp/eye_processor.py | 3 +-- EyeTrackApp/osc/VRChatOSCSender.py | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/EyeTrackApp/eye_processor.py b/EyeTrackApp/eye_processor.py index ab2b9cb..e604ef1 100644 --- a/EyeTrackApp/eye_processor.py +++ b/EyeTrackApp/eye_processor.py @@ -355,7 +355,7 @@ class EyeProcessor: self.out_y = sum(self.prev_y_list) / len(self.prev_y_list) # print('AVG', self.out_y, len(self.prev_y_list)) - if self.settings.gui_pupil_dilation and self.eyeopen > 0.2: + if self.settings.gui_pupil_dilation : self.pupil_dilation = self.ebpd.intense( self.pupil_width, self.pupil_height, @@ -372,7 +372,6 @@ class EyeProcessor: self.prev_x = self.out_x self.prev_y = self.out_y - self.output_images_and_update( self.thresh, EyeInfo( diff --git a/EyeTrackApp/osc/VRChatOSCSender.py b/EyeTrackApp/osc/VRChatOSCSender.py index f117f2c..b113dd4 100644 --- a/EyeTrackApp/osc/VRChatOSCSender.py +++ b/EyeTrackApp/osc/VRChatOSCSender.py @@ -81,11 +81,14 @@ class VRChatOSCSender: self.l_eye_blink = eye_blink self.left_y = eye_y self.l_eye_velocity = avg_velocity + self.l_dilation = pupil_dilation + if eye_id == EyeId.RIGHT: self.r_eye_x = eye_x self.r_eye_blink = eye_blink self.right_y = eye_y self.r_eye_velocity = avg_velocity + self.r_dilation = pupil_dilation def output_native(self, main_config, config, client, eye_x, eye_y, eye_blink, avg_velocity, eye_id, pupil_dilation): default_eye_blink_params = { @@ -193,6 +196,7 @@ class VRChatOSCSender: avg_dilation = (self.r_dilation + self.l_dilation) / 2 # i am unsure of this tbh. client.send_message(config.osc_eyes_pupil_dilation_address, avg_dilation) # single param for both eyes. + def output_v2_params( self, main_config, @@ -264,6 +268,8 @@ class VRChatOSCSender: avg_pupil_dilation = (self.l_dilation + self.r_dilation) / 2 client.send_message("/avatar/parameters/v2/PupilDilation", avg_pupil_dilation) + + def output_vrcft_blink_data( self, eye_id: EyeId,