Commit graph

3268 commits

Author SHA1 Message Date
Andrzej Kapolka
32af1de3ac For clarity, break the projection matrix update out of resizeGL. 2013-09-05 12:34:25 -07:00
Andrzej Kapolka
4961913fc4 Transmit the eye offset position along with the rest of the frustum
parameters.
2013-09-05 12:20:15 -07:00
Andrzej Kapolka
dd8a40decd Need to call resizeGL in order to update the projection matrix. 2013-09-05 11:41:16 -07:00
Andrzej Kapolka
3a195951db Merge branch 'master' of https://github.com/worklist/hifi into off 2013-09-05 10:56:02 -07:00
Andrzej Kapolka
03ead34642 Code review cleanup. 2013-09-05 10:34:43 -07:00
Andrzej Kapolka
70a21fc9ad Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-05 10:20:56 -07:00
Andrzej Kapolka
79408560d9 Tweaking the off-axis positions. 2013-09-04 17:48:54 -07:00
Andrzej Kapolka
1532b5d91a Apply eye offset position based on Faceshift/webcam. 2013-09-04 17:33:57 -07:00
ZappoMan
06f34b3163 Merge pull request #903 from birarda/bundle-name
capitalize the bundle name for interface on OS X
2013-09-04 17:15:00 -07:00
Stephen Birarda
9ede6b75c6 force the OS X bundle name to be capitalized 2013-09-04 17:09:43 -07:00
Andrzej Kapolka
a60be83fc7 Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-04 16:12:34 -07:00
Andrzej Kapolka
9ed698e04c Remove debug statement. 2013-09-04 16:10:13 -07:00
Andrzej Kapolka
54116cbc85 Testing audio shutdown before menu destruction. 2013-09-04 16:04:36 -07:00
Andrzej Kapolka
834b671f5a Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-04 15:32:15 -07:00
atlante45
b8c18bee2d merge 2013-09-04 15:31:12 -07:00
atlante45
5da525fc3e memory wastes and code cleaning PR comments 2013-09-04 15:12:24 -07:00
Andrzej Kapolka
0a9db6a5ee Moved device-related files to "devices" folder. 2013-09-04 12:15:36 -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
f84d6f4f37 Fix for eye pitch, track blinking locally. 2013-09-04 10:59:53 -07:00
Andrzej Kapolka
2c2f2fad5a Lookat adjustment. 2013-09-04 10:53:07 -07:00
Andrzej Kapolka
0d593c4a3f When Faceshift is active, use its eye directions rather than the mouse ray. 2013-09-04 10:46:11 -07:00
atlante45
1781abe937 Added Menu instance deletion in Application destructor. 2013-09-04 10:40:42 -07:00
atlante45
a1e433e189 Updated Application destructor 2013-09-04 10:24:10 -07:00
Andrzej Kapolka
697484d0bb Another coordinate tweak. 2013-09-03 18:29:46 -07:00
Andrzej Kapolka
3423053612 Coordinate system tweaks. 2013-09-03 18:23:02 -07:00
Andrzej Kapolka
650e9c4267 Silencio! 2013-09-03 18:15:51 -07:00
atlante45
b03482ead5 Some more memory leaks and codes formatting 2013-09-03 17:16:06 -07:00
Andrzej Kapolka
6a3b2c7ad0 Get the blendshape names and read the blink amounts. 2013-09-03 16:44:06 -07:00
atlante45
06119990e8 Fixed ui related files memory wastes 2013-09-03 14:47:50 -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
atlante45
7688dc4779 Fixed renderer related files memory wastes 2013-09-03 13:50:01 -07:00
atlante45
688bc17954 Fixed avatar related files memory wastes 2013-09-03 13:37:25 -07:00
Andrzej Kapolka
213a8fcd63 Working on Faceshift integration. 2013-09-03 11:52:32 -07:00
Andrzej Kapolka
7c3bb4ecc4 Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-03 11:00:29 -07:00
Andrzej Kapolka
843d5656bd Fix for compile warnings on Linux: check return values on read/write. 2013-09-03 10:45:33 -07:00
atlante45
15a3a8d252 Some more code reformatting. 2013-09-03 10:32:38 -07:00
atlante45
26691118de Some code reformatting. 2013-09-03 10:30:46 -07:00
Andrzej Kapolka
6f08df9e83 Link in Faceshift. 2013-09-03 10:03:15 -07:00
Andrzej Kapolka
cb3b7ca746 OS X build of Faceshift library. 2013-08-30 17:30:12 -07:00
Andrzej Kapolka
1f468a77f2 Added Faceshift-network library. 2013-08-30 17:19:41 -07:00
Andrzej Kapolka
c57118a64d De-magicked a number. 2013-08-30 15:57:32 -07:00
Andrzej Kapolka
54f0a30290 Remove video stuff used in testing. 2013-08-30 15:56:16 -07:00
atlante45
77799fce54 Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports 2013-08-30 15:28:33 -07:00
atlante45
229821e211 Removed frustum display in preview mode 2013-08-30 15:28:10 -07:00
Andrzej Kapolka
86561b98cc Merge branch 'master' of https://github.com/worklist/hifi into led 2013-08-30 15:16:22 -07:00
atlante45
f21a2798ff Fixed _sharedVoxelSystemTree deleted twice 2013-08-30 10:37:55 -07:00
Stephen Birarda
b46bd1fd41 display the Avatar's hand in first person 2013-08-30 10:28:30 -07:00
atlante45
fc991bf1ac Some code reformating 2013-08-29 18:11:16 -07:00