Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-15 23:20:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19696 commits 70 branches 59 tags 1.2 GiB
Commit graph

1016 commits

Author SHA1 Message Date
wangyix
7cef5eeeec replaced UINT16_MAX at 2 other places 2014-06-18 10:27:02 -07:00
wangyix
8c4e365958 added forgotten i++ in sendNackPackets() 
plus minor style fixes
 2014-06-18 09:28:42 -07:00
ZappoMan
5a246fab26 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 
Conflicts:
	tests/octree/src/main.cpp
 2014-06-17 17:45:06 -07:00
wangyix
604b17185b call writeUnverifiedDatagram for sending edit nacks 2014-06-17 14:43:13 -07:00
Andrew Meadows
3f36325642 remove warnings about signed/unsigned comparison 2014-06-17 11:59:37 -07:00
wangyix
011e7c2de2 removed debug code 2014-06-17 11:53:09 -07:00
wangyix
8187912384 added qDebug() check in SentPacketHistory for seq numbers 
used (unsigned short int)1 instead of 1 when calculating
expectedSequence
 2014-06-17 11:34:35 -07:00
wangyix
dc71f87ea4 edit nacks seem to be working; 
added mutex for releaseQueuedPacket() to prevent duplicate packets being
queued up due to the steps of queueing the packet and clearing it not
being atomic.
 2014-06-17 10:42:56 -07:00
wangyix
06f8464ec9 edit nacks ready for test; seq numbers sometimes repeat?? 2014-06-16 17:17:48 -07:00
wangyix
95b2524784 removed magic number 65536 from OctreeInboundPacketProcessor 2014-06-16 16:08:48 -07:00
wangyix
14f50f4576 removed old SentPacketHistory 2014-06-16 14:05:27 -07:00
wangyix
ebfd65dea8 added OctreeInboundPacketProcessor::process() override to send nack periodically 
added code to remove dead nodes' stats in sendNackPackets()
 2014-06-16 12:30:16 -07:00
wangyix
2b20720f51 added sendNackPackets() to OctreeInboundPacketProcessor 
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
 2014-06-16 09:57:05 -07:00
wangyix
b210b07b81 rollovers are now handled in SingleSenderStats::trackInboundPacket 2014-06-13 11:08:15 -07:00
wangyix
3d4fae4b3f Revert "added code for AC to send nack packets; no locking yet" 
This reverts commit 15bd0878c4.
 2014-06-13 09:58:56 -07:00
wangyix
1491216962 Revert "added locking on _singleSenderStats; untested!" 
This reverts commit c542da9707.
 2014-06-13 09:58:45 -07:00
John Grosen
47a88a2713 Updated AssignmentClient to use HifiConfigVariantMap... 
...and also updated DomainServer to appropriately use boolean options
 2014-06-12 17:08:23 -07:00
wangyix
c542da9707 added locking on _singleSenderStats; untested! 2014-06-12 12:03:22 -07:00
wangyix
15bd0878c4 added code for AC to send nack packets; no locking yet 2014-06-12 11:37:05 -07:00
wangyix
7955979599 added _missingSequenceNumbers tracking to OctreeInboundPacketProcessor 2014-06-12 09:17:12 -07:00
ZappoMan
2db897a00e Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-11 14:40:25 -07:00
wangyix
c6a9a8924d changed NetworkPacket::_sendingNode to ::_node 2014-06-10 16:43:53 -07:00
wangyix
5ab271330e moved sendNack() into packetDistributor() 
...for the purpose of enforcing packets sent per interval in
OctreeSendThread.  Corrected mistake in keeping track of number of
special packets sent where sendSpecialPacket() was assumed to only send
one packet per call.
 2014-06-10 15:35:48 -07:00
ZappoMan
50bc3b03df Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-10 10:43:59 -07:00
ZappoMan
a0783f3f4a try appendElementData() a different way 2014-06-10 10:43:50 -07:00
ZappoMan
5eb6ddbdb3 first cut at support for extra element data 2014-06-09 16:04:25 -07:00
wangyix
8312e1642d replaced takeFirst() with dequeue() for consistency 2014-06-09 15:15:43 -07:00
ZappoMan
c5647addf4 Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-09 14:10:47 -07:00
wangyix
e45f2fed4b changed writelock to readlock 
plus a coding standard fix
 2014-06-09 13:42:45 -07:00
ZappoMan
6f1ec01797 rename nodeBag to elementBag in a bunch of places 2014-06-09 13:42:44 -07:00
wangyix
ff2a5342ee removed another extra space 2014-06-09 12:57:50 -07:00
wangyix
412d3e19fe removed debug prints in parseNackPacket() 2014-06-09 12:56:00 -07:00
wangyix
0fce7e721a removed more spaces 2014-06-09 12:40:01 -07:00
wangyix
968ea3563c removed an extra space 2014-06-09 12:37:42 -07:00
wangyix
aa694d6967 removed debug code 2014-06-09 12:35:26 -07:00
wangyix
3bc457d4d2 added octree scene stats locking and unlocking 2014-06-09 11:14:02 -07:00
wangyix
b39559d860 packet recovery seems to be working 
Seems to impact FPS a lot.  OctreeSceneStats is not being locked (causes
freezing, need to find out why).
 2014-06-06 17:44:30 -07:00
wangyix
d21a8e73ff Merge remote-tracking branch 'upstream/master' into packet_recovery_pull 2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c added random packet drops; ready to test 2014-06-06 15:03:54 -07:00
Stephen Birarda
194493ab9b remove MMX math to fix stereo discrepancies 2014-06-06 12:00:47 -07:00
wangyix
8cd5ec3b54 started work on sending nack packets from client 2014-06-06 11:50:34 -07:00
Stephen Birarda
f6011b65d7 fix input loudness for a stereo source 2014-06-06 11:26:04 -07:00
Stephen Birarda
ae2f6a3cb6 complete piping of stereo audio through mixer 2014-06-06 10:55:04 -07:00
wangyix
5461a06e99 completed code to resend nacked packets on AC 2014-06-06 09:33:14 -07:00
wangyix
1a7e3a859c started work on resending nacked packets 2014-06-05 18:00:58 -07:00
wangyix
6f45939113 re-enabled piggy-backing in OctreeSendThread 2014-06-04 11:02:31 -07:00
wangyix
50746a6540 extra commit of previous commit? 2014-06-03 16:19:12 -07:00
ZappoMan
758df4f58b silence some unused variable warnings and move some debug code to only execute in debug mode 2014-06-02 10:43:50 -07:00
wangyix
4c4ff45f31 removed duplicate function bodies 2014-05-29 14:31:40 -07:00
wangyix
d8b0b03e59 removed _sequenceNumber from OctreeSendThread 
inlined getSequenceNumber and incrementSequenceNumber
 2014-05-29 13:39:57 -07:00
