Commit graph

33 commits

Author SHA1 Message Date
Stephen Birarda
b2a99edb2e fix conditional builds without Faceshift 2014-07-18 14:27:20 -07:00
Andrzej Kapolka
f707719f4e Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:34:29 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Andrzej Kapolka
55e0035fc8 More progress on Faceplus integration. 2014-04-09 11:14:47 -07:00
Andrzej Kapolka
5b0e7f818d More work on Faceplus integration/cleaning up support for multiple face
trackers.
2014-04-08 18:03:49 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Andrzej Kapolka
635f3b6dc3 Perform the mesh blending in worker threads and only when we've actually
received new data.  Closes #2075.  Closes #2348.
2014-03-18 16:38:05 -07:00
Andrzej Kapolka
5f6f4b3d37 Fixes required since enabling Faceshift is now the default. 2014-03-13 16:45:27 -07:00
Andrzej Kapolka
9d1278b663 Wait until we know that Faceshift didn't connect before we attempt to
initialize Visage.
2014-03-13 16:18:47 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Andrzej Kapolka
eeeed84664 When Faceshift isn't connected, apply the audio-based blinking and brow/mouth
movement to the new face models.
2013-11-22 13:36:14 -08:00
Andrzej Kapolka
a7683fa07f More tweaks to eye offsets. 2013-11-01 18:15:43 -07:00
Philip Rosedale
e43758a115 Faceshift fail to connect only notifies log once 2013-10-18 14:36:57 -07:00
Freddy
6b0f9314ba Faceshift drives body rotation, remove gyro-driven rotation 2013-09-26 23:52:44 -07:00
Andrzej Kapolka
6e8df9584e Faceshift starts reporting failure to track under load, so determine active
state based on the amount of time elapsed since last successful tracking data
received.
2013-09-25 14:37:53 -07:00
Andrzej Kapolka
0fa2eca02d Remove option to use Faceshift rig (using the "macaw" model has much the same
result, and it lets other people see it).
2013-09-23 10:43:20 -07:00
Andrzej Kapolka
1fce6c717b Working on shipping around the complete set of blendshape coefficients. 2013-09-16 17:28:04 -07:00
Andrzej Kapolka
f9426cbecc Working on reading and rendering the rig from Faceshift. 2013-09-16 15:49:40 -07:00
atlante45
d6981bfa20 Andrejz Faceshift modif merge 2013-09-13 18:18:41 -07:00
atlante45
88e8ef7c7c eye opening and some better memory handling 2013-09-11 12:57:58 -07:00
RyanDowne
13c228e796 Added Smile 2013-09-10 17:33:22 -07:00
atlante45
61f9088d3e eyelib handling for faceshift 2013-09-10 16:35:14 -07:00
atlante45
4e3484021e PerlinFace implementation 2013-09-10 15:31:58 -07:00
Andrzej Kapolka
c56778c3bf When devices become inactive (including when Faceshift reports loss of
tracking), smoothly restore neutral head rotation/lean.
2013-09-10 11:14:36 -07:00
Andrzej Kapolka
f8aee88a5b Let's try subtracting the long-term average from the eye directions. 2013-09-09 14:30:26 -07:00
Andrzej Kapolka
597c57a117 Revert "Try using the eye coefficients rather than the eye directions reported by"
This reverts commit 37aa909322.
2013-09-09 12:17:12 -07:00
Andrzej Kapolka
37aa909322 Try using the eye coefficients rather than the eye directions reported by
Faceshift.
2013-09-09 11:22:46 -07:00
Andrzej Kapolka
5e23c79192 Tweaked feature scales, send recalibrate request on reset. 2013-09-04 11:55:55 -07:00
Andrzej Kapolka
679926ce42 Working on brow/mouth mapping. 2013-09-04 11:40:53 -07:00
Andrzej Kapolka
6a3b2c7ad0 Get the blendshape names and read the blink amounts. 2013-09-03 16:44:06 -07:00
Andrzej Kapolka
b406dc7311 Log when attempting to connect and on failure. Wait a second before
attempting to reconnect.
2013-09-03 14:20:47 -07:00
Andrzej Kapolka
734cb83e81 Read Faceshift head translation/rotation. 2013-09-03 13:56:04 -07:00