Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-12 11:07:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6227 commits 25 branches 0 tags 1.1 GiB
Commit graph

3178 commits

Author SHA1 Message Date
Andrzej Kapolka
415949cc26 Terminology change to reflect the fact that we're no longer using the mean. 2013-07-31 14:40:33 -07:00
Jeffrey Ventrella
0aaeb4550a cleanup 2013-07-31 13:07:52 -07:00
Jeffrey Ventrella
89f36a7eb7 cleanup 2013-07-31 12:38:40 -07:00
Jeffrey Ventrella
2901b58059 changed variable name from t to effectsTimer 2013-07-31 12:34:43 -07:00
Andrzej Kapolka
729158f882 Added depth smoothing, experimenting with using depth minimum rather than 
mean.
 2013-07-31 12:19:14 -07:00
Jeffrey Ventrella
482c5f0f4a turned on leap hand diagram 2013-07-31 12:09:46 -07:00
Stephen Birarda
9e63b78a69 Merge branch 'master' of github.com:worklist/hifi into qt5 2013-07-31 11:35:24 -07:00
Jeffrey Ventrella
1f48de891b Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 11:06:31 -07:00
Philip Rosedale
549832467c Merge branch 'master' of https://github.com/worklist/hifi 2013-07-30 16:42:21 -07:00
Andrzej Kapolka
353d674ad9 Masking tweak. 2013-07-30 15:56:47 -07:00
Andrzej Kapolka
96bd7dbe25 Removed the magic from a number. 2013-07-30 15:30:34 -07:00
Andrzej Kapolka
c787781efb Send color and depth as separate streams (rather than one on top of the other) 
so that we can control their bitrates separately.
 2013-07-30 15:11:32 -07:00
Philip Rosedale
98ec2efc01 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-30 14:55:33 -07:00
Andrzej Kapolka
f8ba1c4be1 Use the V channel to provide masking information, indicating invalid depths. 2013-07-30 13:42:29 -07:00
atlante45
1b2f236d42 Follow mode operationnal 2013-07-30 12:30:15 -07:00
ZappoMan
93a8e1782d cleanup 2013-07-30 12:13:45 -07:00
ZappoMan
c7e3fe5ef6 Added false colorization by voxel server source 
- switched readBitstreamToTree() to take params struct for future expansion
- switched readNodeData() to take params for future expansion
- added sourceID to VoxelNode
- fixed false colorize routines to correctly redraw by marking tree as dirty
 2013-07-30 11:08:48 -07:00
Andrzej Kapolka
3c437076a7 When we have a mean face depth, use that rather than the face size to 
estimate the z coordinate.
 2013-07-30 11:07:33 -07:00
Andrzej Kapolka
3b4a4daec3 Ignore maximum values when computing the depth. 2013-07-29 18:26:51 -07:00
Andrzej Kapolka
9c0e29b5e6 Use only valid values to compute mean, and use the post-warp data to avoid 
breaking on head tilt (because we were using the bounds of the rotated rect,
which included too much background).
 2013-07-29 18:16:10 -07:00
Jeffrey Ventrella
c6d301c591 cleanup 2013-07-29 17:21:45 -07:00
ZappoMan
620fe12358 support for multiple voxel servers in ping stats 2013-07-29 16:31:14 -07:00
Jeffrey Ventrella
df32c18994 cleanup 2013-07-29 16:15:44 -07:00
Andrzej Kapolka
de52342a14 Working on depth data processing. 2013-07-29 16:04:15 -07:00
ZappoMan
c5ab321bd9 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-07-29 15:54:52 -07:00
Jeffrey Ventrella
4b07d656f4 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 15:47:22 -07:00
Jeffrey Ventrella
79823c6fed cleanup 2013-07-29 15:47:01 -07:00
Andrzej Kapolka
3b3801915b Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 15:44:41 -07:00
Andrzej Kapolka
6bc3e9b808 Merge pull request #726 from ZappoMan/bug_fixes 
fix bug with dragonfly leaving trailing bits
 2013-07-29 15:44:31 -07:00
ZappoMan
1a73485e36 Improved VoxelNode delete callback based on CR feedback 
- changed hooks to use a virtual base class approach
- switched account of hooks to use a vector instead of home grown solution
- added support for VoxelNode to know what VoxelSystem it belongs to
 2013-07-29 15:30:30 -07:00
Jeffrey Ventrella
a1eba53678 cleanup 2013-07-29 15:09:38 -07:00
Jeffrey Ventrella
f8392c0843 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 15:07:56 -07:00
Jeffrey Ventrella
37ff8ae030 added color modulation 2013-07-29 15:07:05 -07:00
ZappoMan
86bf268eef first cut at multiple voxel servers 2013-07-29 14:56:33 -07:00
Andrzej Kapolka
fac3ff1089 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 14:35:31 -07:00
ZappoMan
03a75ab295 fixed spacing 2013-07-29 13:08:05 -07:00
ZappoMan
97aaa738c3 fixed typo 2013-07-29 13:07:12 -07:00
ZappoMan
d6428a8145 removed unneeded cast 2013-07-29 13:03:42 -07:00
ZappoMan
6a2bab2a2c Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-29 13:02:14 -07:00
Mark Peng
bfd7f3a6c9 Remove rendering of your own avatar's lookatVectors. This fixes the 
behavior where if you are moving and jumping, you will occasionally see
your own lookatVectors on your screen.
 2013-07-29 12:25:01 -07:00
Mark Peng
bd663a8c22 Merge remote-tracking branch 'upstream/master' 2013-07-29 12:09:27 -07:00
Mark Peng
d01f694d49 Remove extra semicolon in avatar.cpp 2013-07-29 11:52:29 -07:00
Andrzej Kapolka
1f076cc268 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 10:50:55 -07:00
Andrzej Kapolka
20360ad3e9 Make particle system update/render toggleable, fix GCC compile warnings. 2013-07-29 10:41:45 -07:00
Andrzej Kapolka
b02c5f103d Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 10:14:39 -07:00
Andrzej Kapolka
5812747ef8 Double the bitrate to see if we can reduce the blockiness. 2013-07-29 10:06:03 -07:00
Jeffrey Ventrella
f83ee1e0b5 cleanup 2013-07-29 09:48:28 -07:00
Mark Peng
dd2655825a Fix first person camera positioning to correspond to eyelevel. 
This makes sure the lookatVectors don't seem to point upwards when
looking at you.
 2013-07-26 16:08:17 -07:00
Jeffrey Ventrella
a5a9784e6b cleanup 2013-07-26 15:44:32 -07:00
Jeffrey Ventrella
65278609f2 cleanup 2013-07-26 15:40:06 -07:00
Jeffrey Ventrella
937574a6b5 cleanup 2013-07-26 15:25:13 -07:00
Jeffrey Ventrella
05e0bf3e84 added collision plane 2013-07-26 15:21:10 -07:00
Jeffrey Ventrella
8cecd67731 cleanup 2013-07-26 12:46:27 -07:00
Jeffrey Ventrella
ad00747c29 cleanup 2013-07-26 12:44:17 -07:00
Jeffrey Ventrella
9890cf72ce added keyboard mode switching for rave glove effects 2013-07-26 12:37:37 -07:00
ZappoMan
4cca7e2572 Fixed issue with freeing up abandoned VBO slots when not moving with animation 2013-07-26 11:44:19 -07:00
ZappoMan
0c95dc4adf Fixed voxel trails from animations 
- removed stageForDeletion behavior of VoxelNode
- replaced with VoxelNodeDeletionHook strategy
- VoxelSystem now cleans up previously used VBO index slots via hook
 2013-07-26 11:12:48 -07:00
atlante45
f3c87b81ec Avatar can follow but don't look at the same point for the moment 2013-07-25 16:14:47 -07:00
Stephen Birarda
08b94d731f merge branch qt5 with upstream/master 2013-07-25 10:23:22 -07:00
Jeffrey Ventrella
1d5bf20b80 clean up 2013-07-24 17:03:35 -07:00
Jeffrey Ventrella
5e2dcfee53 cleaned up some magic numbers 2013-07-24 16:52:37 -07:00
Jeffrey Ventrella
aee29a0ab1 cleaning up the particle system more 2013-07-24 16:37:13 -07:00
atlante45
68194f2037 Slot calling when pie menu on avatar. 2013-07-24 13:50:00 -07:00
Jeffrey Ventrella
288a218ae2 Merge remote-tracking branch 'upstream/master' into particles 2013-07-24 12:41:32 -07:00
Jeffrey Ventrella
2f28f3ea4b made some extra checks for bogus data coming in, and added more particle effects to rave glove hand 2013-07-24 12:41:01 -07:00
atlante45
d165891fe6 New design for pie menus 2013-07-24 12:38:35 -07:00
Stephen Birarda
7134d13001 tweaks for iOS compatibility 2013-07-24 12:34:32 -07:00
Stephen Birarda
f27eb5e1d8 small code changes for qt5 compatibility 2013-07-24 12:06:55 -07:00
atlante45
177471e83b First step toward follow mode 2013-07-24 11:24:28 -07:00
atlante45
fec25d374f merge 2013-07-24 10:35:57 -07:00
ZappoMan
31a1e3e7b5 Merge pull request #720 from LionTurtle/master 
Fix eyePosition so that lookatVectors point directly to eyes,
 2013-07-24 01:19:49 -07:00
