ZappoMan
|
44f92fb47c
|
Merge pull request #1297 from PhilipRosedale/master
Voxel editing with hands, flying by pointing hands
|
2013-12-02 12:46:04 -08:00 |
|
Andrzej Kapolka
|
b4466e3e34
|
Make sure we can still compile if we don't have the Linux Oculus dependencies.
|
2013-12-02 12:24:42 -08:00 |
|
Philip Rosedale
|
7ab9cc9c14
|
Voxel editing with hands, flying and rotation with hands
|
2013-12-02 00:17:06 -08:00 |
|
Philip Rosedale
|
a9139b05e8
|
Drive with trigger pointing
|
2013-11-29 20:46:16 -08:00 |
|
Philip Rosedale
|
abca79ea3e
|
Add button detection for hydra controller to palmData
|
2013-11-29 16:20:43 -08:00 |
|
Philip Rosedale
|
9680941500
|
Add palm velocity
|
2013-11-29 14:50:18 -08:00 |
|
Andrzej Kapolka
|
7874a2aa85
|
Merge branch 'master' of https://github.com/worklist/hifi into noculus
|
2013-11-26 19:14:21 -08:00 |
|
Andrzej Kapolka
|
a557dc3ae2
|
Sign fix.
|
2013-11-26 14:31:19 -08:00 |
|
Andrzej Kapolka
|
b17f6a1c66
|
Spacing fix.
|
2013-11-26 14:16:52 -08:00 |
|
Andrzej Kapolka
|
39414bbd86
|
Farther down the path of demagicking the numbers and using the actual info
reported by LibOVR>
|
2013-11-26 13:56:34 -08:00 |
|
Andrzej Kapolka
|
c5406c47a6
|
Moved Oculus code out of Application, started on using StereoConfig to get
actual values to replace the magic numbers.
|
2013-11-26 11:59:06 -08:00 |
|
Andrzej Kapolka
|
1aaf6f2620
|
Mac library with RTTI enabled, prevent crash on startup when there's no
Oculus.
|
2013-11-25 18:36:23 -08:00 |
|
Andrzej Kapolka
|
0e0685af04
|
New Oculus software with Linux support.
|
2013-11-25 17:30:51 -08:00 |
|
Philip Rosedale
|
2cb701bce6
|
Added adjustment for hydra position to user (it matters)
|
2013-11-25 17:28:33 -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
|
053d6b1e71
|
Fix for Leap drive enabled without Leap.
|
2013-11-21 14:01:12 -08:00 |
|
Andrzej Kapolka
|
80e6606dd2
|
Adjusted constants, added reasonable starting base position.
|
2013-11-19 15:31:04 -08:00 |
|
Andrzej Kapolka
|
38c2abd6d8
|
First stab at Leap driving.
|
2013-11-19 15:10:02 -08:00 |
|
Andrzej Kapolka
|
df8fbf8f72
|
More general, angle-driven form of driving based on lean.
|
2013-11-19 11:09:02 -08:00 |
|
Andrzej Kapolka
|
5e933b0815
|
Working on basic Faceshift drive.
|
2013-11-18 18:06:01 -08:00 |
|
Andrzej Kapolka
|
f59b403103
|
Drive avatar with Sixense joysticks and triggers.
|
2013-11-18 16:20:00 -08:00 |
|
Andrzej Kapolka
|
0231ed133c
|
Optional compilation for Sixense.
|
2013-11-18 12:09:52 -08:00 |
|
Andrzej Kapolka
|
9c401607b1
|
Missed the actual files.
|
2013-11-15 18:47:25 -08:00 |
|
Andrzej Kapolka
|
797645a209
|
More palm fixes.
|
2013-11-07 13:29:17 -08:00 |
|
Andrzej Kapolka
|
e6cd9a7368
|
Working on wiring up the fingers.
|
2013-11-07 12:12:48 -08:00 |
|
Andrzej Kapolka
|
092f1fa4c8
|
Shorten the long term average.
|
2013-11-05 14:10:53 -08:00 |
|
Andrzej Kapolka
|
acaac714e6
|
More smoothing.
|
2013-11-04 11:20:56 -08:00 |
|
Andrzej Kapolka
|
ce1ebf8d11
|
The Faceshift eye rotations are indeed relative to the head.
|
2013-11-04 10:57:29 -08:00 |
|
Andrzej Kapolka
|
def3707041
|
I don't think Faceshift's gaze data is actually head-relative.
|
2013-11-01 18:28:35 -07:00 |
|
Andrzej Kapolka
|
a7683fa07f
|
More tweaks to eye offsets.
|
2013-11-01 18:15:43 -07:00 |
|
Andrzej Kapolka
|
08db294a5b
|
Smooth gaze direction relative to window.
|
2013-10-24 17:23:21 -07:00 |
|
Andrzej Kapolka
|
247dfd3750
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
|
2013-10-22 17:27:14 -07:00 |
|
Andrzej Kapolka
|
7e174093e4
|
Factoring the FBX model code out to a shared base class.
|
2013-10-18 17:26:03 -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 |
|
Freddy
|
1dbc8459f8
|
adding measured angular velocity to faceshift
|
2013-09-25 16:46:26 -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
|
b4ca66eb68
|
Merge branch 'master' of https://github.com/worklist/hifi into blendface
Conflicts:
interface/src/devices/Faceshift.cpp
|
2013-09-17 11:05:11 -07:00 |
|
Andrzej Kapolka
|
a4f79390f4
|
Fixed initialization order.
|
2013-09-17 10:25:27 -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 |
|