Commit graph

1120 commits

Author SHA1 Message Date
Philip Rosedale
688bd0f34f first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body' 2014-11-05 16:58:58 -08:00
Stephen Birarda
8a72cdd59d leverage new libcuckoo hash outside LimitedNodeList 2014-11-05 15:09:54 -08:00
ZappoMan
4ea0d32c8c dead code 2014-11-05 12:14:09 -08:00
ZappoMan
e9a332de4d make entity and voxel servers support domain based configuration 2014-11-05 12:12:17 -08:00
Philip Rosedale
558aa52d30 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:14:08 -08:00
Atlante45
fb33634171 ignore penumbra member variable 2014-11-04 16:44:39 +01:00
Atlante45
c7b8f7a792 remove debug #if 2014-11-04 14:00:02 +01:00
Stephen Birarda
74753e5b8b allow a blocking lookup of IP address in HifiSockAddr 2014-11-03 15:13:41 -08:00
Philip Rosedale
cf121a9fe5 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-28 20:22:40 -07:00
Philip Rosedale
f10aeaffab working on audio mixer muting 2014-10-28 20:22:33 -07:00
Philip Rosedale
e5c9ad4525 Merge pull request #3661 from Atlante45/reverb_fixed
Audio Environment packets
2014-10-28 18:11:14 -07:00
Brad Hefta-Gaub
be65a798db Merge pull request #3681 from birarda/verbose-log-silencer
logging tweaks to reduce spam from repeated log messages
2014-10-28 17:58:17 -07:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
Atlante45
12f0237dc7 Cleanup 2014-10-24 15:02:09 -07:00
Atlante45
847ef64b66 move audio env data over to new packet 2014-10-24 14:27:55 -07:00
Atlante45
529a7e0369 CR 2014-10-23 22:55:40 -07:00
Atlante45
d4ec337cae Don't send reverb data as often 2014-10-23 13:39:56 -07:00
Atlante45
9c45055aeb Fixed for no/multiple reverb zones 2014-10-22 23:32:07 -07:00
Philip Rosedale
3ba3354e11 Merge pull request #3636 from Atlante45/reverb
Reverb
2014-10-22 21:51:57 -07:00
Atlante45
8ccbfcf695 code cleanup 2014-10-22 16:41:41 -07:00
Andrzej Kapolka
345a9f02f7 Upload fix. 2014-10-22 14:30:20 -07:00
Atlante45
86c965a922 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-22 14:20:22 -07:00
Andrzej Kapolka
bd4738d2c2 Reliable delta fix. 2014-10-21 15:48:53 -07:00
Andrzej Kapolka
d64b43693d Networking fix. 2014-10-20 15:33:46 -07:00
Atlante45
6f9557fe67 Do not destroy script reverb settings 2014-10-20 15:06:02 -07:00
Atlante45
37b47b52d3 Stream reverb settings from mixer to interface 2014-10-20 11:49:57 -07:00
Atlante45
86b87770c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 16:50:19 -07:00
Atlante45
26b1e8fc29 grab reverb settings on mixer side 2014-10-16 22:46:40 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
Atlante45
9019ae4f89 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones
Conflicts:
	domain-server/resources/web/js/settings.js