Mark Peng
7177b71bc7 Replace var in renderLookatIndicator with const IDENTITY_UP 2013-07-24 00:19:25 -07:00
Jeffrey Ventrella
f85690c1c4 Merge remote-tracking branch 'upstream/master' into particles 2013-07-23 20:46:34 -07:00
Jeffrey Ventrella
903a248061 cleaned up some code and added asserts to help track down a crash 2013-07-23 20:46:09 -07:00
ZappoMan
e7fb392f38 Merge branch 'master' of https://github.com/worklist/hifi into audio_select 2013-07-23 20:20:49 -07:00
ZappoMan
eb8c565350 dry up code 2013-07-23 20:08:57 -07:00
ZappoMan
9507cd8955 switched to vector 2013-07-23 19:54:29 -07:00
ZappoMan
a162643e1e more removing of SourceID from classes 2013-07-23 19:21:43 -07:00
ZappoMan
13ba913fab made listen mode a typedef 2013-07-23 18:28:30 -07:00
Stephen Birarda
fb05726323 Merge pull request #718 from ZappoMan/voxel_stats 
Sends Voxel Stats from server to client
 2013-07-23 18:16:57 -07:00
Jeffrey Ventrella
062ee657ca added extra mode and started prototyping "ribbon" effect 2013-07-23 14:41:52 -07:00
ZappoMan
c969570e8c working on selected audio 2013-07-22 23:05:42 -07:00
Mark Peng
4e641eed2f LookatIndicator now scales with the avatar's scale. 2013-07-22 17:11:11 -07:00
Mark Peng
0f1ac2b226 Fix eyePosition so that lookatVectors point directly to eyes, 
even when looking at someone from above.
 2013-07-22 16:46:06 -07:00
Jeffrey Ventrella
90bc3e9a37 um, ok whatever 2013-07-22 14:08:41 -07:00
Jeffrey Ventrella
9f99bff791 Merge remote-tracking branch 'upstream/master' into particles 2013-07-22 14:08:19 -07:00
Jeffrey Ventrella
fdebe166ba fixed it so both leap hands produce particles 2013-07-22 14:07:51 -07:00
ZappoMan
d3c46cce8f CR feedback 2013-07-22 14:01:47 -07:00
ZappoMan
307cfcc7a2 CR feedback 2013-07-22 13:58:15 -07:00
ZappoMan
c301b799c5 first cut at selecting audio sources 2013-07-22 13:54:47 -07:00
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
atlante45
13952a6f24 Merge with pie_menu 2013-07-21 15:22:43 -07:00
ZappoMan
c3fa37019e replaced old voxel stats with new voxel stats 2013-07-21 05:18:35 -07:00
ZappoMan
86ad0da09f Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-20 11:35:10 -07:00
ZappoMan
e0f115298d additional stats items 2013-07-20 11:28:12 -07:00
Jeffrey Ventrella
ad0ca748bb added extra mode and improved particle system 2013-07-20 09:48:55 -07:00
Eric Johnston
d10ffd4f2d Small .h fix after testing without Leap libs 2013-07-19 19:53:30 -07:00
Eric Johnston
0cdad1a313 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 19:48:52 -07:00
Eric Johnston
b8cf4a9775 Rave glove: stabilization of Leap hands 2013-07-19 19:47:07 -07:00
ZappoMan
4e8ce1b193 tweaks to stats dialog 2013-07-19 18:15:06 -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
ZappoMan
83290bc8b7 first cut at real voxel stats dialog box 2013-07-19 17:28:37 -07:00
atlante45
72774a5e20 First step toward pie menus 2013-07-19 17:01:38 -07:00
Jeffrey Ventrella
ed2780062b clean up 2013-07-19 16:23:02 -07:00
Jeffrey Ventrella
6e84481931 Merge remote-tracking branch 'upstream/master' into particles 2013-07-19 16:08:43 -07:00
Jeffrey Ventrella
7f3750f1f0 clean up 2013-07-19 16:08:19 -07:00
ZappoMan
2cc42f6773 support piggybacking voxel and voxel stats messages into single packet 2013-07-19 15:59:47 -07:00
Andrzej Kapolka
353f16b2d0 Style fixes. 2013-07-19 15:56:04 -07:00
Jeffrey Ventrella
d2d8019e73 Merge remote-tracking branch 'upstream/master' into particles 2013-07-19 15:51:14 -07:00
Jeffrey Ventrella
87d9aae328 improvements to particle system 2013-07-19 15:50:40 -07:00
Andrzej Kapolka
f70b4dcab2 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-19 15:49:07 -07:00
ZappoMan
d9c8a59929 send voxel scene stats from server to client 2013-07-19 15:09:38 -07:00
Eric Johnston
262851346c Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing) 
This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.
 2013-07-19 09:31:45 -07:00
Eric Johnston
28bf0b5147 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 08:47:37 -07:00
Mark Peng
a14768bb29 Remove more unnecessary additions. 2013-07-19 01:00:55 -07:00
Mark Peng
ceb743a65d Remove unncessary import math.h (for reals). 2013-07-19 00:56:12 -07:00
Mark Peng
fc22240525 Remove unnecessary import math.h. 2013-07-19 00:55:31 -07:00
Mark Peng
a84c1c9e21 Merge remote-tracking branch 'upstream/master' 2013-07-19 00:46:52 -07:00
Mark Peng
927aea8bb4 Bug fix on lookatVectors (fixed scale in head.cpp). Added bool 
isLookingAtOtherAvatar. Basic halo indicator in Application.cpp.
 2013-07-19 00:44:23 -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
Mark Peng
cfcb31172c Merge remote-tracking branch 'upstream/master' 2013-07-18 21:08:08 -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
Stephen Birarda
ef7dc4a39a if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME 2013-07-18 17:42:25 -07:00
Andrzej Kapolka
b8be66c6fc Now able to stream depth data. 2013-07-18 17:39:49 -07:00
Stephen Birarda
01e6891fd3 save custom domain server hostname to QSettings 2013-07-18 17:23:52 -07:00
Philip Rosedale
c74287160f merged 2013-07-18 16:52:56 -07:00
Philip Rosedale
4af92d46f3 Set lookAt to hovered voxel 2013-07-18 16:50:37 -07:00
Stephen Birarda
a00b95666a don't listen to VS packets not from current VS 2013-07-18 15:49:07 -07:00
Stephen Birarda
45d82dc97c correct reference to new hostname for Qt temp variable changes 2013-07-18 15:20:05 -07:00
Stephen Birarda
4dd6afc08f fix grabbing of domain server hostname from QString 2013-07-18 14:59:11 -07:00
Stephen Birarda
04a2dd3b86 clear environment data on domain server switch 2013-07-18 14:36:55 -07:00
Mark Peng
fe01067473 Merge remote-tracking branch 'upstream/master' 2013-07-18 14:35:41 -07:00
Mark Peng
7ee0d8da2e Render circle in 3D space for lookatIndicator. Still not normal to the screen. 2013-07-18 14:34:51 -07:00
Andrzej Kapolka
7ce04444fc Most of the way towards working video encoding. 2013-07-18 14:14:44 -07:00
Eric Johnston
06aeba7d29 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-18 12:27:47 -07:00
Philip Rosedale
b3b8ef3347 Gyros don't move view for small head movements 2013-07-18 11:24:39 -07:00
Philip Rosedale
0b10169915 More audio collision on hover experiments 2013-07-18 11:13:16 -07:00
Philip Rosedale
e6cd90fa37 Merge pull request #704 from Ventrella/particles 
more code cleanup
 2013-07-18 11:08:18 -07:00
Stephen Birarda
2ad99f3129 point to stars file on non-SSL for easier RV redirect 2013-07-18 10:26:08 -07:00
Jeffrey Ventrella
f89b1fcd4c more clean up of particle system 2013-07-17 18:10:30 -07:00
Andrzej Kapolka
8863645dc9 Working on transmitting and receiving the face video. 2013-07-17 18:02:27 -07:00
Mark Peng
6006b8e96b Merge remote-tracking branch 'upstream/master' 2013-07-17 17:28:12 -07:00
Mark Peng
125bcc46f4 Circle drawn with camera orientation as its normal for lookatIndicator. 2013-07-17 17:27:15 -07:00
Philip Rosedale
3111303c32 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-17 17:15:25 -07:00
Philip Rosedale
5f51464230 Start clicking on voxels makes sound 2013-07-17 17:15:19 -07:00
Jeffrey Ventrella
9c2ea6e7e4 more clean up 2013-07-17 17:07:53 -07:00
Eric Johnston
cb6f542b9f First-pass finger motion trails 2013-07-17 17:00:23 -07:00
Jeffrey Ventrella
1264b3ce66 removed deprecated code 2013-07-17 17:00:18 -07:00
Jeffrey Ventrella
ea7e16660c Merge remote-tracking branch 'upstream/master' into particles 2013-07-17 16:43:57 -07:00
Jeffrey Ventrella
be5612711b clean up of particle system 2013-07-17 16:43:34 -07:00
Eric Johnston
57c2f16894 Merge branch 'master' of https://github.com/worklist/hifi into dev4 
Conflicts:
	interface/src/Hand.cpp
 2013-07-17 16:42:11 -07:00