wangyix
f82be105e8 moved _sequenceNumber back to OctreeQueryNode 2014-05-29 12:54:34 -07:00
wangyix
fe1a0e4565 removed debug stuff i missed 2014-05-29 11:27:14 -07:00
wangyix
c87c474877 removed debug info, cleaned code for pull req 2014-05-29 10:39:40 -07:00
wangyix
5d4b0df108 added flag,seq,st to EnvironmentData, untested 
removed/commented out debug prints
 2014-05-28 17:41:38 -07:00
wangyix
c799077379 added flag,seq,ts to ParticleErase and ModelErase 
... this fixes unreasonable flight-time issue
 2014-05-28 17:20:10 -07:00
wangyix
f361b9a8a7 removed updatePacketTimestamp() 
..from OctreeQueryNode
 2014-05-27 18:04:53 -07:00
wangyix
e89d33dc60 added if to not track ParticleErase packets 2014-05-27 18:02:49 -07:00
Stephen Birarda
f4292fd29c handle serving of scripts at temp unique UUIDs 2014-05-23 12:33:39 -07:00
wangyix
fe5fabdd61 removed old code that was commented out 
changed tabs to spaces
 2014-05-23 11:17:59 -07:00
wangyix
87d927d447 moved _sequenceNumber back to OctreeQueryNode 
instead added incrementSequenceNumber() to OctreeQueryNode for
sendthread to use
 2014-05-23 10:09:46 -07:00
wangyix
645002493f Merge remote-tracking branch 'upstream/master' 2014-05-23 09:48:05 -07:00
wangyix
2dd78b36db moved _sequenceNumber to OctreeSendThread 2014-05-23 09:47:08 -07:00
Stephen Birarda
97b67e83c5 remove more gnutls includes 2014-05-20 16:16:23 -07:00
Stephen Birarda
f1581ef823 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 16:16:22 -07:00
Stephen Birarda
8a1fdf3486 pass wallet UUID from AC to DS, cleanup noisy timer 2014-05-20 14:38:51 -07:00
Stephen Birarda
2ef822d19d remove more gnutls includes 2014-05-20 11:26:22 -07:00
Stephen Birarda
e3dd6509d8 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 10:47:11 -07:00
ZappoMan
fa20e8ff95 fix the agent support for scripting models 2014-05-14 13:17:10 -07:00
Philip Rosedale
4e1eaf8337 Merge pull request #2809 from Atlante45/mute_env 
Mute environment
 2014-05-07 16:18:23 -07:00
Stephen Birarda
5e9036b3fe tweak audio constants to be less agressive on cutoff 2014-05-07 15:37:41 -07:00
Atlante45
fd1f6befff CR 2014-05-07 15:19:32 -07:00
Atlante45
40ed72989c mute environment packet 2014-05-07 12:57:11 -07:00
Stephen Birarda
befe75a04c fix broken audio-mixer stats 2014-05-05 14:03:14 -07:00
Stephen Birarda
aa2931d9bb resolve conflicts on merge with upstream/master 2014-05-02 10:39:17 -07:00
ZappoMan
715e6b8e60 debugging model editing 2014-05-02 09:10:30 -07:00
Stephen Birarda
2f0e311a99 return OAuth URL to interface clients when OAuth enabled 2014-05-01 10:19:05 -07:00
ZappoMan
0182a6d895 models working end to end 2014-04-30 11:12:49 -07:00
ZappoMan
f993f984c9 first cut at modelserver 2014-04-30 09:26:14 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Atlante45
ae566c55f6 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-23 10:38:29 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
AndrewMeadows
94fabf7875 Merge pull request #2709 from ZappoMan/shared_and_weak_pointers 
Voxel/Particle Server Performance Improvements
 2014-04-22 10:28:39 -07:00
Atlante45
ddf14b0842 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-22 10:22:30 -07:00
ZappoMan
60b8ab0de5 CR feedback 2014-04-21 17:45:38 -07:00
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
ZappoMan
a64d3ffc32 more cleanup 2014-04-21 16:38:45 -07:00
ZappoMan
7d18dbdfb8 more cleanup 2014-04-21 16:35:42 -07:00
Atlante45
cfc778d10c Fix regexp fail 2014-04-21 16:32:17 -07:00
ZappoMan
e55c488964 clean up some old debugging 2014-04-21 16:17:59 -07:00
Atlante45
681aab5bf0 Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
ZappoMan
003e3ae507 properly unhook delete notifications 2014-04-21 16:01:37 -07:00
ZappoMan
f3aa9d3b8f unhook node bag from element notifications on shutdown to speed up cleanup 2014-04-21 15:45:12 -07:00
ZappoMan
7a8a8e2fac delete tree on server shutdown 2014-04-21 15:14:06 -07:00
ZappoMan
75f079e2b3 tweak debugging 2014-04-21 14:15:13 -07:00
ZappoMan
9a63fa7550 some cleanup 2014-04-21 13:36:13 -07:00
ZappoMan
14e1fa269a cleanup 2014-04-21 13:28:03 -07:00
Atlante45
ab76e6a00c Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 
Conflicts:
	interface/src/Audio.cpp
 2014-04-21 12:19:19 -07:00
ZappoMan
7798c6eb09 some debugging 2014-04-21 11:48:58 -07:00
ZappoMan
59cbda20c6 added some threading and event debugging 2014-04-20 19:48:17 -07:00
ZappoMan
50f7db8fe1 quiet some debugging 2014-04-18 15:02:10 -07:00
ZappoMan
2c02178802 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
	assignment-client/src/AssignmentClient.h
	libraries/shared/src/NodeList.cpp
 2014-04-18 14:28:54 -07:00
