Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-11 23:47:22 +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
ZappoMan
393723d8fb changed delete voxel fade color 2013-08-07 12:36:26 -07:00
atlante45
3bc9dd116e - Compute collisions radius only when collisions are on 2013-08-07 12:31:31 -07:00
Hifi Test Account
5f90e1a4e9 Fix the last commit. Remove compile error and increased buffer size to 
to account for the increased size of vertexData.
 2013-08-07 12:30:45 -07:00
atlante45
35557e1973 - Change collision radius according to near clip so nothing comes inside 2013-08-07 12:25:31 -07:00
atlante45
19b9be3361 - Now P switch between first and third person view 2013-08-07 12:24:13 -07:00
Hifi Test Account
edf4579d0e Merge remote-tracking branch 'upstream/master' 2013-08-07 12:08:43 -07:00
Hifi Test Account
1e7dbbbccd Fix renderHalfCylinder so that normals are correct now. Add facePosition and faceRotation storage to Face class. 2013-08-07 12:07:41 -07:00
ZappoMan
451b2bc595 added Sending Mode to on screen stats 2013-08-07 12:07:39 -07:00
ZappoMan
11b7e84a80 Merge pull request #811 from ey6es/master 
Several minor fixes for depth camera code.
 2013-08-07 12:01:01 -07:00
Andrzej Kapolka
e17149a49d Merge pull request #812 from Atlante45/master 
Rendering changes
 2013-08-07 11:46:43 -07:00
Andrzej Kapolka
80481747fa Fix for enabling depth-only webcam after startup. 2013-08-07 11:15:37 -07:00
Andrzej Kapolka
377adb30ae Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:14:48 -07:00
Eric Johnston
5373f85d30 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-08-07 11:13:42 -07:00
atlante45
ce12c51fce Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:13:26 -07:00
ZappoMan
96e6c2f9bd Merge pull request #810 from ZappoMan/master 
quick fix crash in parseVoxelStats()
 2013-08-07 11:11:46 -07:00
atlante45
08309e3aac Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:11:29 -07:00
ZappoMan
ccf3498ae5 quick fix crash in parseVoxelStats() 2013-08-07 11:11:03 -07:00
Eric Johnston
10e4174ce3 Rave tweak: keep the right arm on the right-most Leap hand. 2013-08-07 11:08:14 -07:00
atlante45
dcdae6c6a0 - Add a translucide sphere around avatars far away with radius relative to average loudness 2013-08-07 11:00:20 -07:00
atlante45
f151b2cfc1 - Don't render body when in first person view 2013-08-07 10:58:30 -07:00
atlante45
132d03e291 Moved string when following to chest 2013-08-07 10:56:32 -07:00
atlante45
414af9811a - Add fading to lookAt vectors 2013-08-07 10:54:52 -07:00
ZappoMan
d893d4cf16 Merge pull request #807 from machinelevel/dev4 
Rave tweaks: change the look of the hands, fix screen-darken
 2013-08-07 10:49:59 -07:00
Eric Johnston
1fc4f17f7a Rave tweaks: change the look of the hands, fix screen-darken 
Screen-darken is now a simple fullscreen draw
Leap hands are now visible and match body lighting
Fingertips are hidden and hand coloring matches body and arm
"fake hands" aren't active unless they're chosen from the Debug menu.
 2013-08-07 10:29:31 -07:00
Jeffrey Ventrella
6997d0174a clean up in mohawk code 2013-08-07 10:24:21 -07:00
Andrzej Kapolka
ca939fb6b8 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 10:18:45 -07:00
Jeffrey Ventrella
b007ab11d4 Merge remote-tracking branch 'upstream/master' into particles 2013-08-07 10:18:32 -07:00
Jeffrey Ventrella
253154ce6d fixed mohawk physics bug 2013-08-07 10:17:53 -07:00
Andrzej Kapolka
f20ac7f4bc Include received video data in bandwidth usage, clear webcam bits when it's 
been turned off.
 2013-08-07 10:17:04 -07:00