Eric Johnston
aa0cab2180 Code review issues addressed. 2013-07-17 16:09:24 -07:00
Jeffrey Ventrella
4389389f17 Merge remote-tracking branch 'upstream/master' into particles 2013-07-17 16:03:38 -07:00
Jeffrey Ventrella
1f1259cec5 added particle life stages 2013-07-17 16:03:10 -07:00
Eric Johnston
1a4a165c8b Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-17 15:55:20 -07:00
Philip Rosedale
52d8ece38a remove old pre-movement of avatar in gravity 2013-07-17 15:03:56 -07:00
Philip Rosedale
c0ef05f69f Merge branch 'master' of https://github.com/worklist/hifi 2013-07-17 14:58:21 -07:00
Philip Rosedale
4272f4da57 Tiny sliding with gravity removed 2013-07-17 14:57:29 -07:00
Eric Johnston
8ebf5fbd6b Rave & Leap: cleanup and move over to new hand/finger structures 2013-07-17 14:54:18 -07:00
Jeffrey Ventrella
d0dffb464b added emitter particle 2013-07-17 14:51:11 -07:00
Mark Peng
0bbea078b5 Merge remote-tracking branch 'upstream/master' 2013-07-17 13:52:46 -07:00
Mark Peng
5ffe3fa4b4 Rendering of indicator circle in 3D space. Spacing edits in util. 2013-07-17 13:52:05 -07:00
Jeffrey Ventrella
202fb95102 turned off setShowingEmitter 2013-07-17 13:51:00 -07:00
Jeffrey Ventrella
5a0fcb7f6c adding more behavior to the particle system 2013-07-17 13:47:18 -07:00
Eric Johnston
46c5383d10 minor cleanup 2013-07-17 12:54:44 -07:00
Eric Johnston
f9bfc8af82 Merge branch 'master' of https://github.com/worklist/hifi into dev4 
Conflicts:
	interface/src/Hand.cpp
 2013-07-17 12:49:31 -07:00
Andrzej Kapolka
640ecd7f94 Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
Jeffrey Ventrella
c33e4fe6f7 file mode reverts 2013-07-17 10:15:42 -07:00
Jeffrey Ventrella
98dd83dde8 ahibfasubhdf 2013-07-17 10:02:23 -07:00
Jeffrey Ventrella
0be15231b9 ahibfasubhdf 2013-07-17 10:01:23 -07:00
Philip Rosedale
984332e638 fixes per review 2013-07-17 09:51:04 -07:00
Eric Johnston
f21d2a477d Rave Glove Demo: Restructuring palm and finger data structures 2013-07-17 08:29:50 -07:00
Eric Johnston
39130aef58 Rave Glove demo: activation mode and stage (dark backdrop) drawing. 2013-07-16 18:10:54 -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
Philip Rosedale
2a207f4a30 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-16 17:32:24 -07:00
Eric Johnston
cf38a0e837 Avatar's arm follows real or simulated Leap glove, if present. 
This is a tiny change, and the effect is pretty good.
It's only active if there's a Leap device connected and you're using it, or else if you've used the Debug menu item to fake a Leap glove.
 2013-07-16 17:02:40 -07:00
Philip Rosedale
59810cac99 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-16 16:41:02 -07:00
Philip Rosedale
192ae63789 Colliding with ground, voxels makes interesting sounds and flashes your display 2013-07-16 16:40:50 -07:00
Stephen Birarda
7cec2f5ffd use fprintf instead of printf and flush for qDebug 2013-07-16 15:27:14 -07:00
Stephen Birarda
1e0f3e4d1c Merge pull request #686 from Atlante45/few_avatar_resizing_correction 
Few avatar resizing correction
 2013-07-16 14:31:27 -07:00
Stephen Birarda
8464a013fe fix format string warnings in Application 2013-07-16 13:39:24 -07:00
Stephen Birarda
c78759da16 cleanup printLogs reintroduce on merge with upstream master 2013-07-16 13:37:16 -07:00
Stephen Birarda
9d62e7f187 Merge remote-tracking branch 'upstream/master' into qdebug 2013-07-16 13:34:42 -07:00
Stephen Birarda
ce0c9e2e1a flush stdout in case non new-line output is received 2013-07-16 12:58:16 -07:00
Stephen Birarda
16d603e203 clean up extra new lines and LogDisplay line break 2013-07-16 12:53:43 -07:00
Andrzej Kapolka
fd1671a44f Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-16 12:48:24 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
Andrzej Kapolka
e81fed2622 Calling glInterleavedArrays enables the client vertex/color array states, so 
we need to disable them afterwards.
 2013-07-16 12:31:58 -07:00
atlante45
b10c395440 Merge branch 'master' of http://github.com/worklist/hifi into few_avatar_resizing_correction 2013-07-16 12:05:11 -07:00
atlante45
f713bb961d Adapt avatar message size to the avatars 2013-07-16 12:04:22 -07:00
atlante45
13762da7d8 Changed shortcuts to ALT+ +/- 2013-07-16 12:03:07 -07:00
Stephen Birarda
063094f96c correctly break on end of qDebug message in LogDisplay 2013-07-16 12:00:14 -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
Stephen Birarda
51d1e6ae80 add a message handler to send messages over to LogDisplay 2013-07-16 11:50:40 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
atlante45
2a62f8b4fd Merge branch 'master' of http://github.com/worklist/hifi into scale_in_settings 2013-07-16 10:55:39 -07:00
atlante45
64ba01e23c added scale to settings 2013-07-16 10:54:58 -07:00
Philip Rosedale
be30a27a4f Merge branch 'master' of https://github.com/worklist/hifi 2013-07-16 10:45:21 -07:00
Stephen Birarda
3f9865759c Merge pull request #682 from ZappoMan/bug_fixes 
Import Voxels and Paste Bug fixes
 2013-07-16 10:11:11 -07:00
ZappoMan
440352c584 white space 2013-07-16 10:02:27 -07:00
ZappoMan
42e5440b7b CR feedback 2013-07-16 10:00:55 -07:00
Philip Rosedale
edf031b985 improve collision sounds, difference between ground and voxels 2013-07-15 22:42:55 -07:00
Philip Rosedale
d05108e26d Merge branch 'master' of https://github.com/worklist/hifi 2013-07-15 19:59:26 -07:00
Eric Johnston
802abade4f Fixed problem in idle(), causing events to stack up. 
The problem was that idle() was set on a zero-ms timer (using idleTimer->start(0)), and the time is then self-regulated by returning early if it's not time yet.
Because of this, Qt stays perpetually in the timer servicing, instead of processing events. This causes keys and menu items to be delayed if the user drags the mouse before activating them, especially at low frame rates. It also causes very-delayed multitouch response.

The fix I've applied is to reset the idle timer after servicing the idle. I've set it to 2ms because I noticed that 1ms didn't always clear out all of the events. We can tune it to whatever we need, or even calculate it based on the time it took us to service the idle.
 2013-07-15 18:16:50 -07:00
ZappoMan
e4b7ba7428 Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:58:45 -07:00
Jeffrey Ventrella
b765de6990 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 17:58:38 -07:00
Jeffrey Ventrella
0481a81ca7 moved finger particles over to hand.cpp 2013-07-15 17:58:17 -07:00
ZappoMan
a3009981d0 added Import Voxels to Clipboard 2013-07-15 17:54:50 -07:00
Stephen Birarda
9f9d8e59bd don't accept voxel packet if rendering is turned off, correct boolean for kill 2013-07-15 17:12:44 -07:00
Stephen Birarda
38d8041bfb kill local voxels when voxel rendering is turned off 2013-07-15 17:12:24 -07:00
ZappoMan
01b7f3868b Merge pull request #672 from birarda/domain-switch 
add an option in preferences to dynamically switch domain servers
 2013-07-15 17:10:18 -07:00
ZappoMan
31875abcab Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:05:10 -07:00
Andrzej Kapolka
d8d9f5e315 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-15 16:54:29 -07:00
Stephen Birarda
c27cd7ae42 couple of type squishes in NodeList 2013-07-15 16:49:36 -07:00
Philip Rosedale
eee8c3e570 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-15 16:27:51 -07:00
Philip Rosedale
26c0eb2dea Start to add heartbeat 2013-07-15 16:27:46 -07:00
ZappoMan
1fb1622beb added sleep to sendVoxelOperation() to keep from overwhelming server 2013-07-15 16:27:23 -07:00
Philip Rosedale
7075258317 Merge pull request #673 from Atlante45/better_import 
Better import
 2013-07-15 16:20:01 -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
