tosh
c18400f8b7
Merge branch 'master' of git://github.com/worklist/hifi into 19377
2013-06-29 15:41:56 +02:00
Mark Peng
be2e6518a1
Fixed if statement formatting in displayStats() and timer() in Application.cpp
2013-06-28 16:20:05 -07:00
Mark Peng
53543c26fe
Added menu toggle for displaying ping
2013-06-28 16:02:49 -07:00
Mark Peng
745dc03c72
Fixed AGENT_TYPE typo in Application::displayStats()
2013-06-28 15:42:27 -07:00
Mark Peng
a5c6cee433
Renamed getPingTime() to getPingMs() in Agent.h, etc.
2013-06-28 15:33:08 -07:00
Mark Peng
0aa3227228
Merge remote-tracking branch 'upstream/master'
2013-06-28 15:26:34 -07:00
Mark Peng
293031de6f
ping reporter added to interface take 3
2013-06-28 13:03:30 -07:00
Mark Peng
ee005f19d9
ping reporter added to interface take 2
2013-06-28 11:17:52 -07:00
Mark Peng
c5fe8b078e
ping reporter added to interface
2013-06-28 11:07:01 -07:00
Eric Johnston
1c797405da
Hand rework in preparation for adding send/receive hand data
...
- Added Hand.cpp, Hand.h, HandData.cpp, HandData.h, roughly matching the equivalent Head files
- Cleaned up Avatar by moving hand work into Hand files
- Added fixed-point data packing, for use in sending hand offsets
2013-06-28 07:57:02 -07:00
Eric Johnston
b4f5df17ab
(re-commit) Added support for Leap finger-sensing device.
...
Note that the actual Leap SDK can't be in the repo for IP reasons, so there's a stub-version of the header. When the actual SDK is put into the Leap folder, cake will find it automatically and switch over.
2013-06-27 10:54:36 -07:00
Stephen Birarda
1c0b256f92
remove echo cancellation from audio code
2013-06-26 16:22:54 -07:00
tosh
7690ace2c3
Merge branch 'master' of git://github.com/worklist/hifi into 19377
...
Conflicts:
interface/src/Audio.cpp
2013-06-22 05:35:31 +02:00
tosh
4f692aeb56
improves bandwidth meter layout / simplifies & fixes rendering
2013-06-22 05:07:01 +02:00
tosh
290c20bfc7
introduces bandwidth meter / dialog
2013-06-22 04:22:10 +02:00
birarda
bd0d820fc7
Merge pull request #556 from PhilipRosedale/master
...
Dynamic jitter buffer for less stuttering, fixes to stereo
2013-06-21 14:29:45 -07:00
Andrzej Kapolka
483407a3f2
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-21 14:09:38 -07:00
Andrzej Kapolka
0000eac95f
Implementation parameter name should match interface parameter name.
2013-06-21 14:02:35 -07:00
Eric Johnston
6825274b65
Re-issue of change which adds two-finger touch look to avatar.
...
The option is un-checked by default because of an unsolved problem: We're getting the events into Qt very slowly, so input from several seconds ago is still active when the user has stopped the touch action. This needs to be fixed before this can be turned on full-time.
Corrections were made per feedback, and the change has been merged with the latest.
2013-06-21 13:43:23 -07:00
Philip Rosedale
1f6fd31b52
Merge pull request #568 from ey6es/opencv
...
Head roll, lean from webcam data.
2013-06-21 11:41:21 -07:00
Andrzej Kapolka
0e223b90d9
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-21 11:35:23 -07:00
Andrzej Kapolka
00eba63e4e
Added various options to test for voxel avatars, manual third person mode
...
(also, cleaned up the camera switching a little).
2013-06-21 11:33:38 -07:00
Philip Rosedale
13b729d9b4
Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar.
2013-06-20 18:49:05 -07:00
Stephen Birarda
8b7b0d542a
send the interface startup time to log stash
2013-06-20 15:34:17 -07:00
Andrzej Kapolka
b0dd5223e1
Avatar head roll/lean based on webcam data.
2013-06-20 14:20:03 -07:00
Andrzej Kapolka
b14a0c1554
Reset webcam along with other sensors on spacebar, added settings config for
...
non-Apple.
2013-06-20 11:44:47 -07:00
Philip Rosedale
c740400224
Merge fixes plus auto jitter buffer
2013-06-20 10:54:58 -07:00
Philip Rosedale
2c8c34f9bd
set jitter buffer on application start to 1/2 of a packet
2013-06-20 09:08:37 -07:00
ZappoMan
517ff0f3cf
Merge pull request #565 from tschw/19371
...
Code Review for Job #19371
2013-06-19 21:08:55 -07:00
Philip Rosedale
5dae92d610
Merge pull request #560 from ZappoMan/occlusion_culling
...
Occlusion culling optimizations
2013-06-19 19:26:56 -07:00
tosh
72a29979d0
Merge branch 'master' of git://github.com/worklist/hifi into 19371
...
Conflicts:
interface/CMakeLists.txt
2013-06-20 03:46:25 +02:00
ZappoMan
cadd596508
implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares
2013-06-19 17:52:01 -07:00
Philip Rosedale
3304f0eb2e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-19 16:03:20 -07:00
Philip Rosedale
bc374d0183
More audio tweaks
2013-06-19 16:02:56 -07:00
tosh
651dc19427
separates echo cancellation from loopback test (intermediate commit)
2013-06-19 23:55:15 +02:00
Andrzej Kapolka
68371f8c3f
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-19 11:04:12 -07:00
Andrzej Kapolka
352f7ca3cf
Provide option to enable/disable webcam (disabled by default).
2013-06-19 10:46:54 -07:00
Andrzej Kapolka
dbde66cbd5
Use trigger to change the state of the menu actions; that way, we get the
...
callbacks.
2013-06-19 10:32:55 -07:00
tosh
7342b7a774
Merge branch 'master' of git://github.com/worklist/hifi into 19371
2013-06-19 16:15:38 +02:00
Andrzej Kapolka
9e92ea03da
Rather than copying to a QImage, just send the pointer. Also, put the render
...
code in Webcam itself.
2013-06-18 12:13:40 -07:00
ZappoMan
46d7ada753
code cleanup
2013-06-18 10:21:47 -07:00
ZappoMan
8331fc1acb
removed some old debug code
2013-06-18 10:19:49 -07:00
ZappoMan
7fe6c0e3b3
added occlusion culling menu option
2013-06-18 09:34:12 -07:00
Philip Rosedale
002f8c736f
Added adjustable audio jitter buffer (in preferences), and simple lowPassFilter (for pert testing compared to LPF)
2013-06-17 18:30:02 -07:00
Andrzej Kapolka
a771f53df3
Read the webcam frames in a separate thread, since the call blocks.
2013-06-17 18:07:53 -07:00
Andrzej Kapolka
3c58f0c0a7
Must init webcam after OpenGL.
2013-06-17 16:24:47 -07:00
Andrzej Kapolka
c7ddc89803
Basic frame grab from camera; not currently working yet, but let's try on
...
OS X!
2013-06-17 15:06:40 -07:00
tosh
e3da925e46
Merge branch 'master' of git://github.com/worklist/hifi into 19371
2013-06-17 07:18:19 +02:00
tosh
66f350d846
echo cancellation: ui, calibration, visualization
2013-06-17 07:16:29 +02:00
ZappoMan
c9e1c898c2
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-14 19:50:38 -07:00
