Commit Graph

570 Commits

Author SHA1 Message Date
Prohurtz
45df46ac07 force push with python upgrade 2023-12-22 12:57:20 -08:00
Prohurtz
43e86c2ae8 an actuall cpu perf increase 2023-12-19 14:50:39 -08:00
Prohurtz
49675dc672 cpu performance booooossstt 2023-12-19 13:51:46 -08:00
lorow
4495965076 Remove unused requirements.txt file 2023-12-14 00:00:11 +01:00
Prohurtz
01e0c6c53b fix: bug fix in pupil dia 2023-11-24 19:10:10 -06:00
Prohurtz
3cee994366 fix: file path, and folders 2023-11-24 18:22:58 -06:00
Prohurtz
1ecdbdc142 fix: dilation crash 2023-11-24 18:08:49 -06:00
Prohurtz
5329911404 feat: center point calibration overlay 2023-11-24 18:03:55 -06:00
Prohurtz
ce7c7f22df feat: properly tune tracking algo AHSF 2023-11-22 14:29:27 -06:00
Prohurtz
81334e60a6 fix: adjust limits on size AHSF 2023-11-20 13:54:44 -06:00
Prohurtz
4cbe0ea751 fix: adjust limits on size AHSF 2023-11-20 13:49:54 -06:00
Prohurtz
0d4d99f01d fix: remove limits on size AHSF 2023-11-20 13:49:23 -06:00
Prohurtz
3fc41ba9cd fix: remove limits on size AHSF 2023-11-20 13:48:10 -06:00
Prohurtz
305107d1ac fix: remove debug prints 2023-11-20 13:44:17 -06:00
Prohurtz
3c84245e8b fix: AHSF not handle crash 2023-11-20 13:28:42 -06:00
Prohurtz
88d9700f23 fix: falloff code delete 2023-11-20 13:26:46 -06:00
Prohurtz
6e847ff0fe fix: falloff code delete 2023-11-20 13:26:40 -06:00
Prohurtz
b4d54fcb68 fix: LEAP frame and visualization 2023-11-20 13:25:53 -06:00
Prohurtz
129803bbdc fix: LEAP getting visualized frame other call 2023-11-20 13:13:35 -06:00
Prohurtz
7d7fb6e3a3 fix: LEAP getting visualized frame 2023-11-20 13:06:59 -06:00
Prohurtz
dc6fbd34d1 fix: blur crash 2023-11-20 12:44:34 -06:00
Prohurtz
a7f0fd10a9 fix: camera handel, crash fix 2023-11-19 19:34:55 -06:00
Prohurtz
a8cf676730 fix: fix several bugs that caused crashes 2023-11-19 17:43:21 -06:00
Prohurtz
cfe7c73c44 fix: serial cam crash on first app launch 2023-11-19 16:41:48 -06:00
Prohurtz
ceb320115a feat: bump ver 2023-11-19 16:16:26 -06:00
Charlton Rodda
8f0acab6ce Fix image shape axis order 2023-11-11 23:18:51 +00:00
Prohurtz
cf707a92c9 fix: algo priority num 2023-11-11 16:56:37 -06:00
Prohurtz
ac342f30e9 feat: update overlay app 2023-11-11 16:55:11 -06:00
Prohurtz
2b232a1e89 feat: credits 2023-11-11 16:04:35 -06:00
Prohurtz
bdc91313fe feat: AHSFRAC 2023-11-11 16:02:30 -06:00
Prohurtz
f539b02388 feat: Initial AHSF imp (HSF successor) 2023-11-11 15:36:17 -06:00
Prohurtz
3f6efcb315 feat: change ovr overlay port number 2023-11-09 12:54:20 -06:00
Prohurtz
92af3d6c4f fix: properly define var lol 2023-11-09 09:42:46 -06:00
Prohurtz
b1a6acb1c5 fix: calling overlay too many times 2023-11-09 09:38:36 -06:00
Prohurtz
9e358f64ae fix: overlay call 2023-11-09 09:34:35 -06:00
Prohurtz
a38f61977f fix: fix slash 2023-11-09 09:29:20 -06:00
Prohurtz
f6345e0a47 fix: missing import 2023-11-09 09:27:37 -06:00
Prohurtz
4cde26609f fix: path fix? 2023-11-09 09:27:11 -06:00
Prohurtz
0ea6523ec1 fix: remove try:s so we can get proper error 2023-11-09 09:24:56 -06:00
Prohurtz
86cf3bd843 fix: fix file path of overlay? 2023-11-09 09:23:47 -06:00
Prohurtz
661fc3d8c2 fix: fix overlay arg 2023-11-09 09:20:45 -06:00
Prohurtz
582813cc01 feat: revert port number for now 2023-11-09 09:16:16 -06:00
Charlton Rodda
c231b004b9 Fix some mutually destructive sign issues 2023-11-07 23:08:47 +00:00
Charlton Rodda
98a2448f5c Use vec2s where possible 2023-11-07 23:08:47 +00:00
Charlton Rodda
3641751a22 Load ROI from config.roi_window 2023-11-07 19:55:12 +00:00
Charlton Rodda
8eae8d89d3 Add option to pad ROI widget for rotation 2023-11-07 19:27:47 +00:00
Charlton Rodda
29084baa29 Style the ROI cursor and crop lines with dashes 2023-11-07 19:27:47 +00:00
Charlton Rodda
41e1d33a19 Add crosshair to ROI editor 2023-11-07 18:42:55 +00:00
Charlton Rodda
826afb2f30 Limit ROI crop to padded region 2023-11-07 18:42:55 +00:00
Charlton Rodda
666022d0e5 Dynamically adjust image padding 2023-11-07 18:42:55 +00:00
Charlton Rodda
de764e57ca Improve UX of rotated ROI selection 2023-11-07 18:42:55 +00:00
Charlton Rodda
1b961ae477 Crop and rotate image in one operation 2023-11-07 18:42:55 +00:00
Prohurtz
9620d50ccb feat: Trigger center point only calibration overlay when recenter 2023-11-07 08:57:47 -06:00
Prohurtz
a6fcabf9be feat: commit 2023-11-07 08:02:24 -06:00
Prohurtz
f06db29e1b feat: add calibration overlay files 2023-11-04 19:39:35 -05:00
Prohurtz
590fc70164 feat: add buttons for future markup crop mode 2023-11-02 09:20:02 -05:00
Prohurtz
58ee8e3033 fix: variable falloff not defined 2023-10-31 18:30:22 -05:00
Prohurtz
4c668f9b47 fix: eye dominant falloff (may still be broke) 2023-10-31 13:05:22 -05:00
Prohurtz
55a0df1b66 feat: untested eye dominant falloff 2023-10-31 08:58:38 -05:00
Prohurtz
37aa4c05c0 feat: working dual eye falloff 2023-10-31 08:51:54 -05:00
Prohurtz
9b3c9b4bcf feat: initial foundation of new dual eye falloff (non functional) 2023-10-26 09:10:35 -05:00
Prohurtz
ada4936922 fix: VRCFT V2 param addresses 2023-10-17 09:04:46 -05:00
Prohurtz
d7c9b3b70b fix: tune LEAP filter 2023-10-12 09:16:06 -05:00
Prohurtz
d685ad18ea fix: safe crop int erros
fix: pupil dilation filtering, calib
2023-10-12 08:24:32 -05:00
Prohurtz
0ee5404f5d
Merge pull request #93 from lorow/feature/config-rewrite-with-defualts-reset
Settings rewrite for easier data validation and resseting to defaults
2023-10-11 23:13:48 -05:00
lorow
7068d8539b Add validation, refactor some more stuff 2023-10-08 19:36:14 +02:00
DeltaNeverUsed
355068c0be basic vrcft v2 support 2023-10-08 14:49:04 +02:00
lorow
6a9a27578d Fix eye dilation and vrcft2 settings 2023-10-07 01:01:39 +02:00
lorow
61b2c88960 Merge remote-tracking branch 'upstream/HSF-and-new-algos-feature-branch' into feature/config-rewrite-with-defualts-reset
# Conflicts:
#	EyeTrackApp/algo_settings_widget.py
#	EyeTrackApp/general_settings_widget.py
#	EyeTrackApp/osc.py
2023-10-06 22:23:44 +02:00
lorow
5a84217402 Style the button 2023-10-06 22:11:35 +02:00
lorow
3190364a72 Add config reset, clean-up modules 2023-10-06 00:33:37 +02:00
lorow
aa3be78f54 Refactor settings into base settings, fixup modules
TODO: reset
2023-10-05 22:57:34 +02:00
Prohurtz
6200ddfcab feat: pupil dilation initial imp 2023-10-05 09:47:02 -05:00
Prohurtz
e694054cb4 feat: pupil dilation work start 2023-10-05 09:47:02 -05:00
lorow
ff5974ec8d WIP: refactor algo settings into modules 2023-10-05 00:44:47 +02:00
lorow
c93e279157 Initial settings rewrite into modules in preparation for resetting to defaults and for better settings handling 2023-10-03 22:11:52 +02:00
Prohurtz
9bab5b4555 fix: temp disable leap low priority for MetalCanyon 2023-10-03 14:52:00 -05:00
Prohurtz
8e28092601 feat: stage one of new output formats 2023-10-03 14:51:36 -05:00
Nick Duijndam
62ba685f86 Make the eye X & Y OSC addresses configurable through the config file 2023-10-02 21:22:37 +02:00
Prohurtz
46427e3533 fix: remove prints 2023-09-30 20:04:57 -05:00
Prohurtz
5a6248b897 fix: LEAP Eyelid, tune RANSAC BLINK 2023-09-30 14:51:57 -05:00
Prohurtz
c6fbfe8c70 fix: left eye ransac thresh set to right 2023-09-28 13:19:17 -05:00
Prohurtz
d11f94f5af fix: left eye ransac thresh set to right 2023-09-28 13:19:17 -05:00
Prohurtz
2ec7d2d4ee fix: remove y axis lock (temp) 2023-09-27 06:48:18 -05:00
Prohurtz
1c2760b382 fix: tighten blink vec (needs testing/re-write, just minor fix) 2023-09-27 06:48:18 -05:00
Prohurtz
ab631fad19 feat: LEAP Lid blink algo 2023-09-26 08:46:52 -05:00
Prohurtz
6297ce327c fix: small DADDY optimizations (test for FPS limit) 2023-09-26 08:46:52 -05:00
Prohurtz
4ad1eaffc4 fix: LEAP full closed thresh 2023-09-24 09:29:32 -05:00
Prohurtz
9caa70340a remove debug prints, adjust LEAP opennes filter 2023-09-24 09:27:35 -05:00
Prohurtz
3a98a586a6 remove debug prints 2023-09-23 20:02:27 -05:00
Prohurtz
5209a441b6 fix: UVC cameras not working2 2023-09-23 19:52:12 -05:00
Prohurtz
5e28ee34e5 fix: UVC cameras not working 2023-09-23 19:49:41 -05:00
Prohurtz
8f2709253c fix blink algo crash, do not resize small frames 2023-09-23 17:26:28 -05:00
Prohurtz
0cd9f46a02 fix: BETA 7 2023-09-23 15:43:19 -05:00
Prohurtz
1e94577d90 build: BETA 7 2023-09-23 15:37:34 -05:00
Prohurtz
1d79445889 refactor: BETA 7 2023-09-23 15:20:50 -05:00
Prohurtz
ac6f8b98d2 feat: ready for new beta 2023-09-23 15:05:13 -05:00
Prohurtz
73ec950fac set default crop size to normal esp32 cam 240x240 2023-09-23 14:50:54 -05:00
Prohurtz
0b7b1bed07 limit image size to 480 to prevent issues
macos fixes
2023-09-23 14:47:58 -05:00
RedHawk989
916967c560 (not fully tested) Legacy ransac toggle and thresh settings 2023-09-10 12:05:30 -05:00
DaOfficialWizard
437b88a4bd fix: module leap not found 2023-08-24 13:35:46 +01:00
DaOfficialWizard
a29db80909 fix: module leap not found 2023-08-24 13:05:46 +01:00
DaOfficialWizard
35e71a2123 fix: standalone exe
- setup standalone executable
- fix external file bundling for standalone
- fix some spelling errors in gui