4f1e786392 Fix for iris rendering; was broken by scale change. 2013-07-15 16:12:23 -07:00
Andrzej Kapolka
fdeb63c121 More work on face points. 2013-07-15 16:09:49 -07:00
atlante45
bf328c8532 Improved import system copying to clipboard 2013-07-15 16:07:50 -07:00
Stephen Birarda
33ddda2558 correct reference to audio mixer sockaddr_in 2013-07-15 16:02:36 -07:00
Stephen Birarda
a204a8b872 lock the audioMixer to avoid crash when grabbing socket 2013-07-15 16:01:05 -07:00
Stephen Birarda
9fe1c7c63d lock the voxel server when receiving data to avoid race crash 2013-07-15 15:59:31 -07:00
Stephen Birarda
6c2682833e lock on the solo voxelServer before deleting local voxels 2013-07-15 15:53:25 -07:00
Stephen Birarda
6b83f95f9e conditionally set a new hostname on preferences save 2013-07-15 15:46:04 -07:00
Jeffrey Ventrella
56d0c7d7e4 added array of finger emitters for particle system 2013-07-15 15:45:31 -07:00
Stephen Birarda
d389dc6e3a add method to NodeList to set domain IP to local, move mutex lock to node 2013-07-15 15:17:10 -07:00
Jeffrey Ventrella
408edc7dca Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 14:36:32 -07:00
Jeffrey Ventrella
c0f319f077 merge 2013-07-15 14:36:11 -07:00
Eric Johnston
e937f86822 Build fail fix when Leap libs are not present. 2013-07-15 14:33:09 -07:00
Jeffrey Ventrella
f75ce72aca Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 14:30:19 -07:00
Eric Johnston
0239341127 updated per feedback 2013-07-15 14:27:58 -07:00
Philip Rosedale
f8f6b29559 Audio collision sounds are played locally as well as injected 2013-07-15 14:24:21 -07:00
Eric Johnston
c61966ebcd made Leap unit-conversion method public 2013-07-15 14:12:52 -07:00
Jeffrey Ventrella
7d5ade33a3 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 13:58:12 -07:00
Jeffrey Ventrella
84b6adf5b0 more work on particle emitter API 2013-07-15 13:57:39 -07:00
Eric Johnston
86faa33f83 Added fake Leap finger generation so that Ryan and Jeffrey can work on Leap glove-code without needing a Leap sensor at all times. 2013-07-15 13:56:37 -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
atlante45
423a0eaac8 Fixed typo 2013-07-15 12:28:22 -07:00
atlante45
fbcacc8cf7 Few pre-review change for avatar resizing 2013-07-15 12:11:29 -07:00
atlante45
bf3c4fa1f8 Avatar resizing final commit 2013-07-15 12:04:24 -07:00
atlante45
078a47b006 Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 2013-07-15 12:03:04 -07:00
ZappoMan
f415f4081a Fixed a bug in LOD boundaries 
- changed the way we calculate whether or not to render a parent "average" voxel so
  that if any of it's most distant child would not be visible, then it's used instead
  of it's children
- added precalculated value for topFarLeft corner of AABox (optimization)
- changed VoxelSystem::newTreeToArrays() and VoxelTree::encodeTreeBitstreamRecursion()
  to use the same help function for determining this LOD boundary behavior
- deleted old dead code in voxel-server and VoxelTree for picking which node to start
  sending with, since it wasn't being used
- added VoxelNode::furthestDistanceToCamera() which tells you not the distance to the
  center of the voxel, but the distance from the camera to the furthest corner relative
  to the camera.
- added ViewFrustum::getFurthestPointFromCamera() which given an axis-aligned box will
  tell you which vertex of the box is furthest from the camera
 2013-07-15 01:32:14 -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
84bb2aa265 Started on C++ side of SSAO effect. 2013-07-14 18:21:18 -07:00
Andrzej Kapolka
411cb92300 Working on face rendering as point cloud. 2013-07-14 15:54:29 -07:00
tosh
ac3b95efe7 fixes sliced-away initialization (crashes program during shutdown when running without audio device) 2013-07-13 22:51:57 +02:00
Philip Rosedale
8b9e0426b2 Simple glassy collision sound 2013-07-12 21:34:48 -07:00
Jeffrey Ventrella
3bc6b4c0d4 merge 2013-07-12 18:56:54 -07:00
Jeffrey Ventrella
915cb1e5bd Merge remote-tracking branch 'upstream/master' into particles 2013-07-12 18:56:37 -07:00
Jeffrey Ventrella
ae99ca5ec8 added more API for the particle system 2013-07-12 18:55:42 -07:00
atlante45
34cbe317fa Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Webcam.cpp
 2013-07-12 17:57:20 -07:00
atlante45
280afed7f0 added scale in avatar packets eand slots to change it from the menu 2013-07-12 17:51:47 -07:00
Philip Rosedale
832e81b45f Less skeleton averaging, can see first person arms 2013-07-12 17:00:47 -07:00
Jeffrey Ventrella
3649c89c12 more developing on the API for the particle system 2013-07-12 16:19:31 -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
atlante45
35c00c739c resizing avatar now handle the camera 2013-07-12 14:53:51 -07:00
Jeffrey Ventrella
48bf26fb28 Merge remote-tracking branch 'upstream/master' into particles 2013-07-12 14:41:48 -07:00
Jeffrey Ventrella
e6b751e538 more work on particle system 2013-07-12 14:32:14 -07:00
atlante45
16647e3591 Resolve conflict 2013-07-12 13:27:46 -07:00
ZappoMan
006929e45b Merge pull request #660 from PhilipRosedale/master 
Add speed brakes for better flying/walking
 2013-07-12 13:15:22 -07:00
Jeffrey Ventrella
c348c5ec35 Merge remote-tracking branch 'upstream/master' into particles 2013-07-12 12:12:25 -07:00
Jeffrey Ventrella
106d7c225a turned on particle system viewing for pull request 2013-07-12 12:11:51 -07:00
Philip Rosedale
e756fdbee6 Add speed brakes for better flying/walking 2013-07-12 08:28:50 -07:00
Philip Rosedale
4e9530f946 Body slowly turns to follow touch look 2013-07-11 22:31:31 -07:00
Philip Rosedale
4e89c679b9 Oculus will work with touch look (hopefully) 2013-07-11 21:51:13 -07:00
Philip Rosedale
d2dd41ba0f make thrust be in direction of head/view 2013-07-11 21:46:13 -07:00
Philip Rosedale
6609a850eb Gyros and touch look now work at same time 2013-07-11 21:34:42 -07:00
Philip Rosedale
670de73384 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 19:52:39 -07:00
Philip Rosedale
4b95f2bae5 Better thrust values and no jittering when standing 2013-07-11 19:10:34 -07:00
Atlante45
08b0afd466 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 18:17:06 -07:00
Atlante45
d84963040e avatar resized + physic adapted 2013-07-11 18:16:55 -07:00
Stephen Birarda
76dc01e84e fix audio silence on receive bail 2013-07-11 17:55:59 -07:00
Atlante45
12bbec66af Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 17:22:36 -07:00
Eric Johnston
58b50067ad Some Leap finger fixes, but also temporarily disable Leap data sending, due to a crash. 
Will resolve the crash before re-enabling.
 2013-07-11 16:06:31 -07:00
Philip Rosedale
678b30f494 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 15:53:19 -07:00
Philip Rosedale
79b2703e1c Improve avatar movement, added Physics.cpp for routines to help with physics calculations 2013-07-11 15:53:07 -07:00
Andrzej Kapolka
61f6b8b974 Moved all the avatar bits to their own subdirectory. 2013-07-11 14:53:46 -07:00
Atlante45
7f0ab0289e Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 14:10:40 -07:00
Andrzej Kapolka
c3242598f5 Merge pull request #655 from ZappoMan/occlusion_culling 
Make Delta Sending Default, Added option for "Low Res" mode while moving
 2013-07-11 14:08:22 -07:00
ZappoMan
c26e39764a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 13:50:33 -07:00
Atlante45
beefd57b54 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 13:25:42 -07:00
Andrzej Kapolka
08d2c70db5 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 13:19:07 -07:00
ZappoMan
cb59df4b9e Merge pull request #653 from birarda/master 
refactor sendDomainServerCheckIn to avoid static variable threading issue
 2013-07-11 13:08:15 -07:00
ZappoMan
57ce20d3ce add support for Low Res sending while moving 2013-07-11 12:43:43 -07:00
Stephen Birarda
b201d13e31 refactor ping packet sending to push past version byte 2013-07-11 12:42:45 -07:00
Andrzej Kapolka
ee77f59f48 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 12:25:51 -07:00
Andrzej Kapolka
4e524d7125 Compass tweaks: better initial extents, scale extents to compensate for 
anisotropy, converge more quickly on compass heading.
 2013-07-11 12:10:15 -07:00
Atlante45
a335eb2552 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 11:34:07 -07:00
Andrzej Kapolka
aa3f4c6f2c Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 11:21:59 -07:00
Andrzej Kapolka
baca4353a8 Removed stray block. 2013-07-11 11:19:28 -07:00
Andrzej Kapolka
c6d01e0acc Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 11:16:09 -07:00
Stephen Birarda
38a33e0283 couple more type squishes 2013-07-11 11:11:39 -07:00
Andrzej Kapolka
b23875a952 Make sure we shutdown before quitting. 2013-07-11 11:10:14 -07:00
Stephen Birarda
430f255730 type squish in Audio class 2013-07-11 11:10:03 -07:00
Atlante45
409728d665 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 11:04:45 -07:00
Stephen Birarda
64887f2a36 Merge branch 'master' of github.com:worklist/hifi into packet-versions 2013-07-11 11:02:49 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
Andrzej Kapolka
cf7408505f Shut down the webcam when it's turned off, but don't delete the grabber (since 
it has expensive-to-init state like the face cascade).
 2013-07-11 10:53:51 -07:00
Mark Peng
9749e5edd6 Add const var to represent magic num in eyecontact code when gyros 
are on.
 2013-07-11 10:53:38 -07:00