Hifi Test Account
988faeff54 Render static halfCylinder backing to face in full frame mode. 2013-08-07 10:14:35 -07:00
Philip Rosedale
cdfabd7647 Merge pull request #805 from ZappoMan/master 
Tweaks for Grayson
 2013-08-07 10:01:58 -07:00
ZappoMan
61560af28f cleanup 2013-08-06 19:21:46 -07:00
ZappoMan
a5f472254d removed ground plane grid, and changed start position 2013-08-06 19:15:26 -07:00
Hifi Test Account
05d933bf33 Successful static half cylinder backing. 2013-08-06 18:38:41 -07:00
Hifi Test Account
d725bcdbff Fix renderHalfCylinder so it only has 2 args now. 2013-08-06 18:09:51 -07:00
Hifi Test Account
24e47755d4 Merge texture render code to improve PrimeSense. 2013-08-06 17:42:26 -07:00
Eric Johnston
35465686db Rave tweaks: Use separate light settings for avatars and particles 2013-08-06 17:39:56 -07:00
Philip Rosedale
7583e1cd14 Merge pull request #802 from ey6es/master 
Added a textured rendering mode for depth data that doesn't use video input; rather, it computes normals from the depth and uses local lighting.
 2013-08-06 17:13:50 -07:00
Eric Johnston
378cb343ae Rave tweaks per Ryan's request: Mood lighting for the avatars. This also sets us up to have light coming from the effects, if we want. 2013-08-06 16:45:15 -07:00
Andrzej Kapolka
2f2eaf8ae5 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-06 16:28:22 -07:00
Andrzej Kapolka
63aeb4df75 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-08-06 16:28:14 -07:00
Andrzej Kapolka
bd3c235fe4 Switching between textured and untextured modes. 2013-08-06 16:23:58 -07:00
atlante45
558255ca3d - Made collision On by default 2013-08-06 16:13:31 -07:00
Philip Rosedale
426abbb55a Merge pull request #799 from ZappoMan/fun_fade 
add fade effect to voxel add and delete, fix crash with audio injector
 2013-08-06 15:09:43 -07:00
ZappoMan
634b69b545 Merge pull request #797 from machinelevel/dev4 
Rave demo changes per Ryan's request: Darken the world when you're in ra...
 2013-08-06 15:00:26 -07:00
ZappoMan
05452dc2aa Merge pull request #796 from PhilipRosedale/touchLook 
Tune gyros, always fly in direction of sight, head always moves with gyros, adjustable view sensitivity
 2013-08-06 14:59:28 -07:00
ZappoMan
facc9e1ee7 add fade effect to voxel add and delete, fix crash with audio injector 2013-08-06 14:55:40 -07:00
Eric Johnston
2e5dade413 Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened. 
Also fixed a warning in AvatarData.cpp initialization
 2013-08-06 14:29:30 -07:00
ZappoMan
6cf87fc120 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 
Conflicts:
	interface/src/Application.cpp
 2013-08-06 13:49:42 -07:00
ZappoMan
c93c6687bf fix build buster 2013-08-06 13:48:30 -07:00
ZappoMan
fb2a1cce50 Merge pull request #795 from machinelevel/dev4 
Rave glove adjustments per Ryan's requests: hide fingers and arms when r...
 2013-08-06 13:45:42 -07:00
Andrzej Kapolka
720ae561df Working on support for a textured face mode that doesn't rely on the video 
stream.
 2013-08-06 13:27:54 -07:00
Eric Johnston
9a4a0e2819 Rave glove adjustments per Ryan's requests: hide fingers and arms when raving, center hands in front of face. 2013-08-06 12:44:29 -07:00
Philip Rosedale
ebd5c4832a Merge branch 'master' of https://github.com/worklist/hifi into touchLook 2013-08-06 12:34:55 -07:00
Philip Rosedale
120bbbd506 Tuned gyro look, added better preferences 2013-08-06 12:34:45 -07:00
ZappoMan
c93ed450a2 Merge pull request #791 from Atlante45/stalking_indicator 
Stalking indicator
 2013-08-06 12:33:26 -07:00
