Commit graph

4205 commits

Author SHA1 Message Date
Roxanne Skelly
0319e8cc4d Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-13 16:01:39 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch
Case 22379: Run-time switch for deferred/forward rendering
2019-05-13 11:14:26 -07:00
SamGondelman
eb8c722080 fix runtime switch 2019-05-13 09:58:55 -07:00
Shannon Romano
99239f6415
Merge pull request #15542 from hyperlogic/bug-fix/dependency-manager-thread-safety
Make DependencyManager thread-safe
2019-05-13 07:43:55 -07:00
Anthony Thibault
b46378e0b6 Compile error fix 2019-05-10 15:51:42 -07:00
Anthony Thibault
fe17550a80 Code review feedback
In DependencyManager::set<>() destroy the clear the previous before allocating the new instance.
2019-05-10 15:41:52 -07:00
Anthony Thibault
442a679108 Make DepenencyManager thread-safe again
Before this PR, there were no locks around the two internal QHash data structures.
Races are rare, due to the fact that the DependencyManager is initialized on the main thread on startup and the fact that a static QWeakPointer was used as an internal cache.
However, there have been reported crashes where the render thread uses DependencyManager::isSet() perhaps while the main thread is adding a late dependency.
DependencyManager::isSet() did not use the static QWeakPointer cache and was more prone to race conditions.

To avoid this and perhaps other data races, mutexes now guard both of the internal QHash data structures.
Also, as an optimization, the most frequent call to DependencyManager::isSet was removed (Profile.cpp).
2019-05-10 14:12:10 -07:00
Andrew Meadows
e770bd6142 build CollisionShapes and load RigidBodies even when not yet stepping 2019-05-06 17:37:35 -07:00
Andrew Meadows
deee159892 unravel physics-vs-entities lib dependencies part 1 2019-05-06 17:35:57 -07:00
Andrew Meadows
7fb7e503f9 reduce footprint of ShapeManager::_shapeMap 2019-05-06 17:35:57 -07:00
jennaingersoll
57b9b18012
Merge pull request #15363 from ctrlaltdavid/M22068
Case 22068: Clipboard JSDoc
2019-05-02 11:15:25 -07:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux
Avatar network bandwidth optimization
2019-04-26 10:16:30 -07:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
Shannon Romano
70c2b8b8c4
Merge pull request #15443 from Atlante45/fix/asset-server-baking-master
Case 22333: Master: Fix asset server auto-baking
2019-04-24 16:30:14 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2
Case 20060: Grab correct stencil masks from display plugins
2019-04-24 09:52:12 -07:00
Clement
86b6341098 Add error reporting + Make temp dir erase safer 2019-04-23 14:54:12 -07:00
SamGondelman
9deb4e47ad comment out warning 2019-04-23 08:46:54 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
Anthony Thibault
0c0b847666 First version of faux joint optimizations
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.

Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
2019-04-22 11:02:13 -07:00
sabrina-shanman
05a2b11c54 Fix mat4FromVariant 2019-04-19 11:29:28 -07:00
sabrina-shanman
7b74561b27 Fix baked models not preserving scale in some cases 2019-04-19 11:29:27 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc
case 22219: Improved ambient maps
2019-04-17 10:20:53 -07:00
Shannon Romano
50f39e88d6
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check
Better head vs camera checks for avatar head cauterization
2019-04-16 15:07:46 -07:00
r3tk0n
d0abb86366 Reversed costants because no sleep. >_< 2019-04-15 17:26:22 -07:00
r3tk0n
12d7e35722 Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release. 2019-04-15 10:56:07 -07:00
r3tk0n
a40fdf3f77 Merge branch 'master' of https://github.com/highfidelity/hifi into running-fix 2019-04-15 09:47:26 -07:00
r3tk0n
87deb348a8 Adjust run speed constants. 2019-04-12 14:07:06 -07:00
Shannon Romano
a0ddadc0e7
Merge pull request #15320 from ctrlaltdavid/M21989
Case 21989: AvatarList and AvatarManager JSDoc
2019-04-12 12:27:29 -07:00
Shannon Romano
11e5f0a101
Merge pull request #15323 from ctrlaltdavid/M22052
Case 22052: Camera JSDoc
2019-04-12 12:26:39 -07:00
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
David Rowe
ca3f45163f Merge branch 'master' into M21989 2019-04-11 10:37:34 +12:00
David Rowe
617617736e Merge branch 'master' into M22052 2019-04-11 10:24:27 +12:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
2019-04-10 12:29:40 -07:00
Sam Gateau
89ff63e8bb
Merge pull request #15267 from jherico/fix/tracing
Case 21930: Don't change OpenGL context state every frame
2019-04-10 09:42:09 -07:00
David Rowe
d587f1227d Add ResourceRequestObserver JSDoc 2019-04-10 12:09:48 +12:00
Anthony J. Thibault
02d5769991 Better head vs camera checks for avatar head cauterization
* cameraInsideHead() check now uses detailed avatar collision when possible.
* head is now more constantly hidden in first person camera mode
* getEyeModelPositions() uses a better estimate when avatar eye joints are missing.
* moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp
* added isPlayingOverrideAnimation() method to Rig class
2019-04-09 12:57:03 -07:00
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
Olivier Prat
08aa133472 Fixed other compilation errors / warnings 2019-04-05 11:32:00 +02:00
Olivier Prat
89ca7ac415 Fixed compilation errors 2019-04-05 10:22:57 +02:00
Olivier Prat
a45b91c4be Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-05 09:01:03 +02:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco
Case 21777: Locomotion Project
2019-04-04 16:18:32 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil
Case 20060: Grab correct stencil masks from display plugins
2019-04-04 13:36:25 -07:00
Olivier Prat
b71a8f7902 Switched to split sum model for ambient (as Unreal) 2019-04-04 16:10:33 +02:00
Olivier Prat
acded5488e Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-04 08:58:49 +02:00
David Rowe
1bc38cab28 Camera JSDoc polish 2019-04-04 18:03:14 +13:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00