Stephen Birarda
6adfb91e93 rename AvatarHash to AvatarList 2014-04-18 09:40:35 -07:00
Stephen Birarda
77202af20d add debug for erase from AvatarHashMap, repair check for display name 2014-04-17 18:05:22 -07:00
Stephen Birarda
75f35c5858 optionally add an AvatarHashMap instance to the ScriptEngine 2014-04-17 17:55:16 -07:00
Stephen Birarda
f8106e5063 add an AvatarHashMap to the Agent 2014-04-17 17:49:55 -07:00
Andrzej Kapolka
6251b6b819 Merge fix. 2014-04-17 13:55:16 -07:00
Andrzej Kapolka
599b472cf7 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	assignment-client/src/Agent.cpp
 2014-04-17 13:51:32 -07:00
Stephen Birarda
a137dd0362 grab URL for script from payload if it exists 2014-04-17 10:18:42 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
Atlante45
dd8a0e3550 Removed gettimeofday in AudioMixer 2014-04-16 12:16:49 -07:00
Stephen Birarda
7cef2def66 remove Syssocket which is from our pre-Qt days 2014-04-10 10:34:31 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
2d755adfc0 repairs to good code blown away by regex 2014-04-09 10:46:20 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
Stephen Birarda
7ce91b3f96 fix headers who had their comments removed 2014-04-08 17:43:35 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00
Stephen Birarda
02e2135a2e allow setting of expected DTLS cert hostname from AC 2014-04-07 12:52:26 -07:00
Stephen Birarda
69504b0a9d proper cleanup of CA credentials on DTLSClientSession side 2014-04-07 09:47:51 -07:00
Stephen Birarda
fd8e32190e perform cleanup of GnuTLS structures across targets 2014-04-04 11:08:53 -07:00
Stephen Birarda
e1cae6d295 initial handshaking for DTLS sessions between DS and clients 2014-04-02 17:29:14 -07:00
Andrzej Kapolka
40844d2000 Working on ability to set a region of the metavoxel data directly. 2014-04-02 12:40:01 -07:00
ZappoMan
dc7e2dbe1b more debugging 2014-04-01 20:14:38 -07:00
ZappoMan
97b2e68988 more debugging 2014-04-01 14:05:05 -07:00
ZappoMan
b7695ba050 more debugging 2014-04-01 13:55:25 -07:00
Stephen Birarda
62041d91a8 rename NodeList DomainInfo to DomainHandler 2014-04-01 13:09:35 -07:00
Stephen Birarda
caf2473df8 add a DTLSSession object to handle GnuTLS DTLS sessions 2014-04-01 13:08:00 -07:00
ZappoMan
124619f8d9 more debugging 2014-04-01 12:51:34 -07:00
ZappoMan
6cb44a4d0c more debugging 2014-04-01 12:33:59 -07:00
ZappoMan
916a5d2da0 more debugging 2014-04-01 12:24:03 -07:00
ZappoMan
f504569655 more debugging 2014-04-01 11:49:49 -07:00
ZappoMan
58a52cf5e1 more debugging 2014-04-01 11:45:29 -07:00
ZappoMan
30ff4a1d19 more debugging 2014-04-01 11:32:35 -07:00
ZappoMan
1aa05c4de5 more debugging 2014-04-01 11:26:55 -07:00
ZappoMan
9e445098f1 more debugging 2014-04-01 11:22:44 -07:00
ZappoMan
193e237285 tweaks 2014-04-01 10:58:20 -07:00
ZappoMan
9d757434ab testing tweak 2014-04-01 10:47:25 -07:00
ZappoMan
ce8a599b16 tweak 2014-04-01 10:38:21 -07:00
ZappoMan
64c7a6a440 testing, remove create sending thread and processing of query 2014-04-01 10:25:32 -07:00
ZappoMan
ff17c6a071 quiet some debugging 2014-04-01 10:08:46 -07:00
ZappoMan
21e0bc119b moved OctreeServer::stopTrackingThread() to destructor instead of setIsShuttingDown() 2014-04-01 09:50:10 -07:00
ZappoMan
20d944a43b removed some debug 2014-04-01 09:31:40 -07:00
ZappoMan
6ed9b968b0 removed some extra debugging 2014-04-01 09:23:19 -07:00
ZappoMan
9df315d889 removed dead debug code 2014-03-31 20:54:58 -07:00
ZappoMan
7cd39d3ef0 add forceNodeShutdown() to handle forced shutdown of nodes in case of server shutdown 2014-03-31 20:53:34 -07:00
ZappoMan
b5c538b051 added some debugging 2014-03-31 18:22:06 -07:00
ZappoMan
9d60be9773 cleanup some debugging 2014-03-31 17:57:48 -07:00
ZappoMan
ef68f164c9 tweak shutdown 2014-03-31 17:05:31 -07:00
ZappoMan
dc302e7126 tweak shutdown 2014-03-31 16:51:00 -07:00
ZappoMan
7a683b177d added some debugging, and reordered some shutdown logic 2014-03-31 16:43:25 -07:00
ZappoMan
5c37a79378 cleanup of debuggin 2014-03-31 15:42:16 -07:00
ZappoMan
b3734d870b cleanup 2014-03-31 15:39:12 -07:00
ZappoMan
1eb15b0d12 cleanup 2014-03-31 15:37:53 -07:00
ZappoMan
a9d153054f remove _process mutex since it's no longer needed 2014-03-31 15:28:13 -07:00
ZappoMan
27f42b5b86 clean up headers 2014-03-31 15:15:54 -07:00
ZappoMan
514f43c6cc revert tweaks 2014-03-31 15:10:36 -07:00
ZappoMan
a82a583030 cleanup 2014-03-31 14:59:28 -07:00
ZappoMan
6601a0d4e9 cleaning up nodeKilled() 2014-03-31 14:54:39 -07:00
ZappoMan
6df3ff57c4 cleanup isNull() usage 2014-03-31 14:30:25 -07:00
ZappoMan
226274e98b cleaning up SharedNodePointer usage 2014-03-31 14:24:08 -07:00
ZappoMan
0f9df4a8ee clean up includes 2014-03-31 14:11:47 -07:00
ZappoMan
faa062f8ab use single instance of SharedAssignmentPointer for assignment client so we actually get reference counting 2014-03-31 14:08:19 -07:00
ZappoMan
7c8295dd94 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-03-28 11:06:02 -07:00
ZappoMan
640dbaacab migration to shared pointers 2014-03-28 11:05:54 -07:00
Stephen Birarda
eb35b63651 use a shared pointer for more elegant cleanup at assignment conclusion 2014-03-28 10:48:44 -07:00
ZappoMan
8856a609a4 first cut at migrating to SharedOctreeServerPointer for ref count management of OctreeServer 2014-03-28 09:46:23 -07:00
ZappoMan
0cb9bec1aa keep SharedNodePointer in the OctreeSendThread 2014-03-27 19:29:18 -07:00
ZappoMan
c540427b9e tweaks to _processLock to reduce time it's locked 2014-03-27 15:03:46 -07:00
Stephen Birarda
0fc83d81fd Merge pull request #2555 from ZappoMan/backtotrylockanduuid 
added back use of nodeWithUUID() instead of sharedpointer
 2014-03-27 13:55:17 -07:00