Philip Rosedale
abf64f3e7f Merge pull request #792 from Atlante45/turn_off_collisions 
Add option to turn collisions on and off
 2013-08-06 12:27:27 -07:00
Philip Rosedale
bb15eb664c Merge pull request #793 from machinelevel/dev4 
Rave glove: Fix initialization issues and activate mode switch.
 2013-08-06 12:15:01 -07:00
ZappoMan
88e2e3dd3f added visulization for voxel add/kill 2013-08-06 12:05:43 -07:00
Eric Johnston
ab31c3f82d Rave glove: Fix initialization issues and activate mode switch. 
Note that this change will have no effect until the Avatar Mixer gets it, because the mixer will continue to send "glove mode 0" until it receives this update.
 2013-08-06 11:59:58 -07:00
atlante45
ddf1b06bf9 Add option to turn collisions on and off 2013-08-06 11:33:59 -07:00
atlante45
eb9f32b7cb Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator 2013-08-06 11:07:58 -07:00
atlante45
32c155ef71 Render a string to show who is following who 2013-08-06 10:53:10 -07:00
ZappoMan
13408b607e Merge pull request #790 from PhilipRosedale/touchLook 
Touch-driven pitch happens immediately even when wearing gyros
 2013-08-06 10:39:57 -07:00
ZappoMan
73510ec975 added notifications with jurisdiction details for when voxel servers come and go 2013-08-06 10:33:09 -07:00
Philip Rosedale
58cb852597 Touch-driven pitch happens immediately even when wearing gyros 2013-08-06 10:06:40 -07:00
Eric Johnston
16aae5993a Rave glove fixes: removed double-stored glove mode members 
Uncommented glove mode switch, which now calls a non-crashing method.
Fixed overlapping method names for very different methods (setRaveGloveMode becomes activateNewRaveGloveMode).
 2013-08-06 07:33:18 -07:00
Mark Peng
147d5fc454 Merge remote-tracking branch 'upstream/master' 2013-08-05 19:52:55 -07:00
Mark Peng
57efea40ee Add untested renderHalfCylinder function to GeometryCache/ 2013-08-05 19:52:02 -07:00
Philip Rosedale
e5de67152e Merge pull request #786 from Ventrella/particles 
Added member variables to Hand.cpp to manage rave glove mode switching
 2013-08-05 19:26:55 -07:00
Philip Rosedale
d7dc07502c Merge pull request #787 from machinelevel/dev4 
Rave glove demo: network-glove fixes
 2013-08-05 18:58:04 -07:00
Jeffrey Ventrella
f9f925b70b removed printf 2013-08-05 17:30:04 -07:00
Eric Johnston
d85ce81313 Rave glove demo: network-glove fixes 
After this change, people can see each other's rave glove performances.
1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine.
2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired.
 2013-08-05 17:27:42 -07:00
Jeffrey Ventrella
cba42808c1 fixed initial rave glove mode 2013-08-05 17:24:31 -07:00
Jeffrey Ventrella
4ceba28632 working with Eric to fix transmission of hand data 2013-08-05 17:00:50 -07:00
ZappoMan
b016c08578 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 
Conflicts:
	libraries/avatars/src/HandData.h
 2013-08-05 16:53:41 -07:00
ZappoMan
acd3acb81e correctly handle freeing of memory for _jurisdictionRoot in VoxelSceneStats 2013-08-05 16:51:01 -07:00
Jeffrey Ventrella
2dbd0f7f31 Merge branch 'master' of https://github.com/worklist/hifi into particles 2013-08-05 16:31:49 -07:00
Jeffrey Ventrella
f51db292a4 ya 2013-08-05 16:26:32 -07:00
ZappoMan
07a61a3c8e Merge pull request #782 from Atlante45/master 
few fixes on rescaling and following
 2013-08-05 15:44:15 -07:00
