Commit graph

3057 commits

Author SHA1 Message Date
Andrzej Kapolka
f8c14a5717 Remove unused variable, reorder includes. 2014-03-18 17:06:01 -07:00
Andrzej Kapolka
635f3b6dc3 Perform the mesh blending in worker threads and only when we've actually
received new data.  Closes #2075.  Closes #2348.
2014-03-18 16:38:05 -07:00
Andrzej Kapolka
500f9d1485 Merge pull request #2338 from AndrewMeadows/cleanup
Don't send redundant avatar hand/head data, and cleanup.
2014-03-18 13:57:30 -07:00
Andrzej Kapolka
5c7d8e7c70 Merge pull request #2351 from AndrewMeadows/warnings
removal of more compilation warnings
2014-03-18 13:54:17 -07:00
Stephen Birarda
f80a077637 fix memory overrun from silent sample writing 2014-03-18 13:33:29 -07:00
Stephen Birarda
9fbb4f1428 spacing fix and silent sample read fix 2014-03-18 13:04:28 -07:00
Stephen Birarda
e7acd0bad3 don't use QDataStream in parseData since we don't really need it 2014-03-18 12:58:29 -07:00
Andrew Meadows
a2fea49f58 bump version of PacketTypeAvatarData from 1 to 2 2014-03-18 12:36:48 -07:00
Stephen Birarda
7ed982a073 cleanup writing of silent frame to ring buffer 2014-03-18 11:12:36 -07:00
Andrew Meadows
9079c3ecd8 explicit casts to remove warnings 2014-03-18 10:41:14 -07:00
Stephen Birarda
b6a41eeaaa resolve conflicts on merge with upstream master 2014-03-18 10:37:04 -07:00
Andrzej Kapolka
6aa1f286bb Alpha is the new default. 2014-03-18 10:13:23 -07:00
Andrew Meadows
de67a828cc Merge upstream/master into cleanup project 2014-03-18 09:41:41 -07:00
Andrew Meadows
b69c339279 don't send redundant head rot and hand pos info 2014-03-18 09:39:05 -07:00
Andrew Meadows
3296447af6 remove dupe hand data from avatar updates
partial progress toward issue #2256
2014-03-17 18:23:55 -07:00
Stephen Birarda
7ba595338e guard around update to last heard for a NULL matching node 2014-03-17 17:39:08 -07:00
Stephen Birarda
7e0da71527 have agent optionally send silent stream flag 2014-03-17 16:38:39 -07:00
Stephen Birarda
61594b9a1e fixes to silent audio frame sending 2014-03-17 16:27:49 -07:00
Stephen Birarda
9f24bd9c47 have the AudioMixer handle silent audio, send silence from Interface when gate closed 2014-03-17 15:12:02 -07:00
Andrew Meadows
679d09610c Merge upstream/master into "no hands" project. 2014-03-17 14:59:14 -07:00
Stephen Birarda
1428d2d1de take an absolute value for correct loudness 2014-03-17 14:35:04 -07:00
Stephen Birarda
bc9deb5db7 handle trivial case of not mixing silent audio streams 2014-03-17 14:29:53 -07:00
Andrew Meadows
ed3cf36045 cleanup: AvatarData doesn't derive from NodeData
Cleaner Interface since the AvatarData is already not the NodeList.
Reduces overhead/confusing code when parsing packets from AvatarMixer.
2014-03-17 14:10:42 -07:00
Brad Hefta-Gaub
927006df91 Merge pull request #2331 from birarda/audio-scaling
AudioMixer optimizations with MMX intrinsics
2014-03-17 11:02:44 -07:00
Stephen Birarda
8228d70248 resolve conflicts on merge with upstream master 2014-03-17 10:09:01 -07:00
ZappoMan
bd6b70ee32 use unsigned int vs size_t, since that just seems more correct 2014-03-16 11:07:24 -07:00
ZappoMan
6f85cfdb2f more warnings fixes 2014-03-15 23:00:03 -07:00
ZappoMan
851764a705 more warning fixes 2014-03-15 22:36:43 -07:00
ZappoMan
adb6ffe7c4 more warnings fixes 2014-03-15 22:00:44 -07:00
ZappoMan
61a905961e darnit I hate casts.. 2014-03-14 22:48:32 -07:00
Brad Hefta-Gaub
1f77505871 more unix warnings cleanup 2014-03-14 18:35:34 -07:00
Brad Hefta-Gaub
c6f8d34ded fix unix warning 2014-03-14 18:16:38 -07:00
Brad Hefta-Gaub
c0ee3fa1f0 fix unix warning 2014-03-14 18:14:54 -07:00
Brad Hefta-Gaub
0e7e337807 fixed uninitialized variable warning 2014-03-14 18:05:40 -07:00
Stephen Birarda
72449fdb6a initial optimizations to AudioMixer with mmx additions 2014-03-14 17:50:57 -07:00
Brad Hefta-Gaub
711e6ca3f5 clean up casts and types to fix warnings in a cleaner way 2014-03-14 17:43:55 -07:00
Andrzej Kapolka
4ca7e873f6 Merge pull request #2319 from AndrewMeadows/warnings
removing a few compile warnings
2014-03-14 16:23:35 -07:00
Andrew Meadows
ab84526a1b removing compile warnings 2014-03-14 16:12:32 -07:00
Andrew Meadows
d4c7e25f8e Merge branch upstream/master into "hands" project 2014-03-14 14:28:50 -07:00
Brad Hefta-Gaub
8f200e917b fix JS radians vs degrees issues 2014-03-14 13:03:14 -07:00
Andrew Meadows
a045a87cca Remove arm stretching, add sixense calibration 2014-03-14 11:11:00 -07:00
Atlante45
423f26f669 Review comments 2014-03-13 15:26:02 -07:00
Atlante45
e5b5778caf Upload FST 2014-03-13 15:04:22 -07:00
Atlante45
51585acd25 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader 2014-03-13 10:53:24 -07:00
Stephen Birarda
54d73d4a64 use floor since round is missing on windows 2014-03-12 17:50:58 -07:00
Stephen Birarda
bd6c42a685 define roundf for use on Win from ScriptEngine 2014-03-12 17:32:52 -07:00
Stephen Birarda
060d8be9f4 Merge branch 'master' of https://github.com/highfidelity/hifi into agent-audio 2014-03-12 17:07:21 -07:00
Stephen Birarda
3b653ca542 add a sendAvatarAudioStream option to Agent for mixer load testing, closes #2291 2014-03-12 17:00:12 -07:00
Andrzej Kapolka
9ad2ea9059 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-12 15:30:39 -07:00
AndrewMeadows
bed8617846 Merge pull request #2277 from ZappoMan/server_scale_testing
Voxel/Particle Server Scaling Work
2014-03-12 15:24:29 -07:00