Commit graph

29542 commits

Author SHA1 Message Date
SamGondelman
9a2bdda365 make animation properties threadsafe 2018-09-10 11:58:45 -07:00
Stephen Birarda
19a9fb00c6
Merge pull request #13967 from huffman/fix/jsdoc-note-for-send-fake-handshake
Add comment to Assets.sendFakeHandshake about excluding jsdoc
2018-09-10 11:47:30 -07:00
SamGondelman
3daaa0ce81 empty urls are invalid 2018-09-10 11:45:40 -07:00
Wayne Chen
ff86e480ba adding debug statement to check for window close 2018-09-10 11:36:45 -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
d12376187c
Merge branch 'master' into avatar-mixer-scaling 2018-09-10 10:15:49 -07:00
Sam Gondelman
ae8eea32d6
Merge pull request #13960 from SamGondelman/profileUnpacking
Add detailed profile range for avatar unpacking
2018-09-10 10:04:08 -07:00
SamGondelman
a4605289a2 animation on switch url 2018-09-10 10:03:05 -07:00
David Back
3601ade8ba destroy thread from thread finished not scriptEngine destroyed 2018-09-07 18:36:36 -07:00
Sam Gateau
5140999445 Forcing all the meshes with 3 buffers aka the blendshape layout 2018-09-07 15:57:04 -07:00
John Conklin II
bafdd06c91
Merge pull request #13934 from SimonWalton-HiFi/assigned-port-check
Check that a requested listening port is able to be used
2018-09-07 15:48:12 -07:00
sam gateau
e8cfac2ab1 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-09-07 15:35:27 -07:00
sam gateau
9350d6f36e removing performance counters 2018-09-07 15:35:10 -07:00
Stephen Birarda
adac872a11 clear other avatars in agent on avatar mixer disconnect 2018-09-07 15:04:14 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats
Move animation stats into its own Menu
2018-09-07 14:51:46 -07:00
Sam Gondelman
19fe40abe7
Merge pull request #13958 from SamGondelman/bloom
Fix bloom on edges
2018-09-07 14:50:31 -07:00
Sam Gateau
81a542982b Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-07 12:02:20 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale
Scale Collision Pick to match parent
2018-09-07 11:54:02 -07:00
SamGondelman
32e2a244a1 detailed profile range for avatar unpacking 2018-09-07 11:44:35 -07:00
John Conklin II
2ac0377a6e
Merge pull request #13952 from amantley/steppingReboot
Fix for lurching walk(case 16945), when walking in hmd.
2018-09-07 11:43:03 -07:00
Simon Walton
1a67176819 Fix a dangling merge conflict 2018-09-07 11:29:30 -07:00
sam gateau
fa72910ac1 fixing fuckeries 2018-09-07 11:14:12 -07:00
SamGondelman
f9ec53a2e6 fix bloom on edges 2018-09-07 10:25:26 -07:00
sam gateau
d979d02139 why did i do that? 2018-09-07 10:03:55 -07:00
Simon Walton
3dc993c841 Fix small error in translation delta 2018-09-07 09:46:21 -07:00
Anthony Thibault
5a059e9318 Fix for build failure on linux and android. 2018-09-07 09:44:19 -07:00
Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling 2018-09-07 09:30:39 -07:00
sabrina-shanman
8d4c47cf8e Make template specialization of BaseNestableTransformNode explicit 2018-09-07 08:49:44 -07:00
sabrina-shanman
52bc09cd2a Add override qualifier to BaseNestableTransformNode::getTransform 2018-09-06 17:44:06 -07:00
Wayne Chen
72818f3729 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged 2018-09-06 17:37:36 -07:00
Wayne Chen
ef3449f96d Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged 2018-09-06 17:36:47 -07:00
sabrina-shanman
f40f40e135 Use more reasonable value for BaseNestableTransformNode::_baseScale when given bad value 2018-09-06 17:35:12 -07:00
Ryan Huffman
22df1b3bc6 Add comment to Assets.sendFakeHandshake about excluding jsdoc 2018-09-06 17:19:41 -07:00
SamGondelman
ed7f993c0d avatar mixer and manager perf improvements and cleanup 2018-09-06 16:57:20 -07:00
sabrina-shanman
23a6abbaca Update jsdocs to reflect new collision pick scaling behavior 2018-09-06 16:47:09 -07:00
Andrew Meadows
92210f28b5 cleanup and use correct avatar bounding box 2018-09-06 16:33:30 -07:00
sabrina-shanman
836f810c41 Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code 2018-09-06 16:33:29 -07:00
Anthony Thibault
acc7f1f168 Moved AnimStats into its own qml panels.
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
sam gateau
7349562111 Removing commented code 2018-09-06 15:50:31 -07:00
sam gateau
5ecbdb50c7 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-06 15:36:32 -07:00
Andrew Meadows
021146e4f0 minor tweak to default avatar-update sort coefficients 2018-09-06 15:33:52 -07:00
John Conklin II
8c77749fb6
Merge pull request #13947 from SamGondelman/perf
Fix blendshapes crash one last time, one last time
2018-09-06 14:21:18 -07:00
John Conklin II
b486b6d148
Merge pull request #13928 from AndrewMeadows/enable-workload-feedback
enable workload regulation by default
2018-09-06 14:20:40 -07:00
sam gateau
6544e9f0b0 Removing the commented debug code 2018-09-06 13:58:03 -07:00
sam gateau
38bfee7b72 Fix compilation on android and add the simple getBufferIDUnsynced in bindUniformBuffer 2018-09-06 13:54:21 -07:00
Gabriel Calero
2d2a4804f7 Add android settings screen. Add AEC setting 2018-09-06 17:49:52 -03:00
amantley
90a51e6181 added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area 2018-09-06 13:12:48 -07:00
sabrina-shanman
714cfc5ef1 Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc 2018-09-06 12:14:50 -07:00
Simon Walton
e1aba52c23 Revert to statics for priority sort weights; update defaults from Andrew 2018-09-06 12:09:44 -07:00
sam gateau
e428248472 Adressing build warnings 2018-09-06 11:33:26 -07:00
sam gateau
5aa45b64d2 Adressing build warnings 2018-09-06 11:24:13 -07:00
sam gateau
129e2ce188 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-06 10:30:41 -07:00
sabrina-shanman
3f7a7fb11a Return early from AvatarTransformNode and similar when getTransform fails 2018-09-06 10:29:01 -07:00
Ryan Huffman
80b5f90160
Merge pull request #13857 from thoys/fix/interactiveWindows/onlyOnTopWhileMainWindowActive
MS17463: only show InteractiveWindow on top of interface window
2018-09-06 10:15:20 -07:00
sabrina-shanman
f7226757ad Just import TransformNode in AvatarTransformNode.h and similar 2018-09-06 10:03:05 -07:00
Dante Ruiz
200f6d540a Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-09-06 09:59:51 -07:00
Bradley Austin Davis
fade3a8de0 Fixing shader implicit type conversions 2018-09-06 09:08:36 -07:00
Brad Davis
650f112f16 Fix keyword in shader layout 2018-09-06 09:08:36 -07:00
Brad Davis
50f4932d9c PR feedback: structure alignement and size 2018-09-06 09:07:53 -07:00
Brad Davis
9a28e04e37 Remove all tabs from shaders 2018-09-06 08:59:07 -07:00
Brad Davis
2df2bbef46 Adding missing locations 2018-09-06 08:59:07 -07:00
Brad Davis
87b9594bd0 Fix warnings 2018-09-06 08:59:06 -07:00
Brad Davis
730cdb4257 Remove uniforms from unused shaders 2018-09-06 08:59:06 -07:00
Brad Davis
f704ddc11c Remove uniform from SDF text rendering 2018-09-06 08:59:06 -07:00
Brad Davis
a4cd56532e Removing uniforms from antialiasing 2018-09-06 08:59:06 -07:00
Brad Davis
07fba89f0f Remove uniforms from item status 2018-09-06 08:59:06 -07:00
Brad Davis
271651737b Cleanup gpu shader constants 2018-09-06 08:59:06 -07:00
Brad Davis
5a5e1ad498 Remove uniforms from polyvox 2018-09-06 08:59:06 -07:00
Brad Davis
cafd981744 Remove uniforms from bloom debug effect 2018-09-06 08:59:06 -07:00
Brad Davis
719ae25adb Remove uniforms from drawCellBounds 2018-09-06 08:59:05 -07:00
Brad Davis
c8eb4da6b6 Remove simple draw task uniforms 2018-09-06 08:59:05 -07:00
Brad Davis
ac84a498b3 Cleanup dead declarations 2018-09-06 08:59:05 -07:00
Anthony Thibault
3a3ffcc98c First pass at improving anim stats. 2018-09-05 18:14:06 -07:00
sam gateau
4ef8f29522 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-05 17:50:21 -07:00
sam gateau
21f65d8a78 position are used correctly for evaluting bounds in the Mesh 2018-09-05 17:50:06 -07:00
Simon Walton
adf0a9a414 Convert priority age from microseconds to seconds 2018-09-05 17:41:00 -07:00
Sam Gateau
03f51352aa
Merge pull request #13932 from SamGondelman/framebuffer
Fix framebuffer debugging
2018-09-05 17:38:21 -07:00
Simon Walton
d2650f7ede Modified priority function from Andrew 2018-09-05 17:22:07 -07:00
SamGondelman
cde2dc2eaa please work 2018-09-05 17:04:05 -07:00
sabrina-shanman
e8ce152687 Scale collision picks relative to parent by adding and using more
specialized transform nodes.
2018-09-05 16:51:28 -07:00
Sam Gateau
912e0abb0a
Merge pull request #13891 from samcake/black
Improving the LOD manager behavior for better scaling
2018-09-05 16:01:09 -07:00
amantley
73e628bb8d merge with master fixes 2018-09-05 14:42:49 -07:00
sam gateau
1feaf286b4 keeping position separated from the other attributes 2018-09-05 14:35:50 -07:00
John Conklin II
dc02ff66f5
Merge pull request #13907 from birarda/feat/mixer-trait-state-reset
mark and cycle trait instances needing to be sent on mixer reconnect
2018-09-05 12:43:27 -07:00
Wayne Chen
841080ea72 Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-05 11:54:21 -07:00
Wayne Chen
77bb6fa4d5 adding position to try again zone; updating whitespace 2018-09-05 11:53:49 -07:00
Sam Gateau
2ced6d9681 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-09-05 11:35:59 -07:00
sam gateau
0e614ad578 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-05 11:35:08 -07:00
sam gateau
ce86e94e6f Add simple optim and instrumentation for tthe number of input buffer changes per frame" 2018-09-05 11:34:33 -07:00
Thijs Wenker
198ec294ac restore window parent on presentationMode switch 2018-09-05 20:13:48 +02:00
sam gateau
8344cb9aff REfactor the FBXReader_Mesh for different vertex formats 2018-09-05 11:07:04 -07:00
Anthony Thibault
584d39744f
Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode
HMD mode bug fix for avatars with no eyes
2018-09-05 10:57:21 -07:00
Anthony Thibault
536de03637
Merge pull request #13935 from hyperlogic/bug-fix/takeoff-to-in-air-glitch
Fix for glitch when entering in-air state from takeoff.
2018-09-05 10:56:34 -07:00
Andrew Meadows
4a1bd98584
Merge pull request #13914 from SamGondelman/avatarmanager
Miscellaneous low-level performance improvements
2018-09-05 10:12:05 -07:00
Sam Gateau
d2dcf6a3eb Merge branch 'master' of github.com:highfidelity/hifi into black 2018-09-05 08:40:30 -07:00
sam gateau
7de8f4867e Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-05 08:38:04 -07:00
Thijs Wenker
62d4b1805d Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive 2018-09-05 17:25:14 +02:00
Wayne Chen
0be7a5ffaa
fixing typo in domain handler 2018-09-04 19:58:56 -07:00
Wayne Chen
98c4d05b4a fixing typo in domain handler 2018-09-04 19:54:30 -07:00
Wayne Chen
c47788efe4 merging with dante's PR 2018-09-04 18:00:06 -07:00
Wayne Chen
9e0fa08cf1 adding property to location, updating domain 2018-09-04 17:46:23 -07:00
sam gateau
adcabf52c5 Refactoring the FBXReader_MEsh.cpp for better interleaving 2018-09-04 17:33:18 -07:00
SamGondelman
9e76c164ac fix aabox operator+= 2018-09-04 16:25:47 -07:00
Simon Walton
262dbaf5ed Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling 2018-09-04 15:27:41 -07:00
Simon Walton
695fabf4f5 Merge commit 'd01b438cb320a7ccc0aa8a0085e86940bb73c09c' into avatar-mixer-scaling 2018-09-04 15:27:18 -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
Anthony Thibault
e210fadc7c Fix for glitch when entering inAir state from takeoff.
This was due to a frame lag of blend factor used for inAir blending.  So the first frame the upward velocity would be 0, followed by 3.5 m/s the next frame.
This is fixed by using the workingVelocity instead of _lastVelocity to drive the blend.
2018-09-04 14:36:56 -07:00
John Conklin II
476887a224
Merge pull request #13909 from NissimHadar/fixFileUtils
Create correct folder.
2018-09-04 14:20:20 -07:00
Simon Walton
7af69b5450 Check that a requested listened port is used in NodeList 2018-09-04 13:53:25 -07:00
Sam Gateau
b92d1061c4
Merge pull request #13920 from AndrewMeadows/dont-bid-for-locked
don't bid for simulation ownership of locked entities
2018-09-04 13:26:21 -07:00
SamGondelman
ec0b0ab464 fix acceleration spread 2018-09-04 13:03:42 -07:00
SamGondelman
dff8292216 fix framebuffer debug 2018-09-04 12:50:25 -07:00
John Conklin II
eaa5e2ea9a
Merge pull request #13927 from kencooke/audio-hrtf-avx2-more
Low-level performance improvements to audio-mixer
2018-09-04 12:06:32 -07:00
Anthony Thibault
b21fa1037f Code review feedback and bug fixes for calibraiton matrices 2018-09-04 11:55:52 -07:00
SamGondelman
ade58a52cc reserve priority sort util vectors 2018-09-04 11:21:43 -07:00
Simon Walton
058115b791 Add guard for sentJointDataOut 2018-09-04 10:38:18 -07:00
Anthony Thibault
3a034fdf66 HMD mode bug fix for avatars with no eyes
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
2018-09-04 10:13:57 -07:00
Sam Gateau
a328528642
Merge pull request #13883 from NissimHadar/addMap_d
Added read of map_d from MTL files
2018-09-04 09:38:07 -07:00
Simon Walton
c2ea05b026 Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling 2018-09-04 09:31:05 -07:00
sam gateau
761e8a3f95 fixing warnings 2018-09-04 09:19:24 -07:00
Andrew Meadows
49e48f5ea0 enable workload regulation by default 2018-09-04 08:49:19 -07:00
Ken Cooke
f5b7232f58 Cleanup 2018-09-03 14:00:30 -07:00
Ken Cooke
94e8ee99f5 AVX2 implementation of interpolate() 2018-09-03 13:06:49 -07:00
Sam Gateau
e8d922a56c Interleaving the attributes and relying on just 3 input buffers 2018-09-03 02:48:07 -07:00
Ken Cooke
96aa0549be AVX2 implementation of crossfade_4x2() 2018-09-01 12:08:49 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
sam gateau
0fe13ea5ee Merge branch 'black' of github.com:samcake/hifi into black-bis 2018-08-31 17:58:04 -07:00
Sam Gateau
bd9136812d Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-31 17:53:49 -07:00
sam gateau
8c23ecce8f Merge branch 'black' of github.com:samcake/hifi into black-bis 2018-08-31 17:45:10 -07:00
Simon Walton
11a563cb38 Don't use temp vector for outgoing joint status - doesn't seem to be necessary 2018-08-31 17:40:57 -07:00
John Conklin II
b94dd526b9
Merge pull request #13919 from SamGondelman/avatarmanager2
Fix blendshapes crash one last time
2018-08-31 17:12:42 -07:00
Simon Walton
cf5f81ab95 Don't memcpy quaternions as we don't use same component order on wire! 2018-08-31 17:04:23 -07:00
Stephen Birarda
a37a19da1e use different XORed instance ID for replicas 2018-08-31 16:59:24 -07:00
Stephen Birarda
9b3d9dd0f3 XOR incoming trait instance IDs for other avatars 2018-08-31 16:56:22 -07:00
Stephen Birarda
20912349a4 cycle avatar entity IDs for new avatar mixer 2018-08-31 16:53:58 -07:00
Stephen Birarda
48680329ec mark trait instances needing to be sent on mixer reconnect 2018-08-31 16:53:53 -07:00
Simon Walton
5a0de0f103 Small fixes for joint logic 2018-08-31 16:45:39 -07:00
Simon Walton
2da5338574 Fix couple of gcc issues 2018-08-31 15:24:51 -07:00
Simon Walton
e1d51a6c42 Avatar serializing: use memcpy where possible, take copy of joint data to avoid holding lock, etc 2018-08-31 15:06:33 -07:00
Sam Gondelman
7cdc7dcc66
Merge pull request #13873 from sabrina-shanman/stt_parenting
Collision Pick Parenting
2018-08-31 14:43:55 -07:00
SamGondelman
028092f803 fix blendshapes one last time 2018-08-31 13:33:45 -07:00
Andrew Meadows
727bd6b05a don't bid for simulation ownership of locked things 2018-08-31 13:31:26 -07:00
SamGondelman
d01b438cb3 CR 2018-08-31 11:25:17 -07:00
sabrina-shanman
b5862aca2a Use bracket initialization for CollisionRegion.loaded 2018-08-31 10:53:20 -07:00
sabrina-shanman
f71fc83309 Remove PickResult::needsToCompareResults 2018-08-31 10:48:48 -07:00
sabrina-shanman
e94d7de99a Add JS API hook for getting overlay IDs from a pointer via
Pointer.getPointerProperties
2018-08-31 09:18:07 -07:00
Wayne Chen
e3f5f4c55a Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect 2018-08-30 19:55:51 -07:00
Wayne Chen
82c7495615 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-30 19:41:06 -07:00
Sam Gateau
e0f4c8239e Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-30 19:16:53 -07:00
Sam Gateau
a7fd35747d
Merge pull request #13896 from AndrewMeadows/workload-feedback
Filter timings used in feedback logic for workload region sizes
2018-08-30 19:11:49 -07:00