Tony Hagale
5f94e44cde
#2386 trying a new static lookup table for numberOfOnes()
2014-03-19 16:26:45 -05:00
Philip Rosedale
a1e07374d4
Merge pull request #2369 from ey6es/master
...
Perform blending in worker threads and only do it when we have new data. Removed some unused code and fixed a couple warnings.
2014-03-19 08:59:20 -07:00
Philip Rosedale
cad11978be
Merge pull request #2368 from birarda/master
...
suppress constant packet version mismatch debug
2014-03-18 22:39:20 -07:00
Andrzej Kapolka
250f648f6f
Merge pull request #2371 from AndrewMeadows/master
...
fix bad startPosition in datagram unpack
2014-03-18 17:50:39 -07:00
Andrzej Kapolka
f9fd0d432f
Fix for reading aggregate avatar packets.
2014-03-18 17:48:57 -07:00
Andrew Meadows
6340024daa
fix bad startPosition in datagram unpack
...
The startPosition was wrong (too far back) and the bytesRead return
value was too big and the unpacking of the second chunk of the
datagram would start in the middle of the chunk.
2014-03-18 17:42:58 -07:00
Andrzej Kapolka
6d0269d537
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-18 17:20:44 -07:00
Stephen Birarda
f86b793c96
only output version mismatch once per sender per packet
2014-03-18 17:14:57 -07:00
Andrzej Kapolka
f8c14a5717
Remove unused variable, reorder includes.
2014-03-18 17:06:01 -07:00
Stephen Birarda
281f2c6614
return false in packetVersionAndHashMatch on version mismatch
2014-03-18 17:04:27 -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