Atlante45
b3f8711f95 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 10:53:27 -07:00
ZappoMan
04cd340f0b add back in correct isViewChanging() 2013-07-11 10:50:17 -07:00
Mark Peng
24d32bcdc8 Fix style mistakes according to code review for eyecontact code. 2013-07-11 10:40:57 -07:00
ZappoMan
9aed3d3cc6 enable delta sending by default 2013-07-11 10:37:28 -07:00
Atlante45
5608a0a3b2 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 10:33:55 -07:00
Mark Peng
29d1e08f48 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:33:21 -07:00
Andrzej Kapolka
d4abceba2b Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 10:28:26 -07:00
Andrzej Kapolka
b62d2d85c3 Let's try actually releasing the camera when we turn it off. 2013-07-11 10:28:09 -07:00
Mark Peng
083e0e9d06 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:20:41 -07:00
Mark Peng
f145a1eac4 Add condition to updateAvatar() where if another avatar's head is at 
the center of the screen, the lookAtPosition is set to the eye level
of that avatar.
 2013-07-11 10:17:45 -07:00
Atlante45
6e2422a547 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 10:13:29 -07:00
Stephen Birarda
beb89e3d2b change some timing types from int to uint64_t to avoid costly assumptions 2013-07-11 10:09:00 -07:00
Stephen Birarda
4ed231670f put back the missing voxels 2013-07-11 10:04:27 -07:00
Stephen Birarda
211204e878 Merge remote-tracking branch 'upstream/master' into timestamps 2013-07-11 09:23:16 -07:00
Philip Rosedale
cf665e10b3 Merge pull request #644 from ZappoMan/occlusion_culling 
Latest Revision of Occlusion Culling & Delta Sending Work - now it's always better and never worse
 2013-07-11 09:05:03 -07:00
Philip Rosedale
8ea2b46264 Merge pull request #641 from ZappoMan/bug_fixes 
Two small bug fixes
 2013-07-11 07:46:57 -07:00
ZappoMan
dc70675c22 removed obsolete ResIn mode 2013-07-10 19:04:28 -07:00
Jeffrey Ventrella
6c3644a2fc merge 2013-07-10 18:32:59 -07:00
Jeffrey Ventrella
420ecddafb Merge remote-tracking branch 'upstream/master' into particles 2013-07-10 18:32:42 -07:00
Jeffrey Ventrella
980a5b7980 cleanup 2013-07-10 18:32:17 -07:00
Jeffrey Ventrella
171c10dabe raised home position 2013-07-10 18:04:19 -07:00
Jeffrey Ventrella
8ae10a6614 added emitter 2013-07-10 17:55:42 -07:00
ZappoMan
3d3eca9afa Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 17:45:04 -07:00
Atlante45
5ae24fc660 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 
Conflicts:
	interface/src/Head.cpp
 2013-07-10 17:39:31 -07:00
Atlante45
906fc04e35 first step toward resizing avatars 2013-07-10 17:35:39 -07:00
Andrzej Kapolka
d59b9ce955 Flip x when in mirror mode, rather than special-casing all the head rotations. 
Also fixed sideways leaning (was correct in mirror mode, incorrect in world).
 2013-07-10 17:31:21 -07:00
Mark Peng
3909217815 Remove unused #include for glm intersect in Application.cpp 2013-07-10 17:24:47 -07:00
ZappoMan
78611e30e7 make occlusion culling default 2013-07-10 17:21:40 -07:00
Mark Peng
c832662807 Remove random print statements from eyecontact code in Application.cpp 2013-07-10 17:20:46 -07:00
Jeffrey Ventrella
84a7a78b8d made a test particle system 2013-07-10 17:15:03 -07:00
ZappoMan
a48f353f2f whitespace cleaned up 2013-07-10 17:07:55 -07:00
ZappoMan
1831cc0de3 removed level param from recursion 2013-07-10 17:06:22 -07:00
Mark Peng
baf9edecc9 Merge remote-tracking branch 'upstream/master' 2013-07-10 16:51:53 -07:00
Andrzej Kapolka
a03a46ad16 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 16:36:21 -07:00
Andrzej Kapolka
100f7c19c3 Merge pull request #636 from PhilipRosedale/master 
Touchlook tuned and always on!
 2013-07-10 16:36:10 -07:00
ZappoMan
6694ef3869 fixed some compiler warnings 2013-07-10 16:33:27 -07:00
ZappoMan
4afda27ee0 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 16:28:51 -07:00
ZappoMan
78c62f29c3 lazy load stars file only if stars render enabled 2013-07-10 16:12:34 -07:00
ZappoMan
d8f368a50c lazy load stars file only if stars render enabled 2013-07-10 16:06:23 -07:00
Mark Peng
62570f0804 Merge remote-tracking branch 'upstream/master' 2013-07-10 16:01:28 -07:00
Mark Peng
0b334f9e5d Make lookAtVectors lock on other avatar's eyes if the mouse is over 
the other avatar's head.

Add rayIntersectsSphere function to Util. glm::intersectRaySphere was buggy.
 2013-07-10 15:56:23 -07:00
Andrzej Kapolka
67afc61fd8 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 15:16:38 -07:00
Andrzej Kapolka
559dc4bb5d Flush the queue so that we don't get any funny data on the initial read. 2013-07-10 15:07:39 -07:00
Andrzej Kapolka
2ffd151a1f Ryan likes the eyelids starting at forty degrees. 2013-07-10 14:40:45 -07:00
Andrzej Kapolka
6a5fb4f535 Removed unused variables, added motion driver library for OS X. 2013-07-10 14:28:06 -07:00
Andrzej Kapolka
0aa1b396db Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 14:08:03 -07:00
Andrzej Kapolka
6fe9a71868 Basic compass fusion. 2013-07-10 14:06:12 -07:00
ZappoMan
09f77279e2 add shortcut key to enable wants occlusion culling 2013-07-10 13:42:43 -07:00
Atlante45
7d94f65448 Linked ZLIB to voxels library 2013-07-10 13:00:16 -07:00
Atlante45
d79acea6a7 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-10 12:46:50 -07:00
Stephen Birarda
70ccef0733 remove avatar data read and write to file 2013-07-10 12:37:23 -07:00
Philip Rosedale
dae79d8a55 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-10 12:20:45 -07:00
Philip Rosedale
2e854b5ed7 Tune and smooth 'Touch Look' and always turned on, old mouseLook code removed. Add vec3 speed test. Smooth simulation by passing exact deltaTime to update() 2013-07-10 12:20:26 -07:00
Mark Peng
4b6e7f1079 Merge remote-tracking branch 'upstream/master' into eyecontact 2013-07-10 11:57:08 -07:00
Mark Peng
e4e7966075 Add print statements to debug eyecontact code in Application.cpp. 2013-07-10 11:56:16 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
ZappoMan
a9b1aa727f added back stars file loading 2013-07-10 11:11:21 -07:00
ZappoMan
abd7dfde8b added vector math timing test 2013-07-10 11:10:03 -07:00
Stephen Birarda
488a4affd3 fix member variable initialization order to remove warnings 2013-07-10 09:59:14 -07:00
Andrzej Kapolka
a116f5a636 Use InvenSense code to handle the rather complicated business of talking the 
sensor into giving us the compass reading.  We're getting it now, but I still
have to figure out how to incorporate it.
 2013-07-09 17:28:23 -07:00
Mark Peng
61ad33d9d0 Merge remote-tracking branch 'upstream/master' into eyecontact 2013-07-09 16:29:56 -07:00
Mark Peng
2a25c97446 Change LookAtPosition of Head to the eye level of another avatar, 
if looking at another avatar in Application.cpp.

Add eyePosition to Head class and bool isLookingAtOther.. in Application.cpp.
 2013-07-09 16:22:41 -07:00
ZappoMan
44357fcfb9 add 'level' param to tree recursion 2013-07-09 13:17:21 -07:00
atlante45
2e036a0e46 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 17:56:18 +02:00
atlante45
dbdbd7a8c4 Incorporating comments for code review (minecraft import) 2013-07-09 17:55:55 +02:00
atlante45
3433cf5a98 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 16:34:12 +02:00
atlante45
2c438e8af3 Fixed broken shortcut (Turn on/off voxels is now Shift + V) 2013-07-09 16:20:55 +02:00
atlante45
b3c0f3fedb More code review for UI job 2013-07-09 15:29:12 +02:00
atlante45
c3b0be5c63 More consts for UI job 2013-07-09 14:49:01 +02:00
atlante45
3c4f8f5120 put hard coded numbers into variables for UI job 2013-07-09 14:17:42 +02:00
atlante45
5d4d0ba43e Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 12:56:27 +02:00
atlante45
5703a60797 Merge branch 'master' of git://github.com/worklist/hifi into 19368 2013-07-09 10:25:58 +02:00
atlante45
d38c1f081c Modified code according to review for UI job 2013-07-09 10:25:46 +02:00
Philip Rosedale
e9f8e50d49 Merge pull request #623 from machinelevel/dev4 
Added safety checks to processEvents(), which was causing problems. Also...
 2013-07-08 17:04:06 -07:00
Philip Rosedale
4936676cc1 Merge pull request #627 from ey6es/kinected 
Basic depth camera support (only built in when OpenNI is available).
 2013-07-08 16:57:10 -07:00
Eric Johnston
c298f78ae9 Fixed multi-touch event loop problems by selectively processing just the touch events. 2013-07-08 16:31:28 -07:00
Eric Johnston
7de2281226 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-08 16:29:51 -07:00
Stephen Birarda
c2ad02def2 Merge pull request #625 from PhilipRosedale/master 
Tuned smooth gyro look to feel better
 2013-07-08 15:55:52 -07:00
