Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-03 23:24:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11489 commits 25 branches 0 tags 1.1 GiB
Commit graph

3297 commits

Author SHA1 Message Date
Stephen Birarda
6a8637230f add socket error debugging 2014-03-25 13:17:37 -07:00
Stephen Birarda
ce169dd87d add code return debug to DS check in packet 2014-03-25 13:06:44 -07:00
Stephen Birarda
08ed708ee6 add domain IP and packet size debugging 2014-03-25 13:05:58 -07:00
Stephen Birarda
f0b87bebc2 cleanup debug and inactive node pinging 2014-03-25 13:02:09 -07:00
Stephen Birarda
bc1b7045cb output count of unreplied domain-server check ins 2014-03-25 12:30:06 -07:00
Andrzej Kapolka
a5dd5ebe0b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/interface_en.ts
 2014-03-25 10:52:03 -07:00
AndrewMeadows
5551396a7b Merge pull request #2480 from ZappoMan/scripting_improvements 
Scripting improvements
 2014-03-25 10:49:14 -07:00
Andrew Meadows
c0177e80a7 use glm::isnan() everywhere for portable code 2014-03-25 09:56:15 -07:00
Andrew Meadows
17d878bc94 sanitiy checking when unpacking AvatarData update 2014-03-25 09:55:43 -07:00
ZappoMan
c34b64e296 add load script from URL support 2014-03-25 00:17:19 -07:00
ZappoMan
a613da8032 add Script.include() 2014-03-24 21:25:59 -07:00
AndrewMeadows
961815fe42 Merge pull request #2472 from birarda/domain-json-stats 
add minimal packet rate stats to all nodes, a little extra to avatar-mixer
 2014-03-24 16:57:20 -07:00
Stephen Birarda
a90cd7ed31 cast numerator to float before divide 2014-03-24 16:54:14 -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
8dbe4dfdde collect packet rate stats in NodeList 2014-03-24 15:06:53 -07:00
Andrzej Kapolka
f1fd8175d2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-24 14:53:00 -07:00
Andrzej Kapolka
210af25396 When rendering avatar shadows, check bounds against shadow frustum. Closes 2014-03-24 14:52:02 -07:00
Philip Rosedale
c7fab009bd Merge pull request #2461 from birarda/domain-json-stats 
tweaks to domain-server stats, add info for audio
 2014-03-24 14:21:46 -07:00
Stephen Birarda
f8279c1f5b handle query params in HTTPManager, display stats table from DS 2014-03-24 14:14:26 -07:00
Philip Rosedale
cf891f419b Merge pull request #2449 from ZappoMan/js_prefs 
New User Experience Work: added "Settings" and "AudioDevice" to JS
 2014-03-24 13:24:51 -07:00
Stephen Birarda
5f93e44ff7 abstract stats packet sending to NodeList 2014-03-24 12:33:00 -07:00
Andrzej Kapolka
91c10a4f3a Delta streaming for variants. 2014-03-24 11:56:58 -07:00
Stephen Birarda
8f403609e7 hook JSON stats sending from domain-server 2014-03-24 11:56:16 -07:00
Stephen Birarda
949f7b2fc1 add a json stats packet type 2014-03-24 11:21:39 -07:00
ZappoMan
7ef1fe3a74 add support for listing all audio devices and default device in JS 2014-03-24 09:15:03 -07:00
ZappoMan
bde2146b1b whitespace cleanup 2014-03-23 18:14:36 -07:00
ZappoMan
9c7ffffbae fix some windows issues 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
 2014-03-23 18:10:22 -07:00
Andrzej Kapolka
5b4478328c More delta streaming work. 2014-03-22 23:43:42 -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
Andrzej Kapolka
b8414dfb19 More work on delta streaming. 2014-03-21 18:20:26 -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
bad209bf09 use a trailing average for a quieter loudness 2014-03-21 15:53:00 -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
Andrzej Kapolka
1b980eebf2 More work on delta streaming. 2014-03-21 14:49:40 -07:00
Brad Hefta-Gaub
5abe044c30 Merge pull request #2412 from AndrewMeadows/emergency-fixes 
datalength sanity checking for AvatarData packet
 2014-03-21 14:48:07 -07:00
ZappoMan
2c8c43094f CR feedback 2014-03-21 14:46:46 -07:00
Brad Hefta-Gaub
c06caa4a4e Merge pull request #2422 from PhilipRosedale/master 
Bots can see voxels and move joints, fix drag bug in editVoxels
 2014-03-21 14:31:55 -07:00