2014-10-16 10:55:46 -07:00
AndrewMeadows
4fbc589606 Merge pull request #3598 from birarda/domain-tunnel
initial pass at using keypairs for username verification for basic domain-server ACL
2014-10-16 10:49:03 -07:00
Stephen Birarda
72f0bc61a2 remove some extra spaces 2014-10-15 14:54:28 -07:00
Stephen Birarda
56ad97db17 remove mmintrin include that isn't needed anymore 2014-10-15 14:26:03 -07:00
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Atlante45
b227014510 Stupid mistake 2014-10-14 14:14:59 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
Atlante45
bbd1afc55c Switch hash to an array 2014-10-13 13:50:06 -07:00
Atlante45
6bde4b8324 Move break 2014-10-13 10:24:01 -07:00
Atlante45
d8c60a78bb Fix stupid variable swap 2014-10-10 15:32:29 -07:00
Atlante45
7e8915fed8 Break out of double loop 2014-10-10 10:08:22 -07:00
Atlante45
0aafd23c7f CR 2014-10-10 10:00:35 -07:00
Atlante45
03555174ef Remove TREE_SCALE factor _ update attenuation 2014-10-09 18:54:21 -07:00
Atlante45
90c5c7f43c Attenuation coefficients parsing 2014-10-09 16:41:48 -07:00
Atlante45
0fa95ba61d Removed Unattenuated zones from mixer 2014-10-09 14:46:32 -07:00
Atlante45
06bd9ba16e Split settings parsing according to new structure 2014-10-09 14:39:31 -07:00
Atlante45
981666cb38 Moved audioMixer setting parsing to its own function 2014-10-09 11:49:55 -07:00
Stephen Birarda
7773a94df7 resolve conflicts on merge with upstream master 2014-10-08 09:27:16 -07:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Stephen Birarda
0fd7ec34fc remove an unused const 2014-10-06 12:34:12 -07:00
Stephen Birarda
f89b225da2 handle local socket changes by monitoring every so often 2014-10-06 09:17:25 -07:00
Stephen Birarda
60e3f3edfa add skipSubHandler to OctreeServer HTTPRequestHandler calls 2014-10-02 11:20:56 -07:00
Stephen Birarda
909a6e89a8 resolve conflicts on merge with upstream master 2014-09-30 13:50:04 -07:00
Atlante45
4c34571570 Removed debug 2014-09-30 12:54:58 -07:00
Atlante45
4e7bf0487b Add attenuation setting on DS page 2014-09-30 12:50:50 -07:00
Stephen Birarda
68a70cc914 don't use dashes in settings JSON keys 2014-09-30 09:40:54 -07:00
Andrzej Kapolka
533d59becc Merge pull request #3499 from Atlante45/radio_js
Stereo fix
2014-09-26 20:04:55 -07:00
Atlante45
dfe70ed2e3 Initialize InjectedAudioStream with correct stereo value 2014-09-26 19:23:36 -07:00
Stephen Birarda
e3a85299ce fix setting parsing in AudioMixer for new format 2014-09-26 13:17:11 -07:00
Atlante45
fee01f2c73 Fixed unknow function 2014-09-25 15:26:13 -07:00
Atlante45
94edf2c900 Defaulted penumbra filter to true 2014-09-24 15:45:43 -07:00
Atlante45
22b39fd62a Decreased penumbra filter values 2014-09-23 15:17:46 -07:00
ZappoMan
6f73da7d44 CR feedback 2014-09-18 15:19:03 -07:00
ZappoMan
bd23b8b8b9 completely remove _penumbraFilter from AudioMixer class 2014-09-18 15:01:06 -07:00
ZappoMan
864c1c88a7 fix the filter with delay and add per listener source pair data 2014-09-18 14:58:44 -07:00
ZappoMan
ab447e20ee move filter to single instance in mixer, and do filtering on pre-mix buffer not the mixed buffer 2014-09-17 12:48:47 -07:00
ZappoMan
c30ef9c331 Revert "flip default for enable filter to be disable filter to work around settings bug"
This reverts commit 2a9d8d9238.
2014-09-17 08:52:23 -07:00
ZappoMan
2a9d8d9238 flip default for enable filter to be disable filter to work around settings bug 2014-09-17 07:04:16 -07:00
ZappoMan
9494af6153 fix static when rotating away from source 2014-09-16 20:40:09 -07:00
ZappoMan
b50c2a37c2 Merge branch 'master' of https://github.com/highfidelity/hifi into sendPositonOrientationInSilentPackets 2014-09-16 13:11:00 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Philip Rosedale
35b772bc4d fixes from review 2014-09-16 09:24:23 -07:00
Philip Rosedale
1514b58700 add detect if source is self 2014-09-16 01:30:25 -07:00
Philip Rosedale
62b21f52af fix for sharp change in attenuation when too near a source 2014-09-16 01:18:42 -07:00
Craig Hansen-Sturm
ea6f89c9f4 head penumbra filter tuning / head penumbra filter now turned on by default 2014-09-15 18:46:10 -07:00
ZappoMan
c5e02c4ec5 removed unused lastAttemptedSubTree 2014-09-13 07:58:49 -07:00
Brad Hefta-Gaub
ec23a7a868 Merge pull request #3410 from chansensturm/audio-noise
Head Penumbra filter gain smoothing
2014-09-13 07:47:30 -07:00
Craig Hansen-Sturm
09370840d5 coding standard 2014-09-13 00:35:02 -07:00
Craig Hansen-Sturm
2f8ef6b4fb new head penumbra gain calculations 2014-09-12 18:31:33 -07:00
ZappoMan
6c062102e9 fix typo in comment 2014-09-07 21:21:29 -07:00
ZappoMan
f16a85b2aa fix header 2014-09-05 19:07:30 -07:00
ZappoMan
9e21d26a6d improve ping behavior and clockskew in octree servers by introducing datagramprocessing thread 2014-09-05 19:03:44 -07:00
Andrew Meadows
2f03f0fb0d removed unused variables 2014-09-05 17:00:23 -07:00
Andrew Meadows
be4ec8920d reorderd init of data members in ctor 2014-09-05 16:58:25 -07:00
Andrzej Kapolka
c88afc6b81 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-05 15:07:02 -07:00
Andrzej Kapolka
e476119bd1 Timer should be a child of the server object. 2014-09-05 14:51:14 -07:00
Andrzej Kapolka
742989a0e4 Save metavoxel data regularly, as with voxel data. 2014-09-05 14:35:32 -07:00
Ryan Huffman
38a14c3864 Reapply "Update assignment client to close on WM_CLOSE message on Windows"
This reverts commit a603453cf2.
2014-09-05 11:19:36 -07:00
Leonardo Murillo
a603453cf2 Revert "Update assignment client to close on WM_CLOSE message on Windows" 2014-09-05 11:36:56 -06:00
Craig Hansen-Sturm
fc0a206985 code review comments 2014-09-04 22:57:02 -07:00
Craig Hansen-Sturm
fe0b9825d0 new coordinate calculations for head penumbra filter 2014-09-04 18:10:29 -07:00
AndrewMeadows
9036954d38 Merge pull request #3311 from huffman/fix-wm-close
Update assignment client to close on WM_CLOSE message on Windows
2014-09-03 16:43:12 -07:00
ZappoMan
25e8c7d3f1 useless semicolon removal 2014-09-03 12:22:02 -07:00
ZappoMan
66a2f58192 fix to runaway saving file and optimizations to general encoding paths 2014-09-03 10:55:56 -07:00
Ryan Huffman
1ee23a1661 Add Windows.h include to ShutdownEventListener 2014-09-03 08:04:39 -07:00
Ryan Huffman
76bede04aa Move stdout/err disabling to a library class 2014-09-03 07:06:08 -07:00
Ryan Huffman
c27bee2c06 Move wm_close handling to a shared library 2014-09-03 07:05:24 -07:00
ZappoMan
a555eeda23 CR feedback and warning fixes 2014-09-02 18:43:16 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
2014-08-28 21:19:56 -07:00
Craig Hansen-Sturm
3e3090f1ea coding standard 2014-08-28 11:12:17 -07:00
Ryan Huffman
444a974bd6 Merge branch 'master' of github.com:highfidelity/hifi into fix-wm-close
Conflicts:
	assignment-client/src/AssignmentClient.cpp