ZappoMan
bda96ef935 added back use of nodeWithUUID() instead of sharedpointer 2014-03-27 13:35:22 -07:00
Stephen Birarda
21eef6c15e make sure VoxelServer and ParticleServer are in Agent interest list 2014-03-27 13:10:03 -07:00
ZappoMan
9fdfa4a7a8 switch to using SharedNodePointer instead of UUID in octree server send thread 2014-03-27 02:33:32 -07:00
AndrewMeadows
cec3f944d7 Merge pull request #2525 from ZappoMan/scaling_work 
Voxel/Particle Server Scaling Work
 2014-03-26 15:16:22 -07:00
ZappoMan
c56efb9e4c formatting tweaks 2014-03-26 13:41:49 -07:00
ZappoMan
0451ce455f added --statusHost config option to allow us to specify the host name of the status page 2014-03-26 13:25:38 -07:00
Stephen Birarda
28f962ea2b fix for AudioMixer kill and re-add and no sound load in bot 2014-03-26 13:19:20 -07:00
ZappoMan
18eda50118 added thread counts to json stats 2014-03-26 13:13:55 -07:00
ZappoMan
7a3e19eb0f Merge branch 'master' of https://github.com/worklist/hifi into scaling_work 2014-03-26 12:18:08 -07:00
ZappoMan
bc68ed1300 moved stopTrackingThread() to setIsShuttingDown() to reduce chance of object conflict 2014-03-26 11:59:55 -07:00
Stephen Birarda
962c7350f3 wait on broadcastThread before destroying AvatarMixer, closes #2499 2014-03-26 11:53:57 -07:00
ZappoMan
c3aab7337f added more performance stats tracking to octree server 2014-03-26 11:36:35 -07:00
Stephen Birarda
e2b230445f add a method to Agent for last read frame loudness 2014-03-26 10:28:59 -07:00
Stephen Birarda
34634af975 add mutex header to NodeData 2014-03-25 16:05:51 -07:00
Stephen Birarda
c8b3ae0c40 add a mutex to NodeData and leverage in AvatarMixer threads 2014-03-25 15:49:47 -07:00
Stephen Birarda
6f4f55038b add back selective inclusion of Avatars based on distance 2014-03-25 15:31:53 -07:00
Stephen Birarda
6b8c60e964 remove waitForBytesWritten for initial tests 2014-03-25 15:10:53 -07:00
Stephen Birarda
292fb51b43 use performance throttling instead of distance to decide when to send 2014-03-25 15:05:17 -07:00
Stephen Birarda
269615bc40 thread broadcast of avatar data in AvatarMixer 2014-03-25 14:02:24 -07:00
Stephen Birarda
0407c6d324 use QTimer to clock broadcastAvatarData method 2014-03-25 13:50:22 -07:00
Stephen Birarda
4e77afb4b2 block and wait for bytes to be written during broadcastAvatarData loop 2014-03-25 13:38:02 -07:00
Stephen Birarda
9d6dac6a76 suppress sleep time debug in favour of stats in AvatarMixer 2014-03-25 12:18:28 -07:00
Stephen Birarda
1fe01f3e61 increment framesSinceCutoffEvent in mixers to enable recovery 2014-03-25 12:16:07 -07:00
Stephen Birarda
ff788a340b add stat for average billboard and identity packets per frame 2014-03-25 11:38:00 -07:00
Stephen Birarda
786d9ce404 force sending of identity and billboard packets changed in last frame 2014-03-25 10:56:06 -07:00
Stephen Birarda
e6b83ac52d send mesh and billboard on receiver's first connect 2014-03-25 10:34:38 -07:00
Stephen Birarda
e8b9594758 spread out billboard and identity fallbacks 2014-03-25 09:39:43 -07:00
Stephen Birarda
ce214bc439 use the performance tuning ratio in avatar mixer to send less 2014-03-24 16:48:23 -07:00
Stephen Birarda
b01b2a3311 use explicit float casts where appropriate 2014-03-24 16:35:36 -07:00
Stephen Birarda
ba338cb7bc at minimum send packet rate stats for ThreadedAssignment subclasses 2014-03-24 16:06:25 -07:00
Stephen Birarda
3db8386743 suppress trailing sleep ratio debug 2014-03-24 15:46:02 -07:00
Stephen Birarda
e7f9acd945 add trailing sleep and performance throttling logic to AvatarMixer 2014-03-24 15:42:57 -07:00
Stephen Birarda
638e9eae48 add some basic stat collection to avatar-mixer 2014-03-24 15:38:01 -07:00
Stephen Birarda
8dbe4dfdde collect packet rate stats in NodeList 2014-03-24 15:06:53 -07:00
Stephen Birarda
40fa4bfbd2 fix octree server HTTPRequestHandler for url handling 2014-03-24 14:15:38 -07:00
Stephen Birarda
f8279c1f5b handle query params in HTTPManager, display stats table from DS 2014-03-24 14:14:26 -07:00
Stephen Birarda
1fffda674a send extra stats from audio-mixer to domain-server 2014-03-24 13:14:22 -07:00
Stephen Birarda
5f93e44ff7 abstract stats packet sending to NodeList 2014-03-24 12:33:00 -07:00
Stephen Birarda
8f403609e7 hook JSON stats sending from domain-server 2014-03-24 11:56:16 -07:00
Stephen Birarda
c0da215a60 correctly output trailing sleep time 2014-03-24 10:39:10 -07:00
Stephen Birarda
d0fbf4953a change back off strategy, output trailing sleep 2014-03-24 10:27:46 -07:00
Stephen Birarda
5567d9acb9 change audio-mixer struggle behaviour 2014-03-24 09:24:13 -07:00
ZappoMan
d63acfc46f revert 2014-03-23 18:12:02 -07:00
ZappoMan
d962387c75 revert 2014-03-23 18:11:40 -07:00
ZappoMan
9c7ffffbae fix some windows issues 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
 2014-03-23 18:10:22 -07:00