ZappoMan
3cb3cb81c4 fixes to voxel server crashes on client shutdown 2014-03-21 14:15:02 -07:00
Stephen Birarda
1580896ec4 don't use a trailing average for loudness 2014-03-21 11:42:02 -07:00
Philip Rosedale
6e41d93e0a Merge pull request #2429 from birarda/audio-scaling 
use epsilon value to drop average loudness to zero
 2014-03-21 11:30:36 -07:00
Stephen Birarda
5a6456c29f use an epsilon value to drop average loudness to zero 2014-03-21 11:29:16 -07:00
Andrzej Kapolka
924e5517f4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-21 11:12:10 -07:00
Stephen Birarda
acedc555d5 Merge pull request #2424 from birarda/audio-scaling 
move and remove some debugging for audio mixer
 2014-03-21 10:26:41 -07:00
Stephen Birarda
c1cbc79807 move debug for no reply domain checkins to ThreadedAssignment 2014-03-21 10:26:09 -07:00
Stephen Birarda
6f37bb54f8 suppress useless audio debug 2014-03-21 10:19:17 -07:00
Andrzej Kapolka
9c2f6ab2e5 Working on delta streaming for collections. 2014-03-20 18:28:43 -07:00
Philip Rosedale
f72061801c Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 17:21:31 -07:00
Philip Rosedale
b49058ea77 Merge pull request #2402 from Atlante45/inspect_js 
Inspect js
 2014-03-20 17:21:21 -07:00
Philip Rosedale
31ddbf4ae4 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 17:18:31 -07:00
Philip Rosedale
57fb0c9d0f Merge pull request #2413 from birarda/audio-scaling 
more audio scaling tweaks
 2014-03-20 17:12:28 -07:00
Stephen Birarda
5ae63c5b0f use a trailing average for sleep time, move loudness to RB 2014-03-20 17:10:24 -07:00
Andrew Meadows
1214794f05 QMap is not used by AvatarData 2014-03-20 17:03:28 -07:00
Philip Rosedale
dcf0ccf7b1 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 16:53:55 -07:00
Andrew Meadows
22aa9b075d datalength sanity checking for AvatarData packet 2014-03-20 16:52:40 -07:00
Philip Rosedale
5d361a1bd0 Merge pull request #2403 from Atlante45/fix_models_upload 
Fix models upload
 2014-03-20 16:20:38 -07:00
Atlante45
746d109025 Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 16:10:33 -07:00
Philip Rosedale
03381c3df8 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 15:34:28 -07:00
Philip Rosedale
f0d4efbd57 Merge pull request #2409 from birarda/audio-scaling 
add N loudest throttling for audio-scaling
 2014-03-20 15:32:28 -07:00
Atlante45
65603b0631 Fixed typo 2014-03-20 15:30:28 -07:00
Andrzej Kapolka
20e9572f60 Working on specialized delta streaming. 2014-03-20 14:20:05 -07:00
Andrzej Kapolka
8515e9e04b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-20 14:15:31 -07:00
Stephen Birarda
99c27cf748 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-scaling 2014-03-20 14:03:02 -07:00
Atlante45
bf85f8d5e5 Changed model_type to model_categorie in FstReader 2014-03-20 14:00:27 -07:00
Atlante45
a908c23f61 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_models_upload 2014-03-20 13:58:44 -07:00
Andrzej Kapolka
93846460ff Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-20 13:12:28 -07:00
Stephen Birarda
a8ef64e0ce calculate a cutoff loudness for mixer recovery 2014-03-20 12:52:17 -07:00
Atlante45
947dde3715 Modified models uploader to diferrenciate heads and skeletons 2014-03-20 12:44:37 -07:00
Atlante45
4604f5333d Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 12:15:55 -07:00
Andrzej Kapolka
20ae5c15f7 Added a "flat" mode for environments that makes them follow you around on the 
X/Z axes.  The default environment is flat.  Closes #2378.
 2014-03-20 12:09:20 -07:00
Andrzej Kapolka
a761a4862b Merge pull request #2398 from AndrewMeadows/emergency-fixes 
explicitly send neck angles in avatar data
 2014-03-20 11:19:13 -07:00
AndrewMeadows
144f86b540 Merge pull request #2370 from Atlante45/model_browsing 
Model browsing
 2014-03-20 11:15:35 -07:00
