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
Philip Rosedale
12ef87e073
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-21 14:23:49 -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
6eafd6582e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-21 11:42:29 -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
Philip Rosedale
04736fefb5
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-13 15:04:41 -07:00
Philip Rosedale
f6e6ceddfe
Head camera scaling always one if gyros off so that mouse look works.
2013-06-13 14:53:10 -07:00
Philip Rosedale
1556886a64
fixing reversed lookat, rendering for all avatars
2013-06-13 14:33:09 -07:00
Philip Rosedale
687966c486
Other people's avatar's look where they are mousing
2013-06-13 14:04:51 -07:00
Philip Rosedale
e32f9f387a
Basic random eye movements added, and fixation on camera in mirror mode.
2013-06-13 13:50:56 -07:00
ZappoMan
40c2cf2d44
removed some dead code
2013-06-13 13:31:26 -07:00
ZappoMan
8320925add
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-13 13:30:18 -07:00
Andrzej Kapolka
78072fbde0
Merge pull request #523 from PhilipRosedale/master
...
Better physics, first person to third person transition
2013-06-13 12:07:06 -07:00
Philip Rosedale
b85f91a7d4
fixes per code review
2013-06-13 12:05:06 -07:00
Philip Rosedale
61b1a2f995
First person to third person transition driven by velocity, changes to make moving and flying physics more fun.
2013-06-13 11:31:41 -07:00
Andrzej Kapolka
db729a04aa
Converted double timestamps to long long (64 bit integers), fixed bug with
...
updating agent timestamps.
2013-06-13 11:11:59 -07:00
ZappoMan
72b2845178
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-13 09:40:45 -07:00
Philip Rosedale
c0ba2aeebe
Added jumping, tuned friction model, tuned thrust
2013-06-12 23:45:59 -07:00
ZappoMan
0f234d739e
remove Camera menu from frustum debugging, because its obsolete and only causes problems
2013-06-12 21:44:49 -07:00
Philip Rosedale
a5a0df09cb
removed grab voxel rendering
2013-06-12 16:36:55 -07:00
Philip Rosedale
3d1ddf047e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 16:27:53 -07:00
Andrzej Kapolka
ccd61ee5a2
Found the problem we were having: the domain server was reporting back all
...
kinds of things as our ID.
2013-06-12 16:13:44 -07:00
Andrzej Kapolka
19180ad900
Put the debugging back in.
2013-06-12 15:56:28 -07:00
Andrzej Kapolka
e4ed9162b9
This should help, as well as fix another annoyance: bind to an ephemeral port,
...
rather than a fixed one.
2013-06-12 15:52:29 -07:00
Philip Rosedale
311b09eee0
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 14:30:48 -07:00
Andrzej Kapolka
f197b4cd62
Some debugging to use on the other machine.
2013-06-12 14:20:28 -07:00
Andrzej Kapolka
b28df17207
Slight tweak: we need to call trigger in order to get the full toggle
...
behavior.
2013-06-12 13:51:16 -07:00
Andrzej Kapolka
178996bb8b
Make sure first person mode and mirror mode are mutually exclusive.
2013-06-12 13:30:41 -07:00
Philip Rosedale
6cffb16279
merge fixes
2013-06-12 13:29:17 -07:00
Andrzej Kapolka
52c616b688
Added configurable lean scale, fixed loadSetting.
2013-06-12 13:06:28 -07:00
Philip Rosedale
26ca1a9a1d
Remove shortcut on ground plane 'G', was conflicting with turning gravity on/off
2013-06-12 12:58:45 -07:00
ZappoMan
627f61badb
some debug changes for testing occlusion culling
2013-06-12 12:36:28 -07:00
Philip Rosedale
3546bcc101
Avatar can set velocity, velocity set to zero on reset
2013-06-12 11:36:28 -07:00
ZappoMan
636030b0bb
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-12 01:17:03 -07:00
ZappoMan
e2d22a8e21
latest cut at occlusion culling
2013-06-12 01:16:46 -07:00
Philip Rosedale
750d210f0a
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-11 21:20:39 -07:00
Philip Rosedale
ad58d0aa23
Adding voxel thrust on grabbing/dragging to move avatar
2013-06-11 21:19:58 -07:00
Andrzej Kapolka
648aacb53d
Let's use a fixed vector for the camera position so that the target doesn't
...
move with lean.
2013-06-11 17:26:41 -07:00
ZappoMan
ac7fbc6320
added occlusion tests to debug menu
2013-06-11 13:29:01 -07:00
ZappoMan
ab365202c8
added some debugging routines to visualize occlusion
2013-06-11 12:36:15 -07:00
Philip Rosedale
57fcaceec2
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-11 11:10:41 -07:00
Philip Rosedale
b1e3a0984b
Improved mouse look behavior to be smoother, removed transmitter debug.
2013-06-11 11:10:09 -07:00
ZappoMan
74d63cdd1d
Merge pull request #522 from birarda/conditional-ds
...
allow agents to specify which agent types they want to hear about
2013-06-11 00:47:36 -07:00
ZappoMan
27f8f5dcb8
fix CR feedback
2013-06-10 14:50:04 -07:00
Stephen Birarda
a8075e44ca
Merge remote-tracking branch 'upstream/master' into conditional-ds
2013-06-10 14:01:54 -07:00
Stephen Birarda
7fb42dcb8a
fix bug with sent and received agent interest packets
2013-06-10 13:48:34 -07:00
ZappoMan
fc3fb7d3f0
fixed bug with loading of corrupt settings file where NaN returned for avatar position details
2013-06-10 11:46:06 -07:00
Philip Rosedale
fb97d3e04b
Merge pull request #520 from tschw/19367
...
Code Review for Job #19367
2013-06-10 08:04:16 -07:00
atlante45
c96e01ef51
Fixed merge conflict
2013-06-09 23:15:49 +02:00
atlante45
b1aabc2c1f
Added shortcup for gravity use
2013-06-09 23:02:45 +02:00
Geenz
8dea00052d
Merge branch 'master' of https://github.com/worklist/hifi into 19361
2013-06-09 02:08:29 -04:00
ZappoMan
b60df9ce89
Merge pull request #512 from ey6es/gyroquat
...
Fixes for preferences: store avatar voxel URL along with other avatar settings, use QAction rather than separate boolean for autosave.
2013-06-08 21:36:07 -07:00
ZappoMan
b69cfd4e06
fixed CR spacing issue
2013-06-08 17:27:48 -07:00
tosh
9ca0b5e7a7
removes blank lines that slipped in
2013-06-08 02:35:55 +02:00
tosh
d39b25a17b
adds menu option to set whether ground plane gets rendered
2013-06-08 02:31:23 +02:00
ZappoMan
46c66c39e5
implement keyhole frustum
2013-06-07 17:23:23 -07:00
atlante45
5c07638ce2
19369 - Added "Use Gravity" option
2013-06-08 02:05:54 +02:00
Andrzej Kapolka
ac2b7d7f48
Fix for initial camera transition.
2013-06-07 15:20:26 -07:00
Stephen Birarda
1e05936aea
unthread DS check in, allow agents to tell DS who they want to hear about
2013-06-07 15:19:12 -07:00
Stephen Birarda
fc27c2c7bb
more renaming for AGENT_TYPE_VOXEL_SERVER
2013-06-07 14:14:13 -07:00
Andrzej Kapolka
75c89f2c22
OK, I found the problem: duplication of state for the "autosave" option.
...
Let's just use the QAction, as does everything else.
2013-06-07 13:42:49 -07:00
Geenz
89ef026ce8
Remove seemingly unnecessary coordinate space conversion.
2013-06-07 16:42:22 -04:00
Geenz
65ec02044e
Add a distance check for selected voxels.
2013-06-07 16:34:10 -04:00
Geenz
1c8d4f7717
Get the average velocity of the avatar.
2013-06-07 16:20:51 -04:00
Andrzej Kapolka
9da10df9f2
We need to set these before initMenu, as that's where we create the QSettings.
2013-06-07 13:12:59 -07:00
Geenz
82db388552
Real max velocity stuff.
2013-06-07 16:08:27 -04:00
Geenz
c79bd71fe7
Merge branch 'master' of https://github.com/worklist/hifi into 19361
2013-06-07 16:00:33 -04:00
Geenz
86316bc674
Don't render the voxel selection when we're moving over a maximum velocity.
2013-06-07 16:00:13 -04:00