2014-08-28 06:52:16 -07:00
Craig Hansen-Sturm
0881959750 left/right channels of head shadow filter now have independent gain + implemented all-pass filter 2014-08-27 17:30:11 -07:00
Craig Hansen-Sturm
40a5ff6b9e ZappoMan deadcode analysis applied 2014-08-27 10:56:44 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Craig Hansen-Sturm
47bc183439 SQUARE_ROOT_OF_TWO renamed SQUARE_ROOT_OF_TWO_OVER_TWO 2014-08-26 11:32:05 -07:00
Craig Hansen-Sturm
5f695664a6 add explicit constants inline for documebntation purposes 2014-08-26 11:26:39 -07:00
Craig Hansen-Sturm
950862839e added high-shelf and low-shelf filters, positional audio now uses high-shelf filter, significant reformatting/renaming of AudioFilter.h for coding standard 2014-08-25 18:17:32 -07:00
Craig Hansen-Sturm
4f346bfe62 addresses more coding-standard spacing issues 2014-08-25 13:07:52 -07:00
Craig Hansen-Sturm
bf6d34b6f3 windows/linux build break + addresses zappoman review comments 2014-08-25 11:43:49 -07:00
ZappoMan
58759d344f cleanup in prep for PR 2014-08-25 10:56:43 -07:00
Craig Hansen-Sturm
4cd1f4afef add support for head-shadow/penumbra filter for positional audio streams 2014-08-24 22:17:07 -07:00
Ryan Huffman
4c485a26ed Merge branch 'fix-wm-close' of github.com:huffman/hifi into fix-wm-close 2014-08-22 15:10:23 -07:00
Ryan Huffman
fa7b2a87bf Add WM_CLOSE support to domain server 2014-08-22 15:09:55 -07:00
Ryan Huffman
b75c3a4976 Disable stdout/err buffering on Windows for assignment client and domain server 2014-08-22 15:08:57 -07:00
ZappoMan
75bb42fb73 debug cleanup 2014-08-22 10:54:00 -07:00
Ryan Huffman
cd46a55369 Fix QAbstractNativeEventFilter include 2014-08-22 09:33:13 -07:00
Ryan Huffman
bc28bfa464 Add guards around custom windows message handling 2014-08-21 17:41:17 -07:00
Ryan Huffman
ad4956b2e2 Update assignment client to close on WM_CLOSE message on Windows 2014-08-21 17:19:39 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
ZappoMan
49cf6dff3a more DIDNT_FIT logic improvements/fixes 2014-08-18 14:09:01 -07:00
ZappoMan
a3bb8b1239 have partial elements set a stop reason of DIDNT_FIT to fix partial encoding issues 2014-08-18 09:37:07 -07:00
ZappoMan
f8f0da189f more work on more entities in a cell 2014-08-15 17:13:59 -07:00
ZappoMan
84ba810dc4 work on reseved bytes in octree packet data 2014-08-15 11:26:55 -07:00
Stephen Birarda
2e6350832c perfom packet verification on same thread as NodeList hash 2014-08-15 09:35:03 -07:00
Stephen Birarda
1e65a093f2 decouple audio-mixer packet receipt from main thread 2014-08-14 12:37:57 -07:00
ZappoMan
b91b81306c quiet more debug 2014-08-14 11:46:35 -07:00
ZappoMan
fbe409a0c2 added lots of debugging for octree edit packet sender bug fixed threading issue 2014-08-14 11:23:56 -07:00
wangyix
e50bd1bed9 separated readpendingdatagrams domain page stats 2014-08-13 17:57:04 -07:00
wangyix
047c4dff65 removed unused var 2014-08-13 17:05:53 -07:00
wangyix
81fa5ed41f readPendingDatagrams stats printed and sent to domain page
jittertester now prints out send or receive error msgs
2014-08-13 16:48:06 -07:00
ZappoMan
49e616dd49 first cut at using erase entity message to delete entities 2014-08-13 14:11:56 -07:00
wangyix
b17c9102c9 added stats for readPendingDatagrams in audiomixer 2014-08-13 13:30:02 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
a405cd9a72 repetition-with-fade ready for commit 2014-08-13 11:01:15 -07:00
wangyix
746893cc94 updateLastOutputLoudnessAndTrailingLoudness 2014-08-13 10:48:47 -07:00
wangyix
ddc8bec1ec moved lastpopframeloudness calculation to checkBuffersBeforeFrameSend 2014-08-13 10:41:25 -07:00
wangyix
f34f0a719b fixed lastPopOutput null ptr errors for frame loudness check 2014-08-13 10:26:01 -07:00
wangyix
23b3d06260 forgot null check for AudioMixer repeat mix of lastPopOutput 2014-08-13 09:46:49 -07:00
wangyix
0007104b6a stats working 2014-08-12 12:58:30 -07:00
wangyix
446c888242 AudioMixer print added; untested 2014-08-12 12:22:32 -07:00
wangyix
8565e93ba4 more test code (10% drop both directions) 2014-08-12 10:50:34 -07:00
wangyix
a31d53544b repetition-with-fade seems good; continue testing 2014-08-11 17:58:01 -07:00
wangyix
e276d15ed4 repetition-with-fade implemented; testing interface crash 2014-08-11 16:25:43 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
wangyix
0dfe0b1f2a merged with master 2014-08-08 13:32:27 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
1f0a722d0d remove antequated windows libraries that have been replaced by Qt usage 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00