Stephen Birarda
c5b0288c12 remove numClientsMixedInFrame since it is no longer used 2014-03-21 18:49:46 -07:00
Stephen Birarda
af4fb26031 floats are important 2014-03-21 18:44:59 -07:00
Stephen Birarda
abd6c8a747 fix trailing average on ring buffer, remove unused constant 2014-03-21 18:28:12 -07:00
Stephen Birarda
88348b12d2 fix a divide by zero and output number of clients mixed in last frame 2014-03-21 18:16:47 -07:00
Stephen Birarda
42de3047ab Merge pull request #2442 from birarda/master 
change delta to 2%, don't hit 1 for cutoff
 2014-03-21 17:17:47 -07:00
Stephen Birarda
88b91b9eb7 change an int to a float 2014-03-21 17:17:11 -07:00
Stephen Birarda
8ecd9aa0c0 change audibility delta to 2%, don't hit 1.0 2014-03-21 17:16:54 -07:00
Stephen Birarda
e3b65f4949 Merge pull request #2441 from birarda/master 
linear change to audability ratio
 2014-03-21 16:48:01 -07:00
Stephen Birarda
34f9075980 use a linear change to audability ratio 2014-03-21 16:47:41 -07:00
Stephen Birarda
949aefac62 Merge pull request #2439 from birarda/master 
check for an audio cutoff change only every TRAILING_AVERAGE_FRAMES
 2014-03-21 16:21:26 -07:00
Stephen Birarda
dc2d050187 remove sleep time debug now that the audio-mixer reports struggle 2014-03-21 15:47:21 -07:00
ZappoMan
438e5bd235 fix crash on domain restart in Agent, also have Agent properly shutdown on call to Script.stop() 2014-03-21 15:46:06 -07:00
Stephen Birarda
50007d7f4b fix a debug message for audability threshold 2014-03-21 15:43:39 -07:00
Stephen Birarda
75bc640104 fix some indentation is audio mixer cutoff code 2014-03-21 15:42:58 -07:00
Stephen Birarda
4661553acb check for cutoff change only every TRAILING_AVERAGE_FRAMES 2014-03-21 15:40:08 -07:00
Stephen Birarda
4bde0e6844 Merge pull request #2436 from ZappoMan/vscrashfix 
fixes to voxel server crashes on client shutdown
 2014-03-21 15:24:45 -07:00
Stephen Birarda
c99f5a4ae6 int to float conversion in the constructor 2014-03-21 14:38:01 -07:00
Stephen Birarda
98f014d13d add another check to avoid any mixing for a silent frame 2014-03-21 14:37:31 -07:00
Stephen Birarda
3d9aa6cc9f fix a spelling mistake and convert some ints to floats 2014-03-21 14:36:44 -07:00
Stephen Birarda
18e5637976 remove some extra spaces 2014-03-21 14:33:11 -07:00
Stephen Birarda
2575b33662 reinstate a cutoff when the audio-mixer is struggling 2014-03-21 14:29:57 -07:00
ZappoMan
3cb3cb81c4 fixes to voxel server crashes on client shutdown 2014-03-21 14:15:02 -07:00
Stephen Birarda
c1cbc79807 move debug for no reply domain checkins to ThreadedAssignment 2014-03-21 10:26:09 -07:00
Stephen Birarda
0105029d9c output number of no reply domain checkins when finished 2014-03-21 10:10:25 -07:00
Stephen Birarda
24e9446814 remove mixer cutoff strategy for testing 2014-03-21 09:52:07 -07:00
Stephen Birarda
5ae63c5b0f use a trailing average for sleep time, move loudness to RB 2014-03-20 17:10:24 -07:00
Stephen Birarda
5515141792 use a trailing average for _nextOutputLoudness 2014-03-20 16:50:20 -07:00
Stephen Birarda
7f96c71793 actually require minRequiredLoudness for a stream to be mixed in 2014-03-20 16:17:09 -07:00
Philip Rosedale
a30af08062 Merge pull request #2407 from ZappoMan/voxel_server_crash_fixes 
fix voxel server crash/pure virtual call on shutdown of client
 2014-03-20 15:33:59 -07:00
ZappoMan
b4f5a6d1ce add _isShuttingDown to OctreeQueryNode and bail as fast as possible when shutting down 2014-03-20 14:44:47 -07:00
Stephen Birarda
64f946b640 require that buffers be above min loudness to be mixed in 2014-03-20 13:01:52 -07:00
Stephen Birarda
a8ef64e0ce calculate a cutoff loudness for mixer recovery 2014-03-20 12:52:17 -07:00
Stephen Birarda
fb73b6e1ce collect min and max loudness for each frame 2014-03-19 17:57:01 -07:00
Philip Rosedale
22048aaba5 Merge pull request #2392 from birarda/audio-scaling 
allow Agents to send microphone audio using Sound objects
 2014-03-19 17:00:46 -07:00
Philip Rosedale
e14069c9e3 Merge pull request #2376 from ZappoMan/experimental_scaling 
Voxel Server Performance Improvements
 2014-03-19 16:24:47 -07:00