Eric Johnston
14374fb0df Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-08 15:31:11 -07:00
Stephen Birarda
aaaba9c42e more packet version refactoring 2013-07-08 15:14:18 -07:00
Stephen Birarda
185d5bb0a2 use packet version helpers for PACKET_TYPE_TRANSMITTER_DATA 2013-07-08 15:01:57 -07:00
Stephen Birarda
202d446f07 use packet version helpers for PACKET_TYPE_AVATAR_VOXEL_URL 2013-07-08 14:59:00 -07:00
Stephen Birarda
374fffb151 use packet version helpers for PACKET_TYPE_SET_VOXEL commands 2013-07-08 14:40:15 -07:00
Stephen Birarda
b816761a74 use packet version helpers for PACKET_TYPE_MICROPHONE 2013-07-08 14:24:08 -07:00
Stephen Birarda
81e6bccd08 use packet version helpers in parseData methods 2013-07-08 14:13:36 -07:00
Andrzej Kapolka
5f3a37139f Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-08 14:04:42 -07:00
Stephen Birarda
c64a961a38 packet version handling in VoxelSystem parseData 2013-07-08 14:01:10 -07:00
Andrzej Kapolka
c5c9debed5 Fix for combined gyro/depth camera. 2013-07-08 13:03:53 -07:00
Andrzej Kapolka
c43994fe03 Orientation -> rotation. 2013-07-08 12:54:27 -07:00
Stephen Birarda
8a684244cc packet versioning for HEAD_DATA packets 2013-07-08 12:53:07 -07:00
Stephen Birarda
5faad80e12 remove ping unknown thread, version for ping reply 2013-07-08 11:58:19 -07:00
Stephen Birarda
5062ae8965 rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning 2013-07-08 11:37:39 -07:00
Andrzej Kapolka
4a22154737 Fix for leaning, smoothing. 2013-07-08 11:35:42 -07:00
Stephen Birarda
047d5b5cab add packet version handling for DS packets 2013-07-08 11:17:29 -07:00
Stephen Birarda
d112edab64 resolve conflicts on merge with upstream master 2013-07-08 11:07:42 -07:00
atlante45
013aabc65c Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-08 15:54:37 +02:00
atlante45
1f78c6461d Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-08 13:37:55 +02:00
atlante45
6c840a9ec3 Functionnal version of minecraft import 2013-07-08 13:37:47 +02:00
Eric Johnston
4341e8596f Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-07 22:19:13 -07:00
Andrzej Kapolka
357ac05d35 Removed debug logging. 2013-07-05 22:58:57 -07:00
Andrzej Kapolka
f9f2c66115 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Application.cpp
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	libraries/avatars/src/AvatarData.h
 2013-07-05 22:52:42 -07:00
Andrzej Kapolka
9c6e5b23e0 Alignment fixes. 2013-07-05 22:44:47 -07:00
Andrzej Kapolka
9c977450e3 Finally got the rotations figured out; I had forgotten the default pose/bind 
pose distinction.
 2013-07-05 22:14:32 -07:00
Andrzej Kapolka
ff5d1455aa More work on joint tracking. 2013-07-05 17:45:29 -07:00
tosh
c2e2ff0ffe changes broadcast function in Application to use a different name but the same signature as in NodeList 2013-07-05 14:16:50 +02:00
tosh
2da132be65 upstream merge 2013-07-04 21:21:11 +02:00
tosh
689794259d Merge branch 'master' of git://github.com/worklist/hifi into 19376 
Conflicts:
	interface/src/Application.cpp
 2013-07-04 21:20:36 +02:00
Philip Rosedale
d70eb38542 Properly make the goHome() function in slot group 2013-07-03 23:43:53 -07:00
Philip Rosedale
5df09b2932 remove debugging printf 2013-07-03 23:20:55 -07:00
Philip Rosedale
0f312d4c9b Tuned smooth gyro look values to feel better. 2013-07-03 23:17:43 -07:00
Philip Rosedale
92cec4cfa0 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 22:55:09 -07:00
Philip Rosedale
2de6d3eb6a Make 'Go Home' an option from the options because it conflicts with 'G' for gravity on/off 2013-07-03 22:55:01 -07:00
Andrzej Kapolka
43258f9dcd Use 15 blinks per minute as a base/maximum frequency. 2013-07-03 17:12:43 -07:00
Andrzej Kapolka
30f77975cf Trying to get the right rotations, send them on the wire. 2013-07-03 17:07:22 -07:00
ZappoMan
c0d14d2bd4 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-03 15:36:41 -07:00
Eric Johnston
3ea100e595 Added safety checks to processEvents(), which was causing problems. Also narrowed the scope of the events processed. 
It can now be disabled in the interface by un-checking touch-look, which most people don't use yet.
Also, the event processing time should be limited to 1 ms.
 2013-07-03 15:33:18 -07:00
Stephen Birarda
0be42698b5 resolve conflicts on merge with upstream master 2013-07-03 15:12:50 -07:00
Stephen Birarda
c8b86c651f Merge pull request #622 from birarda/master 
remove an extra g
 2013-07-03 15:06:23 -07:00
Stephen Birarda
8a4dc8446b what is July 3rdg 2013-07-03 15:05:51 -07:00
ZappoMan
f0fdacbba8 Merge pull request #621 from birarda/master 
remove pre-build fervor error, comment out process event bug
 2013-07-03 15:05:46 -07:00
Stephen Birarda
e85e49ef3b add a comment to disable of processEvents 2013-07-03 14:31:28 -07:00
Stephen Birarda
c44e231ab5 Merge pull request #620 from machinelevel/dev4 
[trivial] small bracket fix per request in https://github.com/worklist/h...
 2013-07-03 14:29:59 -07:00
Stephen Birarda
0e68942674 comment out processEvents to remove event receipt bug 2013-07-03 14:27:07 -07:00
Eric Johnston
fe46a3f0c9 [trivial] small bracket fix per request in https://github.com/worklist/hifi/pull/618/files 2013-07-03 13:11:26 -07:00
Philip Rosedale
3388fccc86 Fixes per code review 2013-07-03 13:09:55 -07:00
Philip Rosedale
c309774e3c Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 13:01:21 -07:00
Eric Johnston
e8ee041f20 Virtual method warning removal. 
Warning was "Delete called on HifiLeapListener that has virtual functions but non-virtual destructor"
 2013-07-03 11:46:53 -07:00
Eric Johnston
acef2bc669 Fixed two-finger touch delay, and all other hidden event-pile-up. 
Added a processEvents() call in the idle, because otherwise calling idle updates starves the event handlers.
 2013-07-03 11:37:38 -07:00
Philip Rosedale
7880c74304 smooth gyro look on by default if not in settings 2013-07-03 11:17:06 -07:00
Philip Rosedale
bf4bc22fbf Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 11:11:00 -07:00
Philip Rosedale
1868717520 Improve gyro look to smoothly follow the head and not move for small movements 2013-07-03 11:10:40 -07:00
ZappoMan
2d6e522c35 debug stats 2013-07-03 10:59:36 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
Andrzej Kapolka
e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Avatar.cpp
 2013-07-03 10:15:11 -07:00
Andrzej Kapolka
ebab09e535 More work on joints. 2013-07-03 10:13:10 -07:00
Eric Johnston
fd2009738b Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-03 09:56:00 -07:00
Stephen Birarda
00fa688aba Merge pull request #614 from machinelevel/dev4 
(changed per requests and re-merged) Two Leap-related crashes fixed, plu...
 2013-07-03 09:53:40 -07:00
tosh
a542ebc851 bandwidth meter - avoid division by zero 2013-07-03 14:01:09 +02:00
Eric Johnston
cf8257d3e9 fixed curly-braces per request 2013-07-02 17:49:43 -07:00
Stephen Birarda
4a804a9960 Merge pull request #615 from ey6es/master 
Fixes for gyros/webcam: restore rotation amplification, don't bother with gyro position or fusing webcam roll, blink faster.
 2013-07-02 17:33:11 -07:00
Andrzej Kapolka
4ecb4ab3c6 Restore the amplification; blink faster. 2013-07-02 17:14:54 -07:00
Andrzej Kapolka
a1d0f255cc Not crazy about the rotation amplification. 2013-07-02 17:03:37 -07:00
Eric Johnston
5d59bcbec7 (changed per requests and re-merged) Two Leap-related crashes fixed, plus Leap improvements 
1. Fixed thread-crash at terminate() time by terminating the LeapManager properly
2. Fixed an intermittent thread-crash when Leap active by removing auto-connection between controller and listener
3. Added fingerRoot positions to display and data packet
4. Introduced a vec3-based convention so that more finger data may be added without causing trouble for old clients and servers
5. My avatar's fingers are different color from others
 2013-07-02 17:03:32 -07:00
Andrzej Kapolka
b660336b2a Fix for camera movement with webcam enabled; don't bother using roll from 
webcam if we have the gyros; reinstate head orientation scaling; don't bother
using gyro position.
 2013-07-02 16:59:03 -07:00
ZappoMan
af1de263a4 fixed FOV preference to work with view frustum code properly 2013-07-02 16:58:31 -07:00
ZappoMan
f45f0610f5 fixed FOV preference with projection matrix 2013-07-02 16:54:55 -07:00
Andrzej Kapolka
1fdfca727d More work on Kinect-driven joints. 2013-07-02 16:49:07 -07:00
ZappoMan
1e19748a1a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-02 15:52:49 -07:00
ZappoMan
c7ff073686 more progress on merging 2013-07-02 15:50:40 -07:00
Andrzej Kapolka
4f01db6dc7 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 14:52:22 -07:00
Andrzej Kapolka
bf4757663c Merge pull request #609 from birarda/domain-stats 
rework Logstash to handle various stat types, add domain server node count stat
 2013-07-02 14:52:08 -07:00