atlante45
55e34558cb Merge branch 'master' of https://github.com/worklist/hifi 2013-08-05 15:26:43 -07:00
Andrzej Kapolka
36ae7dbd48 Normalize when we render the ground. This shouldn't be necessary, but it 
looks like various parts of the code rely on RESCALE_NORMAL, which is set but
not unset in avatar/Head/Hand.  We'll have to look at that more closely later
on.
 2013-08-05 15:24:21 -07:00
atlante45
29062c51b2 - changed according to review comments 
- added reset scale option
 2013-08-05 15:23:40 -07:00
ZappoMan
7a3d254aca small tweak 2013-08-05 15:02:24 -07:00
ZappoMan
f1a0edb471 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-05 14:57:10 -07:00
ZappoMan
7021d3c6a5 Merge pull request #777 from Ventrella/particles 
Added BendyLine
 2013-08-05 14:55:26 -07:00
ZappoMan
7ccab1a32c Merge pull request #783 from LionTurtle/master 
Render other avatar's lookat to point at my camera if the other avatar is looking at my head.
 2013-08-05 14:53:27 -07:00
Mark Peng
1790b0595c Render other avatar's lookat to point at my camera if the other avatar 
is looking at my head.
 2013-08-05 14:26:39 -07:00
atlante45
6c0ea0cf9c Merge branch 'master' of https://github.com/worklist/hifi 2013-08-05 14:11:14 -07:00
Jeffrey Ventrella
1a2c8f9875 Merge remote-tracking branch 'upstream/master' into particles 2013-08-05 14:10:28 -07:00
Jeffrey Ventrella
96b443ec5d Merge pull request #781 from machinelevel/dev4 
Rave glove demo: Network rave data
 2013-08-05 14:07:57 -07:00
atlante45
3d853f5b90 - Smooth rescaling 
- stop following when leading avatar disconnect
- set max far clip for no more crash with really big avatars
 2013-08-05 14:05:58 -07:00
ZappoMan
14b7f58fef Kills local voxels if voxel server is removed from NodeList 
- added notification hooks to NodeList
- implemented hooks in VoxelSystem to kill local voxels when
  voxel server is killed
 2013-08-05 13:47:18 -07:00
Eric Johnston
a3a5c3d6d4 Rave glove demo: Network rave data 
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
 2013-08-05 13:25:05 -07:00
ZappoMan
fe877b0ec8 Merge pull request #779 from birarda/rave-audio 
fix resetting of song mix menu item after import is done
 2013-08-05 12:27:47 -07:00
Stephen Birarda
25537f78a1 reset the song mix menu item after clip is done 2013-08-05 12:18:59 -07:00
Jeffrey Ventrella
405cb516f6 removed 3 magic numbers in particle system 2013-08-05 12:05:15 -07:00
Andrzej Kapolka
e8365c6b04 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-05 11:42:17 -07:00
Andrzej Kapolka
03de2f3ea7 Render a green plane with fog, per Grayson's request. 2013-08-05 11:41:42 -07:00
Jeffrey Ventrella
e2ba8e22d5 added BendyLine 2013-08-05 11:35:02 -07:00
Jeffrey Ventrella
7693165578 merge 2013-08-05 11:28:59 -07:00
Jeffrey Ventrella
6e69c4fbbb improved particle rainbow color cycle mode 2013-08-05 11:28:10 -07:00
ZappoMan
92f6fe6bd8 CR feedback 2013-08-05 11:14:30 -07:00
ZappoMan
bdabe709af added more color groups for false colorization from source 2013-08-05 11:11:10 -07:00
Stephen Birarda
035f1c81b9 Merge pull request #770 from ZappoMan/tile_import 
made import work better when tile locations not included in file name
 2013-08-05 10:56:53 -07:00