Stephen Birarda
8c4fad443f allow Agents to microphone audio from Sound objects 2014-03-19 16:14:58 -07:00
ZappoMan
cd6e0f1698 switch to deleteLater to prevent deadlock 2014-03-19 01:02:49 -07:00
ZappoMan
b3f60a068d remove isScheduledForDelete from OctreeQueryNode 2014-03-19 00:17:14 -07:00
ZappoMan
450a9c03a7 revert changes 2014-03-18 23:54:23 -07:00
ZappoMan
499c4bd500 fix octree server crashes on various shutdown corner cases 2014-03-18 17:44:53 -07:00
ZappoMan
220232312d remove unused variables 2014-03-18 16:06:20 -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
Stephen Birarda
b6a41eeaaa resolve conflicts on merge with upstream master 2014-03-18 10:37:04 -07:00
Andrew Meadows
de67a828cc Merge upstream/master into cleanup project 2014-03-18 09:41:41 -07:00
Andrew Meadows
272cb879f8 change wording of comment 2014-03-18 09:38:49 -07:00
ZappoMan
dfb07e717d removed old debugging code 2014-03-18 09:34:24 -07:00
ZappoMan
86c2b5baa7 removed some debugging, added some comments, more work on optimizaiton 2014-03-18 01:51:30 -07:00
ZappoMan
329d3b37e0 add last know root timestamp property to query node 2014-03-18 01:07:45 -07:00
ZappoMan
beffb6deae clean up stats 2014-03-18 01:04:52 -07:00
ZappoMan
34b2ccb9d7 adding not sent to stats 2014-03-18 00:02:47 -07:00
ZappoMan
fc50cc0604 improving server stats 2014-03-17 23:40:07 -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
62dabd9c1c formatting of stats 2014-03-17 17:49:50 -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
Stephen Birarda
447f23a1c9 repair _clientSamples copying into _clientMix 2014-03-17 16:56:29 -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
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
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
07adfed6b4 call setLastHeardFromMicrostamp() when we get packets from nodes so NodeList doesn't drop them 2014-03-17 13:47:05 -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
Stephen Birarda
cc1d309c15 some really trivial magic number replacements 2014-03-17 10:13:29 -07:00
Stephen Birarda
05d6522279 more MMX optimizations to AudioMixer for delayed samples 2014-03-17 10:02:00 -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
7d7e1ff28a one more crack at this signedness comparisons on unix 2014-03-15 23:37:52 -07:00
ZappoMan
5709a8893e more unix signedness warnings 2014-03-15 23:19:16 -07:00
ZappoMan
08d89a4565 arg windows signedness warnings 2014-03-15 23:17:03 -07:00
ZappoMan
6f85cfdb2f more warnings fixes 2014-03-15 23:00:03 -07:00
ZappoMan
adb6ffe7c4 more warnings fixes 2014-03-15 22:00:44 -07:00
Stephen Birarda
72449fdb6a initial optimizations to AudioMixer with mmx additions 2014-03-14 17:50:57 -07:00
ZappoMan
21458036cc clean up formatting of sending stats 2014-03-14 10:37:41 -07:00
ZappoMan
4c39a891be add more packet sending statistics to server 2014-03-14 10:23:07 -07:00
ZappoMan
8006719fda add new stats to OctreeServer 2014-03-14 00:42:23 -07:00
Stephen Birarda
54d73d4a64 use floor since round is missing on windows 2014-03-12 17:50:58 -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
AndrewMeadows
bed8617846 Merge pull request #2277 from ZappoMan/server_scale_testing 
Voxel/Particle Server Scaling Work
 2014-03-12 15:24:29 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
ZappoMan
6173a4d2a7 fix isFullScene correctly 2014-03-12 10:19:21 -07:00
ZappoMan
7e6beba4d2 removed redundant calc of isFullScene 2014-03-12 01:29:41 -07:00
ZappoMan
4d0b762de3 some hacking on full scene debuggin 2014-03-11 20:33:53 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
81e3197751 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:03:30 -07:00
Andrzej Kapolka
9e5aae4a39 Remove spanner bits. 2014-03-10 17:01:27 -07:00
ZappoMan
cfa618d694 cleanup constructors 2014-03-08 23:31:23 -08:00
Andrzej Kapolka
0448596e58 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2014-03-05 18:28:25 -08:00
Andrzej Kapolka
63b4a2453b Lots of work on metavoxel LODs and spanners. 2014-03-04 21:27:13 -08:00
ZappoMan
374af9eeb5 first cut at flocking birds, change willEmitVisualCallback to update 2014-03-04 14:40:49 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
ZappoMan
ef87fbffac Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	libraries/shared/src/ResourceCache.cpp
 2014-02-28 16:58:43 -08:00
Stephen Birarda
094159eefd make Agent parent of ScriptEngine so they stay on same thread 2014-02-28 16:47:54 -08:00
ZappoMan
c1c41ea2ca handle some shutdown cases and reduce time of locking in octree server 2014-02-28 16:18:02 -08:00
ZappoMan
8d7406461a Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	assignment-client/src/octree/OctreeServer.h
 2014-02-28 10:54:56 -08:00
ZappoMan
f9718913e2 fix octree-server random spinout sometimes when client disconnects 2014-02-27 16:13:05 -08:00
ZappoMan
cdb0aeb153 some hacking on server performance 2014-02-27 10:47:17 -08:00
ZappoMan
2832c33482 fixed div by zero 2014-02-26 21:38:28 -08:00
ZappoMan
6f1136c417 more status page formatting, and include max total packets in packets per client interval 2014-02-26 21:25:34 -08:00
ZappoMan
85a42849a8 work on current client count 2014-02-26 21:25:15 -08:00
ZappoMan
8c4fdbb1c6 remove dead comments 2014-02-26 21:24:50 -08:00
ZappoMan
a34aef658d cleanup OctreeSendThread correctly 2014-02-26 21:24:32 -08:00
ZappoMan
1603c1f38c work on client stats and max total packets per second 2014-02-26 21:24:12 -08:00
ZappoMan
39ba98f3b1 fixed a comment 2014-02-26 14:23:58 -08:00
ZappoMan
1e404404c3 next pass at seeing voxels 2014-02-26 13:35:59 -08:00
Stephen Birarda
937768ae51 add option for fake billboard from URL, closes #2087 2014-02-25 13:51:48 -08:00
ZappoMan
039f9ff1e3 Merge pull request #2088 from birarda/authentication 
always authenticate to default and fix audio-mixer session UUID
 2014-02-25 11:22:54 -08:00
Stephen Birarda
a24366fcd7 populate packet header only once session UUID is received 2014-02-25 11:16:19 -08:00
Stephen Birarda
b09ed1dff1 present a login window on app start 2014-02-25 10:53:13 -08:00
ZappoMan
17e4426b50 Merge pull request #2086 from PhilipRosedale/master 
Add stochastic falloff for sending other avatar’s data
 2014-02-25 10:52:43 -08:00