Andrzej Kapolka
c4deeed121 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 14:51:45 -07:00
Andrzej Kapolka
52e7ff9a68 Working on filling in missing joint data. 2013-07-02 14:51:27 -07:00
Stephen Birarda
f7f321663a DRY up multiple stat type sending 2013-07-02 14:42:31 -07:00
ZappoMan
147f090d56 Merge pull request #599 from PhilipRosedale/master 
3P transition turned off, field of view now in preferences
 2013-07-02 14:19:09 -07:00
Tomáš Horáček
6f6f0423a0 Merge remote-tracking branch 'worklist/master' into 19385 2013-07-02 23:05:50 +02:00
Stephen Birarda
64f3b55aaa split logstash stash methods to stat types 2013-07-02 12:10:46 -07:00
Andrzej Kapolka
2a0d3310de Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 09:46:07 -07:00
atlante45
b062295ecb Merge with master 2013-07-02 16:22:39 +02:00
atlante45
78aa3ac9f9 Added UI responsivness 2013-07-02 16:17:25 +02:00
tosh
f3ab3b6c83 prevents voxel data from being sent or received (read: requested) when voxel rendering is disabled 
also adds a menu option under "Tools" to enable/disable the Oscilloscope
 2013-07-02 12:41:34 +02:00
Philip Rosedale
e7113d26f8 Add field of view as an option in preferences 2013-07-01 23:00:39 -07:00
Philip Rosedale
6fbab462f0 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-01 22:30:06 -07:00
ZappoMan
015ff85cea good progress on merging polygons 2013-07-01 21:39:56 -07:00
tosh
f062319c2b introduces named constants for bandwidth meter channel indices / max. drag length 2013-07-02 03:53:49 +02:00
Tomáš Horáček
66de431d67 re #19385: add hot-fix to allow import of big PNGs 
sendVoxelsOperation() is sending data too fast, printf slows it down.
Better fix is required.
 2013-07-02 02:57:55 +02:00
Andrzej Kapolka
d2e9686c81 Need to resize this. 2013-07-01 17:52:17 -07:00
Andrzej Kapolka
095782af45 Smooth the joints, get the head position/orientation from there. 2013-07-01 17:46:05 -07:00
Tomáš Horáček
b5e5806988 re #19385: fill gaps between neighbourhood voxels 2013-07-02 01:16:20 +02:00
Tomáš Horáček
c4c2d46847 re #19385: first version of PNG import 
works for size <= 128px
 2013-07-02 01:16:20 +02:00
Andrzej Kapolka
da6a9a342a Need to wrap the using statement in ifdef, too. 2013-07-01 15:07:10 -07:00
Andrzej Kapolka
182f4e70af More work on skeleton tracking. 2013-07-01 15:01:36 -07:00
tosh
7ebd912788 improves defaults and inline documentation of bandwidth meter layout constants 2013-07-01 23:38:00 +02:00
Andrzej Kapolka
4e9595f794 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-01 09:49:01 -07:00
Andrzej Kapolka
a1cab3ddc6 Working on getting skeleton data. 2013-07-01 09:48:36 -07:00
atlante45
8cc3f202ab Merge with upstream master 2013-07-01 17:12:05 +02:00
atlante45
45e13fda15 More UI improvements 2013-07-01 16:34:43 +02:00
Grayson Stebbins
60bea894d8 UI improvements 2013-07-01 10:32:36 -07:00
tosh
3f62edd68e makes bandwidth details dialog properly close (and reopen) on ESC key 2013-07-01 10:53:49 +02:00
tosh
639858dfc9 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-07-01 10:29:56 +02:00
tosh
98589adef5 Bandwidth meter: Bytes -> bits, number formatting (colors, digits, aligment) on dialog 2013-07-01 10:28:17 +02:00
Philip Rosedale
138b8d7f64 Merge pull request #585 from birarda/owning-agent 
boolean helper for Avatar isMyAvatar check
 2013-06-30 23:26:32 -07:00
Philip Rosedale
d464ae4158 Merge pull request #578 from birarda/fervor 
add an autoupdater for release OS X builds
 2013-06-30 23:25:42 -07:00
tosh
fdf9f10e82 increases height of bandwidth meters by 8 pixels 2013-06-30 17:32:44 +02:00
tosh
f1e5a56347 adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars 2013-06-30 17:08:01 +02:00
tosh
435b958671 polishes bandwidth meter 2013-06-29 20:52:07 +02:00
tosh
46f8136f2e combined bandwidth display at automatic scale 2013-06-29 20:30:12 +02:00
tosh
c88642bac2 keeps audio from crashing when sound device is unavailable 2013-06-29 15:58:25 +02:00
tosh
c18400f8b7 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-06-29 15:41:56 +02:00
ZappoMan
c7e691a010 cleaned up CoverageMapV2 recursion code, fixes crazy false occlusion 2013-06-29 00:15:57 -07:00
ZappoMan
73ad854235 latest version of quadtree coverage map 2013-06-28 22:05:32 -07:00
Andrzej Kapolka
b4b09b0070 Back up and running, now with OpenNI rather than libfreenect. 2013-06-28 17:31:49 -07:00
Andrzej Kapolka
ea9566596a Build OpenNI/NITE into interface if available. 2013-06-28 16:47:08 -07:00
Philip Rosedale
5025e89c25 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-28 16:36:08 -07:00
Philip Rosedale
c2ef960a9e Changed horizontal field of view to a constant, made it 90 degrees 2013-06-28 16:31:59 -07:00
Stephen Birarda
800bcdfd18 Merge pull request #598 from LionTurtle/master 
Added menu toggle for displaying ping
 2013-06-28 16:26:10 -07:00
Stephen Birarda
3349419c68 inital changes to add a version byte to packets 2013-06-28 16:23:35 -07:00
Philip Rosedale
c09fa3cc62 Turned avatar balls off 2013-06-28 16:22:56 -07:00
Philip Rosedale
8bac3b6a2b Merge branch 'master' of https://github.com/worklist/hifi 2013-06-28 16:20:23 -07:00
Mark Peng
be2e6518a1 Fixed if statement formatting in displayStats() and timer() in Application.cpp 2013-06-28 16:20:05 -07:00
Andrzej Kapolka
884f14dca1 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-06-28 16:06:58 -07:00
Mark Peng
53543c26fe Added menu toggle for displaying ping 2013-06-28 16:02:49 -07:00
Stephen Birarda
02b37febad Merge pull request #597 from LionTurtle/master 
fix typo grabbing avatar mixer agent
 2013-06-28 15:57:33 -07:00
Mark Peng
745dc03c72 Fixed AGENT_TYPE typo in Application::displayStats() 2013-06-28 15:42:27 -07:00
Stephen Birarda
eedaf5f76e Merge pull request #593 from LionTurtle/master 
ping reporter added to interface
 2013-06-28 15:34:46 -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
Eric Johnston
6c42922288 Minor bug fixes for networked Leap hands 2013-06-28 15:22:56 -07:00
Mark Peng
a5dc47eaab ping reporter added to interface take 4 2013-06-28 15:10:45 -07:00
Mark Peng
293031de6f ping reporter added to interface take 3 2013-06-28 13:03:30 -07:00
Philip Rosedale
a0e6c2869d merge fix 2013-06-28 11:54:25 -07:00
Eric Johnston
0ff3554dd8 Networked Leap fingers 
- Simplified finger updates and storage
- added pack and unpack for the fingers
- not yet tested between multiple machines, but *should* be harmless and backward-packet-compatible
 2013-06-28 11:34:20 -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
Philip Rosedale
27266ee3b2 Third person camera transition doesn't happen on movement. 2013-06-27 17:11:25 -07:00
Stephen Birarda
73a8882a9e resolve conflicts on merge with upstream master 2013-06-27 15:22:21 -07:00
Stephen Birarda
392728fbe5 Merge remote-tracking branch 'upstream/master' into owning-agent 2013-06-27 15:19:47 -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
6cf71fb49b remove speex includes 2013-06-26 18:25:12 -07:00
Philip Rosedale
6cd25294b4 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-26 18:22:16 -07:00
Philip Rosedale
4a241d6220 turned off voxel grabbing 2013-06-26 18:21:40 -07:00
Stephen Birarda
14718980e5 tighten audio latency by clearing the network stack after starves 2013-06-26 18:17:50 -07:00
Stephen Birarda
1c0b256f92 remove echo cancellation from audio code 2013-06-26 16:22:54 -07:00
Stephen Birarda
fd30725222 add a missing set of parenthesis 2013-06-26 15:53:35 -07:00
Stephen Birarda
6c4dd03867 add a missing semicolon 2013-06-26 15:52:26 -07:00
Stephen Birarda
2c7d720e88 add a boolean helper for _owningAvatar NULL comparison 2013-06-26 15:52:01 -07:00
Andrzej Kapolka
5ef400b193 Got the depth information displaying. 2013-06-26 15:35:44 -07:00
Andrzej Kapolka
c0b5bc5922 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-06-26 12:59:50 -07:00
Andrzej Kapolka
5e989b6ee5 More work on obtaining Kinect data. 2013-06-26 12:19:10 -07:00
Stephen Birarda
383b6ecec2 use correct future appcast URL 2013-06-26 11:27:55 -07:00
Stephen Birarda
949395348f switch to silent update checking 2013-06-26 10:42:07 -07:00
Stephen Birarda
0b243ec881 add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
Stephen Birarda
800bfd097b alphabetize some includes in Application header 2013-06-26 10:35:17 -07:00
Philip Rosedale
0b37ce5375 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-25 21:08:37 -07:00
Andrzej Kapolka
f2f29d2e60 Well, I guess OS X doesn't like || and && without parentheses. 2013-06-25 16:58:31 -07:00
Andrzej Kapolka
6eb421d564 Blink less when talking (and never when brows are raised); force a blink after 
we stop talking.
 2013-06-25 16:51:22 -07:00