BREAKING CHANGES
2023-08-24 12:48:18 +01:00
DaOfficialWizard
e250e4e353 build: setup pre-release build pipeline 2023-08-24 08:55:15 +01:00
RedHawk989
abf7f88ae5 fix algo priority, placement 2023-08-10 20:42:19 -05:00
Prohurtz
5198cddd8f add mommy model files 2023-08-09 17:03:09 -05:00
Prohurtz
969e06eca0 new blink algo (almost done) bug fixes, small perf improvement? 2023-07-25 20:49:43 -05:00
Prohurtz
a6a8991a61 new blink algo (almost done) bug fixes, small perf improvement? 2023-07-25 20:27:57 -05:00
Prohurtz
09bf6737a2 [IN TESTING] blink fixes, y axis lock, IBO bug fix 2023-07-14 18:46:58 -05:00
Prohurtz
0cd0ad6334 revert camera thread, util opencv bug fix instead 2023-07-12 09:38:34 -05:00
Prohurtz
d5462e09fe IBO fix, new RANSAC blink 2023-07-10 21:28:34 -05:00
Prohurtz
c6a11ae62d test push 2023-07-10 20:09:17 -05:00
Prohurtz
3fee1a4e53 fix HSF 2023-07-10 20:04:50 -05:00
Prohurtz
5686604dcb mommy gets divorced (renamed to LEAP) 2023-06-29 13:25:31 -05:00
Prohurtz
6be461be85 mommy gets divorced (renamed to LEAP) 2023-06-29 13:24:15 -05:00
Prohurtz
eacaa1fbba fix mommy file dir 2023-06-24 18:58:54 -05:00
Prohurtz
3d7d06764c fix app close stall 2023-06-24 14:35:23 -05:00
Prohurtz
45a7b25a0a remove torch for smaller binary. kill bug for mommy 2023-06-24 14:15:46 -05:00
Prohurtz
338591617e fix config calibration saves 2023-06-24 13:48:00 -05:00
Prohurtz
bbe1629ebd fix none type crashes 2023-06-24 13:29:22 -05:00
Prohurtz
96372a7aa7 fix none type crashes 2023-06-24 12:17:35 -05:00
Prohurtz
d7b0136dff fix build file stuff 2023-06-23 18:34:03 -05:00
Prohurtz
eb6a48df91 fix opencv hang when no cameras
Add MOMMY v1 (early small model)
2023-06-23 12:29:44 -05:00
Prohurtz
911a63ae18
Merge pull request #87 from EtheriVR/Etheri-Improve-Convergance
Improves convergance
2023-06-23 08:42:41 -07:00
Etheri
544f2b05b8 Improves convergance
Improve convergance by simply sending the propper y values
2023-06-23 02:32:09 +02:00
Etheri
0c825af3e4 Fixes calibration values
There was a bug that made calibration values all default to 1 if there was a failure of the try/except, fixed the code so it does error checking before running
2023-06-18 00:13:10 +02:00
Prohurtz
c784918531 black format ep 2023-06-17 12:33:26 -05:00
Prohurtz
635173f42a black format IBO 2023-06-17 12:32:56 -05:00
Prohurtz
41b11fe134 Expose IBO settings, Fix UVC cameras 2023-06-17 12:25:06 -05:00
Etheri
7081723ac0 Osc had a different name than settings 2023-06-17 17:16:17 +02:00
Etheri
a1aecc9cdb Added eyelids to config
Adding the eyelids to config and adding an invert bool makes this work with most peoples currently setup eyelids if they used eyetracking before native
2023-06-17 15:56:45 +02:00
Etheri
80af953b29 Fixed left and right squeeze sending same value 2023-06-17 15:36:15 +02:00
Etheri
6bfdc8a08f Param rename 2023-06-16 13:12:51 +02:00
Etheri
9284f97b09 Adds new config vars fixes filter pop error
In additon resets caibration data for IBO on recalibrate
2023-06-16 13:06:36 +02:00
Etheri
8569009fb1 Fixes numpy type error 2023-06-16 13:00:59 +02:00
Etheri
203ac58b16 Remove globals to restore dual eye 2023-06-16 13:00:16 +02:00
Prohurtz
fe02b86cbf bump brightness on rotation background 2023-06-02 16:23:24 -05:00
Prohurtz
a38cd4369e remove debug prints 2023-06-02 16:15:50 -05:00
Prohurtz
5fa9b3a07c remove debug print, fix IBO eye saves 2023-06-02 16:14:54 -05:00
Prohurtz
d5252124a4 fis HSRAC, fix HSF radius sliders 2023-06-02 16:06:05 -05:00
Prohurtz
056e21d6e2 Merge remote-tracking branch 'origin/HSF-and-new-algos-feature-branch' into HSF-and-new-algos-feature-branch 2023-06-02 10:58:42 -05:00
Prohurtz
373c29ceb6 fix ransac thresh add, add setup config 2023-06-02 10:58:18 -05:00
Prohurtz
f5f836ae75 [Dazbme] fix IBO filter 2023-06-02 08:42:16 -07:00
Prohurtz
2465df6697 fix BLOB remove debug prints 2023-06-01 12:12:12 -05:00
Prohurtz
1c7c6d964b IBO fix, HSRAC fix 2023-06-01 12:03:04 -05:00
Prohurtz
ea33273b73 remove debug print, add t & e back 2023-05-31 20:37:53 -05:00
Prohurtz
c97c498d62 remove HSRAC.py use HSF and RANSAC sep calls, HSRAC circle crop with avg color 2023-05-31 20:37:18 -05:00
Prohurtz
507283ed7e sep settings pages, eyelid visualizations 2023-05-31 19:37:16 -05:00
Prohurtz
4c0c907a07 [NOT WORKING] start work on algo settings page 2023-05-31 17:27:36 -05:00
Prohurtz
73fef266c6 fit circle crop in ransac3d 2023-05-31 17:14:10 -05:00
Prohurtz
786c9e3d5f fit wired fps calc 2023-05-31 16:29:30 -05:00
Prohurtz
c965756f27 fit wireless fps calc 2023-05-29 17:57:52 -05:00
Prohurtz
d310b0a8b9 print cleanup 2023-05-11 16:07:27 -05:00
Prohurtz
30077496e3 fix cams, bump ver 2023-05-11 16:00:07 -05:00
Prohurtz
3c451b41a8
clean 2023-05-11 11:31:48 -07:00
Prohurtz
a526c29960
cleanup 2023-05-11 09:39:38 -07:00
Prohurtz
22e9c6df85
cleanup, update credits, rename 2023-05-11 09:04:30 -07:00
Prohurtz
8d29d24127
complete implimentation of per eye cirlcle crop in ransac 2023-05-11 08:58:07 -07:00
Prohurtz
e554d8bf2c
circle crop back in settings 2023-05-11 08:46:06 -07:00
Prohurtz
3c9c8b2eb8
flip tab layout to make sense 2023-05-11 08:18:08 -07:00
Prohurtz
f42d64bf02
part of re imp circle crop, settings placement change 2023-05-11 08:16:42 -07:00
Prohurtz
478b2e198f
remove ibo call causing crash 2023-05-11 07:42:11 -07:00
Prohurtz
8ff33f0461
rename functions to be more correct 2023-05-11 07:37:42 -07:00
Prohurtz
9d2de778b0
fix wireless cam fps and image size reporting 2023-05-11 07:36:06 -07:00
Sebastian Fitt
61637442c6 feat: show bitrate, fps, latency in tracking mode 2023-04-29 15:48:29 +02:00
Sebastian Fitt
2efa3c3589 feat: more readable logging with colorama 2023-04-29 14:40:44 +02:00
Sebastian Fitt
6d7630cf60 fix: when address is set but no devices connected 2023-04-29 14:32:54 +02:00
Sebastian Fitt
3b5582de6e feat: slightly reduce dropped frame count 2023-04-29 14:32:54 +02:00
Sebastian Fitt
4def965759 fix: ensure serial is closed when thread crashed 2023-04-29 14:32:54 +02:00
Sebastian Fitt
ca56222445 fix: pinv for pseudo inverse when singular matrix 2023-04-29 14:32:54 +02:00
Sebastian Fitt
446a20cea8 refactor: cleanup imports 2023-04-29 14:32:54 +02:00
Sebastian Fitt
d6d19383bd refactor: extract EyeInfo enums and dataclasses 2023-04-29 14:32:54 +02:00
Prohurtz
4ce8531136 fix blob and ransac outputs 2023-04-27 18:14:40 -05:00
Prohurtz
52297424de fix HSRAC crash 2023-04-23 16:47:12 -05:00
Prohurtz
70eeb54e5c fix HSRAC crash 2023-04-23 16:29:58 -05:00
Prohurtz
29f75b2054 one euro filter in IBO
blink algo recalibrates when tracking does
2023-04-22 17:44:33 -05:00
Prohurtz
e5469cf42c one euro filter in IBO
messing around in IBO
2023-04-22 17:41:57 -05:00
Prohurtz
a763098bad fix algos, ransac crash fix 2023-04-16 17:36:26 -05:00
Prohurtz
25d7417c62 fix disk usage 2023-04-16 13:20:37 -05:00
Prohurtz
28a306454b native vrc ET
spelling fixes
2023-04-15 21:39:34 -05:00
Prohurtz
89365ba730 fix ransac bug and auto radius fix 2023-04-15 19:34:38 -05:00
Prohurtz
0b5f10d9a6 fix single eye to dual eye not working 2023-04-14 16:07:46 -05:00
Prohurtz
d0fcfe7f9a add HSRAC visualizations.
(something might be wrong with IBO)
2023-04-12 21:04:38 -05:00
Prohurtz
87c2f1f7eb fix daddy files
update .spec
2023-04-12 20:36:30 -05:00
Prohurtz
bbd8b96978 fix rotation edge bug?
revert HSRAC crop output to normal szie
2023-04-12 17:29:20 -05:00
Prohurtz
e3a932fb5d
Merge pull request #80 from Blu3u/HSF-and-new-algos-feature-branch
Fix issues in existing USB-based eye tracker implementation to enable proper functionality.
2023-04-09 18:18:20 -05:00
Sebastian Fitt
c2aad0e859 feat: add v2 serial comms with packet headers
* feat: serial read no longer drops frames on buffer reset
* fix: fps now calculated properly
* fix: remove unnecessary logs
2023-04-09 11:05:50 +02:00
Prohurtz
dd29a6834f add basic filter to IBO to help jitters 2023-04-08 20:55:51 -05:00
Sebastian Fitt
295f10476d fix: identify and mitigate latency issues 2023-04-08 19:58:13 +02:00
Sebastian Fitt
b3f444ee3a fix: bring the existing impl to a usable state
* fix: existing impl always passed None as the port, it never worked
* feat: initial handling of unplugging usb serial device
* feat: check if port exists before trying to open it
* fix: existing impl caused division by zero when calculating fps
* fix: existing impl did not exit when image not found then crashed
* fix: warn logs were marked as info
2023-04-08 18:30:19 +02:00
Prohurtz
e2ff11a081 format, vrc native ET test init 2023-04-06 18:14:11 -05:00
Prohurtz
cdba5a55e4 Update osc.py 2023-04-06 17:55:09 -05:00
Prohurtz
33ec3f20d7
Merge branch 'HSF-and-new-algos-feature-branch' into feature/dev_container 2023-04-06 14:00:39 -07:00
Prohurtz
4121789875 format settings page better for high res screens 2023-04-01 15:38:25 -07:00
Prohurtz
e621c8197c fix linux compatibility, add requests to poetry 2023-04-01 15:23:11 -07:00
ZanzyTHEbar
a5e36ad4c4 feat: add dev container 2023-03-30 12:22:29 +01:00
Prohurtz
c1f63dd400 finish save calib after restart 2023-03-22 17:15:16 -05:00
Prohurtz
cbd20fdac8 save calib values (NOT FINISHED) 2023-03-20 21:23:12 -05:00
Prohurtz
cca9536b0b force calib stop 2023-03-20 20:43:58 -05:00
Prohurtz
2293f74bfb allow videos to be played (if they have .mp4 in the name) 2023-03-19 18:34:45 -05:00