Philip Rosedale
176cb103dc Add stochastic falloff for sending other avatar’s data 2014-02-25 10:41:33 -08:00
Stephen Birarda
61fcfd17e3 add org and app info to AC for settings ini 2014-02-24 15:16:56 -08:00
Stephen Birarda
050d223b3a add domain connection reset to NodeList reset 2014-02-24 13:33:52 -08:00
Stephen Birarda
27c779666b add auth to assignment-client, fix refresh of static assignments 2014-02-24 13:29:32 -08:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Andrzej Kapolka
8745ca3139 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-23 20:13:23 -08:00
Andrzej Kapolka
68fea8de1e More merge fixes. 2014-02-21 18:32:05 -08:00
Andrzej Kapolka
e470b1c41d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-02-21 18:26:40 -08:00
Andrzej Kapolka
ac02609bc2 The basic billboard behavior, closes #1864. 2014-02-21 15:38:49 -08:00
Stephen Birarda
340248ac43 resolve conflicts on merge with upstream master 2014-02-21 15:16:15 -08:00
Andrzej Kapolka
8d01527d93 Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo 2014-02-21 12:16:33 -08:00
Andrzej Kapolka
10ce2cb3f0 Working on sending the billboards over the network. 2014-02-21 11:49:29 -08:00
ZappoMan
a12e1ef18f Merge pull request #2043 from birarda/metavoxel-fix 
fixes for extra characters in logging target names
 2014-02-21 10:24:29 -08:00
Andrzej Kapolka
d8321bd419 Merge pull request #2034 from birarda/master 
fixes for scripted avatars
 2014-02-21 10:14:41 -08:00
Stephen Birarda
a6c1e3e87f tweaks to domain-server authentication flow 2014-02-20 16:31:50 -08:00
Stephen Birarda
3bace43aae Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-20 12:08:47 -08:00
Stephen Birarda
cfec1e583e fix logging target-name extra characters 2014-02-20 12:02:23 -08:00
Stephen Birarda
4022d9f4c4 fix metavoxel interest list, keep node alive with ping 2014-02-20 11:36:16 -08:00
Stephen Birarda
ee9f8937e3 fix a silly typo 2014-02-19 18:03:34 -08:00
Stephen Birarda
4ee416ba96 fixes for scripted avatars, closes #2033 2014-02-19 16:55:24 -08:00
Stephen Birarda
7c69028dc5 hook up domain request for node to authenticate 2014-02-18 10:54:45 -08:00
Stephen Birarda
37f1f7ba4f add a DomainInfo class to hold domain information 2014-02-18 09:59:22 -08:00
Andrzej Kapolka
9c91d3c2e7 Use the existing session stuff for metavoxels rather than a separate system. 2014-02-13 10:25:10 -08:00
Stephen Birarda
a1a4a3db8a HifiSockAddr to SharedNodePointer changes in MetavoxelServer 2014-02-07 14:27:10 -08:00
Stephen Birarda
dd4d944dea ping inactive nodes in conjunction with domain server check in 2014-02-07 14:06:42 -08:00
Stephen Birarda
a5636d2dc0 make ThreadedAssignment subclasses handle QUdpSocket readyRead, closes #1895 2014-02-07 12:25:43 -08:00
Stephen Birarda
66d4eeb805 enforce both a version and hash match for packets 2014-02-07 11:10:38 -08:00
Stephen Birarda
997bea708d fix a PacketTypeVoxelQuery typo 2014-02-07 10:32:48 -08:00
Stephen Birarda
d39cccde77 add a method to find a node and upate based on packet 2014-02-07 10:32:16 -08:00
Stephen Birarda
fa1825fa32 repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID 2014-02-07 10:20:50 -08:00
Stephen Birarda
c1132726bf use SharedNodePointer in place of Node where appropriate 2014-02-06 14:58:03 -08:00
Stephen Birarda
97a7369c76 remove senderWithAddress from NodeList 2014-02-06 14:43:46 -08:00
Stephen Birarda
a823722d27 add writeDatagram helper to NodeList to insert md5 hash 2014-02-06 14:28:58 -08:00
Stephen Birarda
e72f6d16cc rename NodeList ownerUUID to sessionUUID 2014-02-06 11:43:23 -08:00
Stephen Birarda
f92f9ec0c2 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-06 09:28:03 -08:00
Stephen Birarda
f4fe2bb754 move octree-server libs to assignment-client 2014-02-05 16:04:23 -08:00
Stephen Birarda
9694a622b5 update placeholder and give edit packet senders to Agent 2014-02-05 15:35:13 -08:00
Stephen Birarda
53170d3fe2 fix skeleton setting on parsing of identity packet 2014-02-04 16:49:21 -08:00
Stephen Birarda
adaa36a51d repairs to key-framed URL sending through avatar-mixer 2014-02-04 15:28:27 -08:00
Stephen Birarda
7e3442cbd0 repair to PacketType so interface parses AM packet 2014-02-04 14:57:14 -08:00
Stephen Birarda
3959209bc2 complete movement of URLs to AvatarData for re-usability 2014-02-04 14:49:56 -08:00
Stephen Birarda
2b80a5fbb8 move face/skeleton model URLs to AvatarData 2014-02-04 14:40:41 -08:00
Stephen Birarda
26c961dc66 send identity packets when changes occur between keyframes 2014-02-04 14:24:13 -08:00
Stephen Birarda
33305ad111 have the avatar-mixer broadcast identity packets every 5 seconds 2014-02-04 13:42:22 -08:00
Stephen Birarda
31bd5f7ce8 add parsing of PacketTypeAvatarIdentity to AvatarMixer 2014-02-04 13:27:05 -08:00
ZappoMan
579c601ff7 Merge pull request #1810 from birarda/master 
scripting nomenclature changes
 2014-01-31 17:14:07 -08:00
Stephen Birarda
c754663582 force queued connection for readyRead on node socket in case it moves, closes #1685 2014-01-31 17:09:08 -08:00
Stephen Birarda
dd83ff0538 move isAvatar property access to Agent object 2014-01-31 14:36:50 -08:00
Stephen Birarda
2cc6d22181 fix push bytesRead when creating dummy Avatar packets, closes #1794 2014-01-31 12:44:09 -08:00
Stephen Birarda
4573eaebc6 fix multiple avatar parsing in AvatarManager 2014-01-31 12:02:24 -08:00
Stephen Birarda
55049eeb6b fix assignment packing and unpacking from DS to AC 2014-01-30 14:54:52 -08:00
Andrzej Kapolka
e99b7ea92c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-01-29 13:34:19 -08:00
Stephen Birarda
2dd71435ee fix build breakers for new packet type 2014-01-29 12:25:05 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
85ebad979f repair assignment flow errors from packet changes 2014-01-28 11:15:38 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
Andrzej Kapolka
9a892ea51a Let's actually close our sessios on exit. 2014-01-27 17:03:35 -08:00
Andrzej Kapolka
d5695395c4 Basic editing with delta streaming up and running. 2014-01-27 15:49:50 -08:00
ZappoMan
5e4813ab11 more work on allowing for local particle trees 2014-01-27 13:50:05 -08:00
ZappoMan
c5ba92d73e first part of getting local particle tree in agent 2014-01-27 11:10:59 -08:00
Andrzej Kapolka
1ef6f5f7b3 MetavoxelDataPointer -> MetavoxelData, grid spacing as power of 2. 2014-01-26 13:23:10 -08:00
AndrewMeadows
ea681f0d8f Merge pull request #1669 from birarda/avatar-list 
add an AvatarManager to house a separate list of Avatars from NodeList
 2014-01-24 09:54:17 -08:00
