Commit graph

11021 commits

Author SHA1 Message Date
ZappoMan
28766bebc8 pass down parents inFrustum() state to recursion to allow further optimization 2014-03-17 18:30:08 -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
Andrew Meadows
75ab970c0d fix bug: bad offset into avatar data during decode 2014-03-17 18:23:09 -07:00
Stephen Birarda
1fc9ac1815 make the client mix buffer only as large as it needs to be 2014-03-17 17:55:47 -07:00
Stephen Birarda
f3910f8c1a scope clientMixBuffer only to AudioMixer run 2014-03-17 17:54:27 -07:00
ZappoMan
c09974bcda use parents inFrustum status to optimize children 2014-03-17 17:51:09 -07:00
ZappoMan
62dabd9c1c formatting of stats 2014-03-17 17:49:50 -07:00
Philip Rosedale
2673aa00f0 Merge pull request #2345 from birarda/master
guard around update to last heard for a NULL matching node
2014-03-17 17:40:02 -07:00
Stephen Birarda
7ba595338e guard around update to last heard for a NULL matching node 2014-03-17 17:39:08 -07:00
Andrzej Kapolka
ec1e168423 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-17 17:30:14 -07:00
Philip Rosedale
a7f0e41232 Merge pull request #2342 from birarda/master
switch data for mix samples in AudioMixer
2014-03-17 17:30:14 -07:00
Stephen Birarda
07a71d8796 use char instead of QByteArray for mix samples in AudioMixer 2014-03-17 17:22:16 -07:00
Andrzej Kapolka
d569802fbc More metadata fixes. 2014-03-17 17:21:46 -07:00
ZappoMan
14f8245dd8 adding threading and read write lock tests 2014-03-17 17:07:42 -07:00
Stephen Birarda
746f148e71 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-scaling 2014-03-17 16:57:36 -07:00
Stephen Birarda
447f23a1c9 repair _clientSamples copying into _clientMix 2014-03-17 16:56:29 -07:00
Stephen Birarda
7e0da71527 have agent optionally send silent stream flag 2014-03-17 16:38:39 -07:00
ZappoMan
9411519dc9 fix SimpleMovingAverage::reset() 2014-03-17 16:37:07 -07:00
Stephen Birarda
d652cec766 some potential fixes to QByteArray crash 2014-03-17 16:30:58 -07:00
Stephen Birarda
61594b9a1e fixes to silent audio frame sending 2014-03-17 16:27:49 -07:00
ZappoMan
e9684c0ee5 added more stats to octree server stats page 2014-03-17 16:11:00 -07:00
Andrzej Kapolka
eb95b01aa1 Fixes to, test for metadata streaming. 2014-03-17 16:10:30 -07:00
Philip Rosedale
3c57b5bba9 Merge pull request #2336 from birarda/audio-scaling
handle trivial case of not mixing silent audio streams
2014-03-17 15:47:52 -07:00
Andrzej Kapolka
6d14ad6ab5 Missed a spot. 2014-03-17 15:13:14 -07:00
Andrzej Kapolka
d8b83fd308 More work on version-resilient type streaming. 2014-03-17 15:12:43 -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
c7e12824a8 clarify check for audio loudness in AudioMixer 2014-03-17 14:35:26 -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
ZappoMan
59b272d8db make seeing voxels less noisy and more random 2014-03-17 13:47:46 -07:00
ZappoMan
07adfed6b4 call setLastHeardFromMicrostamp() when we get packets from nodes so NodeList doesn't drop them 2014-03-17 13:47:05 -07:00
Andrzej Kapolka
61660f890e Working on metadata for metatypes. 2014-03-17 11:39:16 -07:00
Stephen Birarda
2be8dec399 Merge pull request #2333 from birarda/master
fix for reversed MMX add in audio mixer
2014-03-17 11:27:10 -07:00
Stephen Birarda
288272f051 fix a reversed MMX add 2014-03-17 11:26:35 -07:00
ZappoMan
949678f74a Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-17 11:03:15 -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
ZappoMan
aab2ca826f Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-17 11:01:25 -07:00
ZappoMan
981ab7374a fix crash in client shutdown, clean up some debugging, clean up Q_OBJECT 2014-03-17 11:01:09 -07:00
ZappoMan
96572d3752 fix some Q_OBJECT macros in class headers 2014-03-17 10:57:53 -07:00
ZappoMan
a448b90726 fix some Q_OBJECT macros in class headers 2014-03-17 10:57:39 -07:00
ZappoMan
cbdd159213 fix constness 2014-03-17 10:55:43 -07:00
Andrew Meadows
c329cebf92 Merge upstream/master into "no-hands" project 2014-03-17 10:48:26 -07:00
Andrew Meadows
68ba2201df cleanup of Avatar:: and MyAvatar::render()
MyAvatar now calls Avatar::render() which does most of the work.
Also, made ::renderBody() a proper virtual function
2014-03-17 10:22:02 -07:00
AndrewMeadows
da58a2f4cd Merge pull request #2324 from ZappoMan/warningsfixes
Warning Fixes for Windows and Unix
2014-03-17 10:13:56 -07:00
Stephen Birarda
cc1d309c15 some really trivial magic number replacements 2014-03-17 10:13:29 -07:00
Stephen Birarda
a1fe41fc1d repair a conflicted translation file 2014-03-17 10:10:26 -07:00
Atlante45
3cd4761fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-17 10:10:00 -07:00
Stephen Birarda
8228d70248 resolve conflicts on merge with upstream master 2014-03-17 10:09:01 -07:00