ZappoMan
1c45845842 Merge pull request #772 from birarda/assignee 
initial stub of assignment work
 2013-08-05 10:56:31 -07:00
atlante45
1ee870be38 Fix pie menu appearing in selection mode 2013-08-05 10:35:10 -07:00
ZappoMan
cc9e4eaf45 CR feedback 2013-08-05 10:24:52 -07:00
Stephen Birarda
fdd0e25a60 Merge pull request #771 from ZappoMan/bugfixes 
fixed disappearing voxel bug
 2013-08-05 10:15:56 -07:00
Stephen Birarda
a4ea0f035a resolve conflicts on merge with upstream master 2013-08-05 09:56:07 -07:00
ZappoMan
edfd5cd543 fixed disappearing voxel bug 2013-08-05 09:45:00 -07:00
ZappoMan
abc8bc332c made import work better when tile locations not included in file name 2013-08-02 20:12:13 -07:00
ZappoMan
ce937247d1 added back getUprightEyeLevelPosition() 2013-08-02 18:47:21 -07:00
ZappoMan
fd81053e33 fixed compiler warnings 2013-08-02 18:33:41 -07:00
Mark Peng
5ef965018c Fix bug where the lookatIndicator would draw and no longer update. 2013-08-02 18:13:49 -07:00
Mark Peng
da31cd441e Merge remote-tracking branch 'upstream/master' 2013-08-02 18:08:28 -07:00
Mark Peng
26d6e826c5 Merge remote-tracking branch 'upstream/master' 2013-08-02 18:03:34 -07:00
Mark Peng
71a919f226 Switch back to avatar.getEyePosition() rather than 
avatar.getHead().getEyePosition() because of mysterious lag.
 2013-08-02 18:02:37 -07:00
atlante45
ff27ee1c53 Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 18:00:42 -07:00
atlante45
be83bf5635 Fixed fucked up merge 2013-08-02 17:57:53 -07:00
Stephen Birarda
8704964a0f resolve conflicts on merge with upstream master 2013-08-02 17:56:19 -07:00
Stephen Birarda
222a46189f some comments and _songFileBytes reset 2013-08-02 17:50:08 -07:00
Stephen Birarda
d259180778 add option to audio menu to stop the mixed audio 2013-08-02 17:46:23 -07:00
atlante45
84eae284ea Changed shifted and meta variable name 2013-08-02 17:44:21 -07:00
Mark Peng
ff67367221 Remove extra parenthesis. 2013-08-02 17:42:12 -07:00
Mark Peng
e0b7773521 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/Head.cpp
 2013-08-02 17:35:29 -07:00
atlante45
466d50ea4b Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 17:30:59 -07:00
Stephen Birarda
d56b715432 add menu option to mix RAW audio with microphone audio 2013-08-02 17:30:49 -07:00
Mark Peng
d7cd88a9a7 Fix camera positioning so that it is in between avatar's eyes. Plus 
some code clean up.
 2013-08-02 17:30:26 -07:00
Philip Rosedale
1309e72553 Merge pull request #758 from Ventrella/particles 
Added avatar nose
 2013-08-02 17:26:10 -07:00
atlante45
bceb416d8a merge 2013-08-02 17:18:35 -07:00
atlante45
d765b58551 Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 17:17:35 -07:00
atlante45
e9a53ed9b4 Changed avatar resizing shortcuts to plus and minus. 2013-08-02 17:14:57 -07:00
Andrzej Kapolka
4a122c6dca Merge pull request #761 from ey6es/pointy 
Adjusted bitrate for full frame video, fix for underflow errors.
 2013-08-02 17:05:00 -07:00
Stephen Birarda
447e332b6f Merge pull request #760 from Atlante45/fix_key_press_event 
Fix key press event
 2013-08-02 16:45:25 -07:00