Stephen Birarda
5cf89e90d7 fix redundancy in reference to Rect for OpenCV 2013-06-25 16:45:14 -07:00
Andrzej Kapolka
3d214c2655 More work on Kinect integration. 2013-06-25 15:26:07 -07:00
Andrzej Kapolka
1d578d5b0e Lots of Kinect bits. 2013-06-25 14:27:13 -07:00
Andrzej Kapolka
7ab1055d47 Derp, need to bind the element array buffer. 2013-06-24 17:25:09 -07:00
Andrzej Kapolka
9356d1a27d Turns out sincos is a GNU thing. 2013-06-24 17:16:06 -07:00
atlante45
ee15739e7e few fixes on the job 19368 2013-06-25 01:28:31 +02:00
atlante45
52d62185ee Merge branch 'master' of https://github.com/worklist/hifi into 19368 2013-06-25 00:24:54 +02:00
atlante45
d6c70ea6ca #19368 - Improve editing/building workflow in Interface 2013-06-25 00:24:21 +02:00
Andrzej Kapolka
a0ecd167fc Replace 0/1 with FULLY_OPEN/CLOSED. 2013-06-24 10:31:11 -07:00
Andrzej Kapolka
1e258aae99 Define blink speed as a constant. 2013-06-24 10:20:01 -07:00
ZappoMan
c627010d3a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-24 10:12:59 -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
09962737dd tightens bounding issues for bandwidth meter's scale indicators 2013-06-22 05:21:15 +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
Andrzej Kapolka
ef7c6ebdc6 Basic blinking. 2013-06-21 18:11:31 -07:00
ZappoMan
4590bdc69d added support for clipping polygons to screen bounds, not yet enabled since it doesn't help performance, will use in future 2013-06-21 16:42:55 -07:00
Andrzej Kapolka
5bbff6f63f Merge branch 'master' of https://github.com/worklist/hifi into opencv 
Conflicts:
	interface/src/Balls.cpp
 2013-06-21 14:40:47 -07:00
Philip Rosedale
7e12a0c1d7 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 14:33:52 -07:00
Philip Rosedale
74f6ee6fca Fixed spacing at parenthesis 2013-06-21 14:33:37 -07:00
Andrzej Kapolka
650e659ee8 Fixed includes, pointer warning. 2013-06-21 14:33:01 -07:00
Stephen Birarda
258eed5890 fix casing of SharedUtil include in balls 2013-06-21 14:32:55 -07:00
Andrzej Kapolka
0c184b9912 Merge pull request #571 from ey6es/opencv 
Quick fix for something I broke in mouse/touch took.
 2013-06-21 14:30:59 -07:00
Andrzej Kapolka
94cbb50dfa Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:30:03 -07: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
686fc3607e Fix for mouse/touch look: don't apply rotations if the gyros/webcam aren't 
connected.
 2013-06-21 14:25:25 -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
Andrzej Kapolka
5194fb2ee6 Don't bother with testing the ignore orientations stuff. 2013-06-21 13:58:49 -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
Andrzej Kapolka
3de76c9e15 Approach the webcam position rapidly. 2013-06-20 16:28:48 -07:00
Andrzej Kapolka
281aee1f12 Increased smoothing substantially to reduce effect of jittering face rect. 2013-06-20 16:22:46 -07:00
Andrzej Kapolka
8cffaf7cc0 Fixed includes. 2013-06-20 16:09:24 -07:00
Andrzej Kapolka
7e34bef01e Attempt to fuse gyro readings with webcam data. 2013-06-20 16:07:33 -07:00
Stephen Birarda
8b7b0d542a send the interface startup time to log stash 2013-06-20 15:34:17 -07:00
Andrzej Kapolka
02b881aa33 Increased the camera distance in mirror mode to avoid clipping. 2013-06-20 15:08:46 -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
56b8a5880d cleaned up stdout audio reporting 2013-06-20 10:59:50 -07:00
Philip Rosedale
c740400224 Merge fixes plus auto jitter buffer 2013-06-20 10:54:58 -07:00
Andrzej Kapolka
6493f3aa44 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-20 10:08: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
tosh
9c54ef18d3 adds 'Oscilloscope::setColor' and uses it when visualizing echo cancellation 2013-06-20 03:15:01 +02:00
Andrzej Kapolka
0dc0552f50 Basic Haar cascade/CamShift tracking. 2013-06-19 18:02:26 -07:00
ZappoMan
cadd596508 implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares 2013-06-19 17:52:01 -07:00
tosh
7588b7f6bb - separates audio system round trip time determination from echo cancellation 
- changes speex parameters to more humble values
- resolves build issues by removing the speex dylibs - static ones are fine
- tightens build script
 2013-06-20 02:00:12 +02: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
d4d662b3f5 Convert frame to grayscale and equalize. 2013-06-19 14:13:42 -07:00
ZappoMan
1284f9d09a naming cleanup and some optimizations 2013-06-19 13:45:13 -07:00
Andrzej Kapolka
2e52925496 Bump this up to 60 again. 2013-06-19 11:22:41 -07:00
Andrzej Kapolka
46b3d829d5 Round FPS display. 2013-06-19 11:06:51 -07: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
1651044234 Disable auto exposure, set exposure rather high (which causes a lower exposure 
time).
 2013-06-19 11:02:48 -07:00
Andrzej Kapolka
963b033e41 Fixed warning on OS X, playing with settings. 2013-06-19 10:50:58 -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
755208aaf7 comments unused variable to avoid a compiler warning 2013-06-19 16:19:50 +02:00
tosh
7342b7a774 Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-19 16:15:38 +02:00
tosh
97fc38313b implements audio echo cancellation based on speex 2013-06-19 16:12:25 +02:00
Andrzej Kapolka
cc9f8bc717 Adjustments to UVCCameraControl invocation. 2013-06-18 18:15:52 -07:00
Andrzej Kapolka
2e033631eb Make our call to configureCamera on OS X. 2013-06-18 16:50:15 -07:00
Andrzej Kapolka
4519b43072 Initialization order fix. 2013-06-18 14:48:58 -07:00
Andrzej Kapolka
9cb671aa56 Slightly better fps computation. 2013-06-18 14:43:19 -07:00
Andrzej Kapolka
e1f76b2bdf Limit the rate at which we acquire images, since OS X doesn't block like Linux 
does.
 2013-06-18 14:37:24 -07:00
Andrzej Kapolka
e98d1f9a92 Let's try getting the cam's fps. 2013-06-18 14:18:33 -07:00
Andrzej Kapolka
2ad8585f26 Show the acquisition fps. 2013-06-18 14:11:13 -07:00
Andrzej Kapolka
2a60414968 Set the desired webcam resolution and fps, report what we actually get. 2013-06-18 13:56:58 -07:00
Andrzej Kapolka
0fa710e518 Let's try using glPixelStore to specify the widthStep. 2013-06-18 13:39:54 -07:00
Andrzej Kapolka
2c2297b2bd Let's try using widthStep rather than nChannels and computing the alpha 
values.
 2013-06-18 13:30:31 -07:00
tosh
682a7c9cdf libspeexdsp-based echo cancellation (untested) 2013-06-18 22:18:27 +02:00
Andrzej Kapolka
a4324d71d5 If we don't get the image frame, try again later. 2013-06-18 13:08:16 -07:00
Philip Rosedale
216c5d054d working on audio system, added metrics on in/out latency. 2013-06-18 12:16:39 -07: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
1fc3ad8011 CR feedback 2013-06-18 12:03:58 -07:00
ZappoMan
8b18ee6844 renamed VoxelProjectedShadow class 2013-06-18 12:01:01 -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
341cde61f5 Allow four channel images, create a copy. 2013-06-17 18:21:35 -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
Andrzej Kapolka
ec495e14d3 Missed these guys. 2013-06-17 13:29:24 -07:00
Andrzej Kapolka
4421b21124 Working on reintegrating OpenCV (also, removed lodepng). 2013-06-17 13:24:01 -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
Andrzej Kapolka
c11ab45474 It seems gl_ModelViewMatrixInverse is problematic on OS X; let's try passing 
in the camera's position as transformed into model space.
 2013-06-14 17:21:35 -07:00
Andrzej Kapolka
790cdfb0bd Added refraction to irises. 2013-06-14 16:46:34 -07:00
Andrzej Kapolka
ec0b1a99fb Fix iris orientations: start with the head orientation, then rotate onto the 
lookat vector.  This way, the irises don't rotate around as we yaw.
 2013-06-14 11:23:08 -07:00
ZappoMan
620a4a8ad6 latest occlusion culling with support for checking map without adding to coverage map for checking parent nodes 2013-06-13 16:37:14 -07:00
Philip Rosedale
dd1df47c71 fixes per review 2013-06-13 16:20:28 -07:00