Stephen Birarda
b789fa96f8
Merge pull request #14192 from Atlante45/fix/traits-race
...
Prevent race on internal client traits members
2018-10-23 14:53:11 -07:00
Zach Fox
493262052c
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
2018-10-22 13:59:52 -07:00
Zach Fox
7be5d5674d
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-22 13:59:35 -07:00
Zach Fox
1eca1bfd55
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-22 11:18:10 -07:00
Ken Cooke
f68a8d7379
Merge pull request #14037 from birarda/bug/agent-flush-encoder
...
fix agent audio packet send when encoder is flushed
2018-10-19 20:53:52 -07:00
Brad Hefta-Gaub
3fab542009
Merge pull request #14170 from Atlante45/fix/invisible-agents
...
Fix non-avatar agents appearing as avatars
2018-10-19 16:36:51 -07:00
Kerry Ivan Kurian
77b6389671
Correct location of dependency
2018-10-18 12:38:18 -07:00
Kerry Ivan Kurian
8b922ad7cc
Add missing dependency
2018-10-18 11:07:45 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
Simon Walton
0b77eb5e9c
Control UUID inclusion in avatar data with new param
...
Increase estimate of avatars to be sent; remove start/end segment
in avatar identity writes.
2018-10-16 14:25:38 -07:00
Clement
1bcbda7ad6
Prevent race on internal client traits members
2018-10-11 16:16:24 -07:00
Zach Fox
7de784ce27
First steps (definitely not working)
2018-10-10 12:32:55 -07:00
Seth Alves
de8ae9156c
fix build on clang 7
2018-10-09 12:25:01 -07:00
Clement
8e625e9a89
Don't have the mixer treat non-avatar agent as avatars
2018-10-08 17:35:37 -07:00
Clement
9011a9da36
Don't send trait data if agent is not an avatar
2018-10-08 17:35:37 -07:00
Simon Walton
6f659db3b5
Merge branch 'master' into avatar-mixer-improvements
2018-10-08 15:18:29 -07:00
Stephen Birarda
88f76ac760
suppress traits larger than INT16_MAX bytes
2018-10-05 09:46:55 -07:00
Clement
1997191e77
Fix MSVC warnings
2018-10-01 10:49:04 -07:00
Simon Walton
756d1a6fc4
Fix another bind-to-temporary
2018-09-29 21:15:10 -07:00
Simon Walton
18c1371321
Process multiple avatars in an AvatarIdentity message
2018-09-28 17:53:06 -07:00
Clement
585c278400
streamline mix operation
2018-09-28 15:45:56 -07:00
Stephen Birarda
b18d8e2254
pull out removal and adding of streams to sep functions
2018-09-28 15:00:52 -07:00
Stephen Birarda
7e4cfd3c78
fix for injected audio going to unreachable
2018-09-28 14:54:50 -07:00
Stephen Birarda
b7c6fa003d
guard against incorrectly sized AudioStreamStats from packet
2018-09-28 14:54:50 -07:00
Stephen Birarda
2ac1445683
remove double scoping of the frame check timer
2018-09-28 14:54:50 -07:00
Stephen Birarda
aea9775e4d
get back to ideal frame time when slow
2018-09-28 14:54:50 -07:00
Stephen Birarda
925c39cbd3
split sleep timing from check time timing
2018-09-28 14:54:50 -07:00
Stephen Birarda
996e033dee
add stats for skipped streams
2018-09-28 14:54:50 -07:00
Stephen Birarda
6750d4a370
move buffer popping to packet processing
2018-09-28 14:54:50 -07:00
Stephen Birarda
7d8b15ed75
move valid position check to packet processing
2018-09-28 14:54:50 -07:00
Stephen Birarda
371de312cc
enumerate a vector of mixable streams for each listener
2018-09-28 14:54:50 -07:00
Stephen Birarda
c992150c10
change stream HRTF map to use a vector
2018-09-28 14:54:50 -07:00
Stephen Birarda
bcba2a1cf1
use local ID for stream hash
2018-09-28 14:54:50 -07:00
Clement
d15ef295cf
Replace AudioZones lookup with vectors and indexes
2018-09-28 14:54:50 -07:00
Stephen Birarda
09cfe4dbc1
use a vector for audio streams
2018-09-28 14:54:50 -07:00
Stephen Birarda
aed79b3b17
use a vector for ignored node IDs
2018-09-28 14:54:49 -07:00
Simon Walton
7a0043c010
Send AvatarIdentity in NLPacketList; be more selective
2018-09-28 11:01:41 -07:00
Simon Walton
13890f1d16
Use local ID in place of UUID in a couple more cases
2018-09-26 09:47:26 -07:00
Simon Walton
f95ab1b040
Clean-up & other small changes
2018-09-25 12:07:59 -07:00
Simon Walton
07bdaeede7
Split avatar joint-data across multiple packets if necessary
2018-09-24 18:23:49 -07:00
Simon Walton
f2e69d5c81
Make default bubble-box AvatarData property for efficiency
...
Also a use of getClientGlobalPosition(), etc
2018-09-20 17:37:39 -07:00
Stephen Birarda
5c4f6c741c
fix agent audio packet send when encoder is flushed
2018-09-20 11:55:55 -07:00
Simon Walton
328ed8d976
Remove unused variable
2018-09-20 09:31:01 -07:00
Simon Walton
f1b7097edb
Priority experiment
2018-09-19 15:32:56 -07:00
Simon Walton
04c47943ba
Handle small packet space correctly
2018-09-19 13:45:08 -07:00
Simon Walton
c88a713ef8
Use Local ID for last time & sequence #
...
Also try to fix size_t warnings on gcc
2018-09-19 12:05:06 -07:00
Simon Walton
5d91396e91
Fixes for client & other clean-up
...
Handle grab-joints better; fix packet size calc;
remove dead code; other improvements.
2018-09-18 17:49:23 -07:00
Simon Walton
0c7dee730c
Pack partial avatar data in bulk packets using space available
...
Keep a single packet in-hand and send when full rather than
a packet list.
2018-09-18 10:25:59 -07:00
Simon Walton
ca300db410
Send only avatar data that will fit in packet (WIP)
2018-09-14 18:24:08 -07:00
Simon Walton
6a1c76d14d
Only sort an estimated number of avatars
2018-09-14 12:19:55 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
...
Performance improvements for Avatar Mixer
2018-09-13 13:43:18 -07:00
Simon Walton
9628615c44
Fix bandwidth quota calculation now we're dropping excess
2018-09-10 17:16:16 -07:00
Anthony Thibault
1570ae6424
Merge branch 'master' into bug-fix/recorded-blendshapes-2x
2018-09-10 12:58:53 -07:00
John Conklin II
3b0f37c6f7
Merge pull request #13885 from birarda/bug/recording-scripting-stuck
...
fix Agent teardown of recording and ScriptEngine(s)
2018-09-10 10:51:52 -07:00
Simon Walton
6bb143da42
Make maxAvatarBytesPerFrame int rather than float; other clean-up
2018-09-07 18:14:39 -07:00
Simon Walton
c2fe2b60b3
Use std::vector for ignored avatars since the list will be small
2018-09-07 15:49:47 -07:00
John Conklin II
01cace694f
Merge pull request #13916 from birarda/bug/ignore-freeze-master
...
send ignoring avatar removal to ignored avatar
2018-09-07 15:40:32 -07:00
Anthony Thibault
949efff439
Fix blendshapes playing back in recordings at 2x their proper values
2018-09-07 13:21:17 -07:00
Simon Walton
22cfad2483
Squelch (false) warning from gcc
2018-09-06 18:32:37 -07:00
SamGondelman
ed7f993c0d
avatar mixer and manager perf improvements and cleanup
2018-09-06 16:57:20 -07:00
Simon Walton
f6fd27a76b
Merge pull request #1 from AndrewMeadows/avatar-mixer-scaling-2
...
tweak avatar sort coefficients and fix bad avatar bounding box calculations
2018-09-06 16:39:20 -07:00
Andrew Meadows
92210f28b5
cleanup and use correct avatar bounding box
2018-09-06 16:33:30 -07:00
Simon Walton
f59168e1c8
make sure ignoredNode is available before sending packet
2018-09-06 16:31:31 -07:00
Simon Walton
9e0c21065e
Stop sending avatars when over bandwidth quota
2018-09-06 16:20:46 -07:00
Stephen Birarda
a908c1554f
make sure ignoredNode is available before sending packet
2018-09-06 16:04:54 -07:00
Andrew Meadows
229e9624e6
remove bad bounding box calculations in avatar-mixer
2018-09-06 15:34:28 -07:00
Simon Walton
e1aba52c23
Revert to statics for priority sort weights; update defaults from Andrew
2018-09-06 12:09:44 -07:00
Simon Walton
d2650f7ede
Modified priority function from Andrew
2018-09-05 17:22:07 -07:00
Simon Walton
f7e84995b4
Only build the sortable vector once, now we're using vectors for the priority sort
2018-09-05 10:58:37 -07:00
Simon Walton
0738bcaebc
Unused variable from merge
2018-09-04 18:08:34 -07:00
Simon Walton
262dbaf5ed
Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling
2018-09-04 15:27:41 -07:00
Simon Walton
6ae2ca1576
Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling
...
Merge of Samuel's change to use simple sort instead of priority queue
2018-09-04 15:26:26 -07:00
SamGondelman
ade58a52cc
reserve priority sort util vectors
2018-09-04 11:21:43 -07:00
Stephen Birarda
07b24b4768
send kill packet to ignored node for ignorer
2018-08-30 17:32:09 -07:00
SamGondelman
5f08ed5027
misc perf improvements
2018-08-30 16:55:15 -07:00
Simon Walton
c2ac2b9ab0
Various tweaks; fix clang warning
2018-08-30 10:59:55 -07:00
Simon Walton
7b7f369c39
Further reductions in shared pointers, getWorldPosition().
2018-08-29 18:25:10 -07:00
Simon Walton
4b7f6a346f
Use AvatarData::getClientGlobalPosition() for position in priority queue
...
It looks like it's the same as world position with the avatar mixer.
Also use one time stamp for current time in priority queue; use
std::chrono for some other timestamps in hope that it's faster.
Fix priority-code logic bug.
2018-08-28 16:21:47 -07:00
Simon Walton
027d117364
Remove deadlock caused by trying readlock on NodeList
...
Also just use refs to other SharedNodes as the NodeList
is locked.
2018-08-28 09:41:09 -07:00
Stephen Birarda
a76b50ce33
fix teardown of recording and ScriptEngine(s)
2018-08-27 15:07:19 -07:00
Simon Walton
44f253c482
Reduce use of shared pointers and maps
2018-08-27 14:54:37 -07:00
Simon Walton
402ed4fb76
More shared pointer tweaks
2018-08-27 10:35:17 -07:00
Simon Walton
ab810f4505
Try reducing use of shared pointers in O(n2) code
2018-08-24 17:33:06 -07:00
Stephen Birarda
e1879bf26a
add assignment dynamic factory to ESS
2018-08-23 13:55:17 -07:00
Stephen Birarda
09065cf19a
provide assignment dynamic factory to agent
2018-08-23 13:31:18 -07:00
Stephen Birarda
36784b0039
reset sent trait data when re-send required
2018-08-23 13:31:18 -07:00
John Conklin II
5dd64645eb
Merge pull request #13861 from SimonWalton-HiFi/safe-landing-fixes
...
Fix safe-landing protocol for sparse domains
2018-08-23 10:17:08 -07:00
Simon Walton
dd098f05c2
Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number
2018-08-22 14:54:07 -07:00
Stephen Birarda
01e8fd66a3
fix script engine(s) cleanup from ESS
2018-08-22 13:52:37 -07:00
Stephen Birarda
3b5ba71163
fix a crash in ESS from missing dependency
2018-08-22 12:23:24 -07:00
Stephen Birarda
3e2d4dc696
fixes and improvments addressing CR comments
2018-08-21 10:53:52 -07:00
Stephen Birarda
7e127749f7
move AssignmentDynamicFactory to entity-server only
2018-08-21 10:32:05 -07:00
Stephen Birarda
f0ba61ff05
add missing local ID, reset client processed trait versions
2018-08-21 10:32:05 -07:00
Stephen Birarda
6c204b682d
include trait bytes written in over budget calculation
2018-08-21 10:32:05 -07:00
Stephen Birarda
fc5b72e9b9
cleanup sent trait versions for removed avatars on mixer
2018-08-21 10:31:15 -07:00
Stephen Birarda
f9230eca7f
don't send override avatar URL if override matches
2018-08-21 10:31:15 -07:00
Stephen Birarda
a56e9b0860
allow agent to create and get avatar entities from script
2018-08-21 10:31:15 -07:00
Stephen Birarda
e6b419d283
add instanced traits and migrate avatar entities
2018-08-21 10:31:15 -07:00
Stephen Birarda
ea7c0e923a
make client traits handler a unique ptr in AvatarData
2018-08-21 10:31:15 -07:00
Stephen Birarda
a0df68f32f
move skeleton model URL emit to AvatarData
2018-08-21 10:31:14 -07:00
Stephen Birarda
be7eb57205
handle whitelist avatar URL override via traits
2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a
remove skeleton from identity, handle in clients
2018-08-21 10:31:14 -07:00
Stephen Birarda
26a1f03314
send traits in bulk to avatar mixer client
2018-08-21 10:31:14 -07:00
Stephen Birarda
f23a036f4a
add node local ID retreivable from NodeData
2018-08-21 10:31:14 -07:00
Stephen Birarda
ac835650b7
add skeleton trait sending to Agent, queuing in AvatarMixer
2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a
initial trait packet sending on skeleton URL change
2018-08-21 10:31:14 -07:00
John Conklin II
7f3bbaf3f8
Merge pull request #13755 from SimonWalton-HiFi/script-agent-destroy-engine
...
Fix for ScriptEngines not being released upon AC shutdown
2018-08-16 13:16:04 -07:00
John Conklin II
bbf6162361
Merge pull request #13632 from Atlante45/fix/udt-rtt
...
Fix potential reliable connection lockup.
2018-08-16 13:15:23 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
...
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
Stephen Birarda
91365aeff4
make avatar kill packets from mixer reliable
2018-08-10 11:31:17 -07:00
John Conklin II
19ad9c52da
Merge pull request #13773 from birarda/bug/last-broadcast-guard
...
check for null node data pointers in handleIgnoreRequestPacket
2018-08-09 14:53:53 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool
...
Stack tester changes
2018-08-08 13:40:05 -04:00
Simon Walton
df9c65e410
Move back RecordingScriptingInterface destruction
2018-08-07 12:08:10 -07:00
Stephen Birarda
c7ce8e5ce0
check node data pointers in handleNodeIgnoreRequestPacket
2018-08-07 11:00:24 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy
2018-08-06 09:51:14 -07:00
Simon Walton
59271881ba
Create & destroy ScriptEngines on AC thread but move to main after creation
2018-08-03 17:45:06 -07:00
John Conklin II
243bd5ea69
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent
...
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
2018-08-03 13:32:11 -07:00
Brad Davis
3c7f1a0c4b
Merge remote-tracking branch 'upstream/master' into destroy
2018-08-02 15:34:19 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics
...
Enable physics after ES indicates all nearby entities received
2018-08-01 18:15:00 -07:00
SamGondelman
1ba28de5b6
try to fix nodelist not getting destroyed
2018-08-01 17:52:27 -07:00
Simon Walton
6f1487bbf8
Don't explicitly use data method of shared node pointer
2018-08-01 17:11:26 -07:00
Simon Walton
d7a49ee594
Merge pull request #13622 from SimonWalton-HiFi/ac-monitor-resources
...
Raise POSIX descriptor-limit in AC Monitor if necessary
2018-08-01 17:07:33 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244
...
Move scriptable caches' APIs into scripting interfaces
2018-08-01 11:50:13 -07:00
Simon Walton
9d42a6e08f
Change method name per coding standards
2018-08-01 10:37:28 -07:00
Simon Walton
6f61642cb0
Call setFinished() if script engine hasn't started up
2018-07-31 18:10:49 -07:00
Simon Walton
5a92032bdd
ThreadedAssignment::stop no longer deprecated
2018-07-31 16:14:00 -07:00
Simon Walton
ecfba312ef
Merge remote-tracking branch 'upstream/master' into script-engine-thread-agent
2018-07-31 15:54:54 -07:00
Simon Walton
d991dd230f
Remove call to aboutToFinish from AssetServer
2018-07-31 15:39:38 -07:00
Simon Walton
64fc3e1091
ThreadedAssignment calls virtual stop() upon domain disconnect
2018-07-31 15:30:33 -07:00
Simon Walton
a320308eaf
Fix sequence number encoding issue
...
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
2018-07-31 13:54:22 -07:00
Simon Walton
8c512ec19b
Send spherical view from Interface rather than creating in ES
2018-07-30 18:03:45 -07:00
Clement
949c7f8c19
Add automated test tool scripting interface
2018-07-30 17:18:32 -07:00
Clement
9e84603ca4
Make proper -v and -h options for interface
2018-07-30 17:18:32 -07:00
John Conklin II
6d7116fad7
Merge pull request #13676 from thoys/fix/api/agent
...
MS15184: Remove deprecated functions in Agent API
2018-07-30 14:48:10 -07:00
Thijs Wenker
92efc1a3b5
style and memory leak fixes
2018-07-30 18:51:19 +02:00
Simon Walton
3d1fe7da9f
Reset known entity-state when leaving initial send state
2018-07-27 18:22:36 -07:00
Howard Stearns
e8e04673a4
Merge pull request #13683 from zfox23/MS17039_dontDeleteDDV
...
Implement MS17039: Don't delete entities during DDV when Metaverse API call returns error
2018-07-27 15:05:05 -07:00
Simon Walton
0cec9a72d6
Implement client-side enable physics once indicated EntityData has arrived
...
Also now use Entity Server Protocol sequence numbers.
2018-07-26 18:10:38 -07:00
David Rowe
baf88ab508
Revise scriptable resource caches' interfaces
2018-07-26 16:12:16 +12:00
Simon Walton
2c06487df0
Move sending of completion packet up to EntityTreeSendThread
...
I hadn't appreciated the continuous nature of the scene
traversal. Looks good now. Also changed some identifier names.
2018-07-25 17:05:05 -07:00
Simon Walton
8f02834447
Set params.stopReason in another place
2018-07-25 14:46:47 -07:00
David Rowe
16e06de9cd
Move scriptable caches into scripting interfaces
...
Removed non-working getResource() API functions.
2018-07-25 22:10:14 +12:00
Simon Walton
2d653db064
Remove #include from header
2018-07-24 17:44:17 -07:00
Simon Walton
187259c838
Raise posix descriptor limit if necessary
2018-07-24 17:44:17 -07:00
Simon Walton
06d1602c0d
Use max of --max & --n for resources; other clean-up
2018-07-24 17:41:13 -07:00
Simon Walton
7181c3ad48
Fix typo in preprocessor symbol
2018-07-24 17:41:13 -07:00
Simon Walton
6098c53d32
Remove #include from header
2018-07-24 17:41:13 -07:00
Simon Walton
0cc96f2be1
Raise posix descriptor limit if necessary
2018-07-24 17:41:13 -07:00
Simon Walton
47e99cdeac
Initial code for AC side of Enabling Physics plan
...
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
2018-07-24 16:50:37 -07:00
Dante Ruiz
b750a005cf
fix script memory issue
2018-07-24 16:31:12 -07:00