Philip Rosedale
936209fd31 When no hovered voxel, lookAt vectors point to distant horizon 2013-08-02 16:37:49 -07:00
atlante45
8c112cbec3 Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 16:37:18 -07:00
atlante45
1b4cdc003d Fix shortcuts : done 2013-08-02 16:36:53 -07:00
Philip Rosedale
639b6be01a Merge branch 'master' of https://github.com/worklist/hifi into Remove-body 2013-08-02 16:08:16 -07:00
Jeffrey Ventrella
d87b4a8e1e Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 16:08:01 -07:00
Jeffrey Ventrella
95f15fceb5 added avatar nose 2013-08-02 16:07:33 -07:00
Philip Rosedale
8aa8b5dbfe Marker lines all the way out to 128Meters 2013-08-02 16:03:34 -07:00
Philip Rosedale
b9a8d6080e Render world box goes out to edge of world. 2013-08-02 15:43:37 -07:00
atlante45
eb2a1ecedd merge 2013-08-02 15:41:32 -07:00
atlante45
2e150b97de Fixed shortcuts issues on mac 2013-08-02 15:24:09 -07:00
Andrzej Kapolka
574752c774 Use saturate_cast when converting from YV12 to RGB to prevent overflow errors. 2013-08-02 14:58:59 -07:00
ZappoMan
db55160f9a Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-02 14:40:39 -07:00
Andrzej Kapolka
5df4fc95f1 Up the bitrate for full frame video to 4x. 2013-08-02 14:21:21 -07:00
atlante45
f441295eb1 Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option 2013-08-02 14:15:07 -07:00
atlante45
1cae9fc6c7 merge 2013-08-02 14:14:21 -07:00
Jeffrey Ventrella
17f1c82e6f cleanup 2013-08-02 14:12:32 -07:00
Andrzej Kapolka
8de709a2c6 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-02 14:09:27 -07:00
Jeffrey Ventrella
f80a9fdf31 Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 14:09:22 -07:00
Jeffrey Ventrella
90502a3ce5 removed rendering of finger root positions 2013-08-02 14:08:56 -07:00
ZappoMan
55f7028726 Merge pull request #744 from PhilipRosedale/master 
Smoother movement, rotation, less distracting collision noises.  Play sound on click voxel
 2013-08-02 14:03:51 -07:00
Jeffrey Ventrella
29c5511a54 test 2013-08-02 13:49:50 -07:00
Jeffrey Ventrella
28dd38c013 Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 13:36:01 -07:00
Jeffrey Ventrella
a9ec94de49 fixed a problem with emitters not being coordinated with Leap fingers 2013-08-02 13:35:35 -07:00
ZappoMan
4c15964cdc Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-02 11:44:09 -07:00
Andrzej Kapolka
def4318817 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-02 11:12:59 -07:00
Andrzej Kapolka
61da1826c7 Reduce bitrate for full frame mode. 2013-08-02 11:12:41 -07:00
Jeffrey Ventrella
6ebe33bb0b Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 11:00:10 -07:00
Mark Peng
6cf42674d5 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	interface/src/Application.cpp
	interface/src/Webcam.cpp
	interface/src/Webcam.h
 2013-08-02 11:00:05 -07:00
Jeffrey Ventrella
8fc800acff some work on hands 2013-08-02 10:59:04 -07:00
Andrzej Kapolka
11664f9446 Have the particle system default to off. 2013-08-02 10:12:21 -07:00
Philip Rosedale
1b5c79aa8a Merge branch 'master' of https://github.com/worklist/hifi into Remove-body 2013-08-02 09:37:08 -07:00
Philip Rosedale
56e66f8020 Merge pull request #752 from ey6es/pointy 
Depth smoothing, full frame video support (along with ability cycle between no video, just face, full frame).
 2013-08-01 21:11:09 -07:00
ZappoMan
983db5f70d Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-01 20:50:24 -07:00
Andrzej Kapolka
323e21ad4a Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-01 19:28:34 -07:00
Andrzej Kapolka
69cac69067 Go ahead and show the leap hand by default, but don't include the fingers if 
the palms are inactive (!)
 2013-08-01 18:56:14 -07:00