Stephen Birarda
9d71671a52 add extra debugging to packet mismatch 2014-01-24 09:10:27 -08:00
Stephen Birarda
8d2e9823de remove notion of owning node from NodeData 2014-01-23 17:06:03 -08:00
Stephen Birarda
da26f43499 broadcast node kills to agent, not avatar-mixer 2014-01-23 16:44:32 -08:00
Stephen Birarda
7762ea9f94 repair calls to broadcast to nodes 2014-01-23 16:28:35 -08:00
Stephen Birarda
ba7a73e347 add a missing break, don't double activate sockets 2014-01-23 15:11:09 -08:00
Stephen Birarda
09cd8eb0fd add a missing break, don't double activate sockets 2014-01-23 15:05:09 -08:00
Stephen Birarda
9ab1fc4c2c resolve conflicts on merge with upstream/master 2014-01-23 14:43:04 -08:00
Stephen Birarda
1f95d0c017 have avatar-mixer report avatar kills to all avatars 2014-01-23 12:47:27 -08:00
Stephen Birarda
6979135fe3 move some of the node interest additions to correct spots 2014-01-22 16:23:24 -08:00
Stephen Birarda
ec04d5450b Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set 2014-01-22 16:16:47 -08:00
Stephen Birarda
e9e2557576 change node types of interest to a QSet 2014-01-22 14:47:04 -08:00
Stephen Birarda
d57aec9793 don't use separate NodeList owner UUID and Avatar UUID 2014-01-22 11:48:04 -08:00
Stephen Birarda
6b44172467 hook the user's avatar object into the Interface ScriptEngine 2014-01-22 09:13:25 -08:00
Stephen Birarda
f9b38af96f remove processing of Avatar URLs from AvatarMixer 2014-01-21 16:56:00 -08:00
Stephen Birarda
417aa7ad59 re-expose an Avatar to the ScriptEngine 2014-01-21 15:59:55 -08:00
Andrzej Kapolka
a16d38ced6 Removed joints from avatar state messages. 2014-01-16 15:07:09 -08:00
Stephen Birarda
9095874844 fix moveToThread for AssignmentClient NodeList, fixes #1551 2014-01-16 12:30:23 -08:00
Brad Hefta-Gaub
bd6e30070d Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
 2014-01-15 13:18:25 -08:00
Stephen Birarda
1912ed0d9e have the Agent ask for an audio-mixer for audio scripting 2014-01-15 13:14:13 -08:00
Brad Hefta-Gaub
952365a1b7 clean up comments and tab spacing 2014-01-15 12:50:36 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Stephen Birarda
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
fa01383f3f move the NodeList to the thread used for a ThreadedAssignment 2014-01-14 11:26:26 -08:00
Stephen Birarda
9de098b4d9 fix logging name for metavoxel server 2014-01-14 10:55:18 -08:00
Stephen Birarda
9efb391ecf repair crazy references to node ponter from old iterator style 2014-01-14 10:50:06 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
9afe6eaa25 more windows build fixes 2014-01-11 00:56:48 -08:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -08:00
ZappoMan
6345eff3ae Merge pull request #1501 from birarda/qprocess 
switch to QProcess instead of fork in AssignmentClient
 2014-01-10 17:36:24 -08:00
Stephen Birarda
248754e63e make sure STDOUT from child assignment-client bubbles up to parent 2014-01-10 17:03:13 -08:00
Stephen Birarda
ceb8ca7a23 changes to AssignmentClient architecture to fix fork behaviour 2014-01-10 16:59:01 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Brad Hefta-Gaub
0252e7f95e use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:17:02 -08:00
Stephen Birarda
339ef93fc4 remove no longer needed QDebug includes 2014-01-03 09:41:01 -08:00
Stephen Birarda
443c94a88f repairs to AudioMixer and audio injection flow 2014-01-02 17:15:46 -08:00
ZappoMan
651d2d0c81 rename voxels and particles scripting interfaces 2013-12-31 09:41:35 -08:00
Stephen Birarda
87e5579e52 reinstate delete for starved but started audio ring buffers 2013-12-19 15:51:14 -08:00
Stephen Birarda
80a2bd0844 move _shouldLoopbackForNode to PositionalAudioRingBuffer for access in injector 2013-12-19 15:44:04 -08:00
Stephen Birarda
bdf8c4b9b2 implement threaded send for AudioInjector 2013-12-19 15:17:03 -08:00
Stephen Birarda
2409b5f784 complete inital test of AudioInjector API 2013-12-19 13:46:37 -08:00
ZappoMan
88c319a0da remove dead code 2013-12-17 14:15:34 -08:00
ZappoMan
7b3a778fb4 get Agent working with ScriptEngine 2013-12-17 14:13:16 -08:00
ZappoMan
ccd6058412 get abstract menu class to work 2013-12-17 13:55:17 -08:00
ZappoMan
5c946090db Merge branch 'master' of https://github.com/worklist/hifi into agent_script_engine_refactor 2013-12-17 13:34:13 -08:00
Stephen Birarda
bbe525412f fix pulling of delayed samples in audio mixer 2013-12-17 11:22:34 -08:00
ZappoMan
95639c7ce7 first cut, not working yet 2013-12-17 10:58:36 -08:00
Philip Rosedale
03869e81fd Merge pull request #1380 from birarda/qt-for-portaudio 
move from 44.1 to 48 on audio
 2013-12-16 17:58:41 -08:00
Stephen Birarda
6b644eb130 repair upsampling and local loopback by correcting for limits 2013-12-16 15:15:25 -08:00
Stephen Birarda
0970ed55a8 re-instate positional audio in the audio-mixer 2013-12-16 12:36:55 -08:00