Jeffrey Ventrella
8a55db53ce
merge
2013-07-22 10:42:18 -07:00
Jeffrey Ventrella
5f0d52ce89
uh, whatever
2013-07-22 10:35:02 -07:00
Jeffrey Ventrella
13e6f2e6fa
added sphere resolution to emitter attributes
2013-07-22 10:31:23 -07:00
Eric Johnston
9ab8fecff5
Minor tweaks to Rave Glove mode, per Ryan's testing
...
1. Improve response by using unfiltered data from Leap library
2. Reduce distracting arm-flail by only attaching the arm to che glove when we're not in rave mode.
2013-07-22 07:19:25 -07:00
Jeffrey Ventrella
ad0ca748bb
added extra mode and improved particle system
2013-07-20 09:48:55 -07:00
Eric Johnston
0cdad1a313
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-19 19:48:52 -07:00
Jeffrey Ventrella
05039b4e3e
adding rave glove modes and changing API of particle system to accommodate
2013-07-19 18:02:48 -07:00
Jeffrey Ventrella
6e84481931
Merge remote-tracking branch 'upstream/master' into particles
2013-07-19 16:08:43 -07:00
Andrzej Kapolka
f70b4dcab2
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-19 15:49:07 -07:00
Andrzej Kapolka
ff0d63173c
Pass the aspect ratio into the shader, since it no longer necessarily
...
corresponds to the texture rectangle's aspect ratio.
2013-07-18 21:25:11 -07:00
Andrzej Kapolka
0ae6887c4a
The depth texture needs nearest neighbor filtering.
2013-07-18 21:06:38 -07:00
Andrzej Kapolka
b15724665b
Removed unused variable, fixed shader comments.
2013-07-18 18:16:45 -07:00
Andrzej Kapolka
b5a8c2710c
Merge branch 'master' of https://github.com/worklist/hifi into pointy
...
Conflicts:
interface/src/Application.h
interface/src/Audio.h
interface/src/Webcam.cpp
2013-07-18 18:09:57 -07:00
Andrzej Kapolka
b8be66c6fc
Now able to stream depth data.
2013-07-18 17:39:49 -07:00
Andrzej Kapolka
7ce04444fc
Most of the way towards working video encoding.
2013-07-18 14:14:44 -07:00
Andrzej Kapolka
8863645dc9
Working on transmitting and receiving the face video.
2013-07-17 18:02:27 -07:00
Andrzej Kapolka
401ef45000
Removed keypoint stuff, fixed stupidity leading to fringed edges (was
...
linearly interpolating the missing values).
2013-07-16 17:56:53 -07:00
Andrzej Kapolka
fd1671a44f
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-16 12:48:24 -07:00
Andrzej Kapolka
905bd9b011
Track features on face, add a mode to render just key points.
2013-07-16 11:54:19 -07:00
Andrzej Kapolka
d5abb3e6eb
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-15 16:15:12 -07:00
Andrzej Kapolka
fdeb63c121
More work on face points.
2013-07-15 16:09:49 -07:00
Andrzej Kapolka
6c587af6ac
Merge branch 'master' of https://github.com/worklist/hifi into pointy
...
Conflicts:
interface/src/avatar/Head.cpp
2013-07-15 13:13:51 -07:00
Andrzej Kapolka
5c590638f3
Working on mesh rendering for faces.
2013-07-15 13:12:22 -07:00
Andrzej Kapolka
a59fbfbf3e
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-14 18:21:50 -07:00
Andrzej Kapolka
411cb92300
Working on face rendering as point cloud.
2013-07-14 15:54:29 -07:00
Andrzej Kapolka
763e6a2fa1
Merge branch 'master' of https://github.com/worklist/hifi into pointy
...
Conflicts:
interface/src/Application.h
2013-07-12 15:34:55 -07:00
Andrzej Kapolka
61f6b8b974
Moved all the avatar bits to their own subdirectory.
2013-07-11 14:53:46 -07:00