Philip Rosedale
8f95534644 Fix jittering in view from body slowly following head 2013-08-01 16:04:38 -07:00
Andrzej Kapolka
0052221c33 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-01 15:52:58 -07:00
atlante45
fdd01a6551 merge 2013-08-01 15:48:57 -07:00
ZappoMan
0a4fcdccb5 Merge branch 'master' of https://github.com/worklist/hifi into tile_import 
Conflicts:
	interface/src/Application.cpp
 2013-08-01 15:44:28 -07:00
ZappoMan
a0ba788679 implement grid landscape import 2013-08-01 15:40:39 -07:00
Andrzej Kapolka
12f42358d5 Allow cycling between video send modes. 2013-08-01 15:39:53 -07:00
Philip Rosedale
9defa6255a disable mouse wheel voxel scale change 2013-08-01 15:31:09 -07:00
atlante45
b6049c9a10 Merge branch 'master' of https://github.com/worklist/hifi into pie_menu 2013-08-01 15:28:35 -07:00
Mark Peng
6a6c51f80e Add skeleton tracking toggle in options menu in interface. 2013-08-01 15:04:58 -07:00
Philip Rosedale
ef8daffa4d Merge branch 'master' of https://github.com/worklist/hifi 2013-08-01 15:00:27 -07:00
Philip Rosedale
fcf20a7ebc Sound on click, but not on hover 2013-08-01 15:00:08 -07:00
Stephen Birarda
2b0cfe3c67 resolve conflicts on merge with upstream master 2013-08-01 14:33:23 -07:00
Mark Peng
9ba0e3bb0c Add reference lines to mouse voxel when adding/deleting voxels. 2013-08-01 13:03:17 -07:00
Andrzej Kapolka
ba9b5888d2 More work on full frame sending. 2013-08-01 13:00:01 -07:00
Philip Rosedale
bc1ac6b455 turn down collision sounds 2013-08-01 12:49:10 -07:00
Jeffrey Ventrella
5c38f78afc Merge remote-tracking branch 'upstream/master' into particles 2013-08-01 10:53:49 -07:00
Jeffrey Ventrella
0cd1018e76 some experimental work on hand rendering 2013-08-01 10:53:20 -07:00
Philip Rosedale
ba2c98a3eb Merge branch 'master' of https://github.com/worklist/hifi 2013-08-01 10:12:13 -07:00
Stephen Birarda
71ab8ae4f8 some necessary changes for AvatarData transmission 2013-08-01 10:07:10 -07:00
Andrzej Kapolka
a86ceb2759 More work on full frame video. 2013-07-31 18:18:37 -07:00
Jeffrey Ventrella
8f8d230761 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 17:59:37 -07:00
Jeffrey Ventrella
5b2693f99c added emitter active bool for switching emitters on/off when Leap loses fingers 2013-07-31 17:59:15 -07:00
Andrzej Kapolka
d18a9dc499 Working on full frame video support. 2013-07-31 17:06:09 -07:00
ZappoMan
55988ab802 Merge pull request #738 from Ventrella/particles 
Changed rave glove modes to use names suggested by Brad
 2013-07-31 16:21:04 -07:00
Stephen Birarda
493eda8dd0 Merge pull request #737 from birarda/qt5 
fix automoc error for OpenNI header
 2013-07-31 16:18:32 -07:00
Stephen Birarda
8166ed3a77 move OpenNI include 2013-07-31 16:15:39 -07:00
Stephen Birarda
b3fc378a0f don't include XnCppWrapper if Q_MOC_RUN is defined 2013-07-31 16:14:17 -07:00
Jeffrey Ventrella
be8a587d49 named rave glove effects 2013-07-31 16:07:21 -07:00
Jeffrey Ventrella
6c1cc911d5 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
5b1ba56d67 toggle debug print statements for Leap fingers 2013-07-31 15:12:29 -07:00
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