Andrew Meadows
6440dd1b5f explicitly send neck angles in avatar data 2014-03-20 11:05:14 -07:00
Philip Rosedale
3ab0288c4f testing numbered joint movement 2014-03-20 08:54:12 -07:00
Philip Rosedale
774b99d868 merge fix 2014-03-19 17:14:03 -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
527c0f5a73 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-19 16:27:39 -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
f3968679d3 cleanup isInView() to use inFrustum() directly 2014-03-19 15:44:18 -07:00
Tony Hagale
7f2a92d759 #2386 trying a new static lookup table for numberOfOnes() 2014-03-19 16:28:12 -05:00
Tony Hagale
5f94e44cde #2386 trying a new static lookup table for numberOfOnes() 2014-03-19 16:26:45 -05:00
ZappoMan
3d0207b926 optimize OctreeElement::calculateShouldRender() 2014-03-19 13:54:06 -07:00
ZappoMan
adaa01c13e optimize isLeaf() to just check the child mask instead of counting children 2014-03-19 13:15:28 -07:00
ZappoMan
f3bd8925d9 optimized OctreeElement::furthestDistanceToCamera() 2014-03-19 12:48:11 -07:00
ZappoMan
252bc3b3ee optimized ViewFrustum::getFurthestPointFromCamera() 2014-03-19 11:51:47 -07:00
Atlante45
d239aecbfb Added names to signals argument 2014-03-19 10:17:28 -07:00
Philip Rosedale
c26ed77931 merge fix 2014-03-19 09:16:52 -07: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
ZappoMan
584adfda08 cleanup headers 2014-03-19 00:32:38 -07:00
Philip Rosedale
9c8a4828f2 remove unused variable, function 2014-03-18 22:41:09 -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
ZappoMan
499c4bd500 fix octree server crashes on various shutdown corner cases 2014-03-18 17:44:53 -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
Atlante45
93f66b074a Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 17:37:07 -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
Atlante45
a10a3f6f29 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 14:49:00 -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
Atlante45
6f50ea0faa Improved FileDownloader 2014-03-18 13:55:14 -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
Andrzej Kapolka
24b2da1c0d Working on delta streaming. 2014-03-18 13:14:21 -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
4a1a7898ea Merge branch 'cleanup' into 'shapes' 2014-03-18 12:53:45 -07:00
Andrew Meadows
02c58447df merge upstream/master into "shapes" project 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	libraries/avatars/src/HandData.h
	libraries/shared/src/SharedUtil.h
 2014-03-18 12:41:20 -07:00
Andrew Meadows
a2fea49f58 bump version of PacketTypeAvatarData from 1 to 2 2014-03-18 12:36:48 -07:00
Andrzej Kapolka
a4cc15a2cd Collection streaming (untested). 2014-03-18 11:46:12 -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
b84499c83b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-18 10:18:12 -07:00
Andrzej Kapolka
6aa1f286bb Alpha is the new default. 2014-03-18 10:13:23 -07:00
Andrzej Kapolka
a38239b3d8 Working on collection streaming. 2014-03-18 10:11:25 -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
Andrzej Kapolka
4ce953315b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-18 09:19:58 -07:00
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
ZappoMan
c09974bcda use parents inFrustum status to optimize children 2014-03-17 17:51:09 -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
Andrzej Kapolka
d569802fbc More metadata fixes. 2014-03-17 17:21:46 -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
61594b9a1e fixes to silent audio frame sending 2014-03-17 16:27:49 -07:00
Andrzej Kapolka
eb95b01aa1 Fixes to, test for metadata streaming. 2014-03-17 16:10:30 -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
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
Andrzej Kapolka
61660f890e Working on metadata for metatypes. 2014-03-17 11:39:16 -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
96572d3752 fix some Q_OBJECT macros in class headers 2014-03-17 10:57:53 -07:00
ZappoMan
cbdd159213 fix constness 2014-03-17 10:55:43 -07:00
Stephen Birarda
8228d70248 resolve conflicts on merge with upstream master 2014-03-17 10:09:01 -07:00
ZappoMan
f8e38382a8 Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-16 19:37:41 -07:00
Andrzej Kapolka
95410d2b66 Cleaned up the preprocessor definitions. 2014-03-16 18:04:37 -07:00
Andrzej Kapolka
b21247ca67 Optional hash/full metadata streaming for QObjects. 2014-03-16 17:29:30 -07:00