Commit graph

33858 commits

Author SHA1 Message Date
sabrina-shanman
b7da5d0d72 Update Model::calculateTriangleSets to use hfm::Shapes 2019-11-08 13:56:49 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master
Merge master into instancing
2019-11-08 10:10:50 -08:00
sabrina-shanman
a42e09aef8 Fix unused variables/implicit type conversions 2019-11-08 10:04:34 -08:00
Maia Hansen
7855747386
Merge pull request #16470 from samcake/zorro
Procedural Material crashes in shadow pass  on deformed shape renderItems
2019-11-07 15:00:06 -08:00
Sam Gateau
86b62f921d Now that avatars can potentially have their own custom pipeline, shadow pass needs to support it 2019-11-07 14:01:50 -08:00
Shannon Romano
176b463f16
Merge pull request #16458 from hyperlogic/bug-fix/anim-blend-directional-assert
Fix for assert in AnimBlendDirectional on startup
2019-11-07 13:11:11 -08:00
Shannon Romano
d30f30191f
Merge pull request #16457 from jennaingersoll/doc-193
DOC-193 Clarified legacy vs current camera modes
2019-11-06 10:59:32 -08:00
Shannon Romano
668061e154
Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes
2019-11-06 10:35:53 -08:00
sabrina-shanman
33bb0e2b19 Change RenderableModelEntityItem::computeShapeInfo to support new HFM format 2019-11-05 14:44:23 -08:00
Anthony J. Thibault
6e7f222608 Fix for assert in AnimBlendDirectional on startup
Specifically, std::vector subscript out of range.
2019-11-05 14:16:10 -08:00
ingerjm0
499a0a8067 Clean up code per review 2019-11-05 14:14:46 -08:00
ingerjm0
faa4c97f8a Revisions per review 2019-11-05 14:04:01 -08:00
amerhifi
bc41087ea9 removing lock from WASAPI initialization 2019-11-05 12:50:59 -08:00
ingerjm0
27d4bfdd01 DOC-193 #comment Documented legacy vs current camera modes, along with code samples to re-enable legacy code 2019-11-05 12:20:51 -08:00
sabrina-shanman
88b6472ced Fix build warning 2019-11-05 10:57:55 -08:00
sabrina-shanman
da5f80c139 Use std::vector types in ShapeInfo 2019-11-05 10:57:55 -08:00
Sam Gateau
7af0940846 getting coision to work 2019-11-05 10:57:54 -08:00
sabrina-shanman
27643023a3 Make shape extent calculations use slim mesh extents, and rename task to CalculateTransformedExtentsTask 2019-11-05 10:57:54 -08:00
sabrina-shanman
c3af8b5da7 Remove unused cluster fields from hfm 2019-11-05 10:57:54 -08:00
sabrina-shanman
ba257634f2 Introduce extents for TriangleListMesh and calculate them 2019-11-05 10:57:54 -08:00
sabrina-shanman
67e05a70d4 Fix build error with _drawTransform 2019-11-05 10:56:29 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
amerhifi
343807a9f5 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-05 10:17:04 -08:00
amer cerkic
b2ab33116f removing double calls to switch devices, handling default changes from scripting interface instead 2019-11-04 15:03:53 -08:00
Brad Hefta-Gaub
f5873e6f76
Merge pull request #16446 from samcake/zorro
Renaming the env variable to enable Material Procedural Shaders
2019-11-04 14:32:54 -08:00
Zach Fox
c39dbc600d
Merge pull request #16441 from zfox23/enableHashMapSignalsForESS
Implement DEV-2654: Allow ESS to make use of signals like `avatarRemovedEvent`
2019-11-04 11:59:15 -08:00
Sam Gateau
a4696992e8 Renaming the env variable to enable Material Proecural Shaders 2019-11-04 11:15:37 -08:00
Anthony J. Thibault
821a46697a Update fixUpLegacyBlendshapes as well 2019-11-04 10:55:05 -08:00
Anthony J. Thibault
101ec9d753 Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes
These blendshapes are not present in ARKit and are not used by any of our procedural
face animations (talking, blinking etc).  This change should have been part of #16400 but
was accidently left out.
2019-11-04 09:49:24 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
HifiExperiments
6e5217b80d fix build error, add environment variable 2019-11-02 01:03:34 -07:00
Zach Fox
8d07d401c3 Add a line of JSDoc 2019-11-01 14:45:07 -07:00
RebeccaStankus
b50fb47a95
Merge pull request #16438 from RebeccaStankus/macWindowSize
Changed default interface window size on mac
2019-11-01 13:40:18 -07:00
Rebecca Stankus
3f19bbfcac Changed variable to not be magic number 2019-11-01 11:46:01 -07:00
Rebecca Stankus
e5fcc577f0 Changed default interface window size on mac 2019-11-01 10:47:12 -07:00
Shannon Romano
295c37aea9
Merge pull request #16434 from kencooke/audio-webrtc-warning-spam
DEV-2619: WebRTC spamming logs
2019-11-01 10:22:35 -07:00
Ken Cooke
3cdf25f2bc Fix compiler warning (unused variable in Release build) 2019-11-01 07:36:35 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master
Merge master into instancing
2019-10-31 17:39:15 -07:00
Ken Cooke
30564a67ef Only log a single "AEC not supported" warning per audio device configuration 2019-10-31 14:50:52 -07:00
sabrina-shanman
6666df6137 Fix build warnings/errors 2019-10-31 14:49:28 -07:00
sabrina-shanman
297ce9d88b Remove debug 2019-10-31 13:47:00 -07:00
sabrina-shanman
023d73a25d Finish TriangleListMesh generation, rename some things 2019-10-31 13:47:00 -07:00
sabrina-shanman
7d37a064f2 Fix crash 2019-10-31 13:46:53 -07:00
Sam Gateau
e9ce467eb9 Crahs because of ? 2019-10-31 13:04:11 -07:00
Sam Gateau
465e8c3e18 Prototyping the slim mesh generation 2019-10-31 12:58:15 -07:00
Sam Gateau
24e6a966a8 Keep exploring 2019-10-31 12:58:08 -07:00
Sam Gateau
927e08acdb Explore the simple mesh pure pos triangle list idea 2019-10-31 12:57:29 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
Extended avatar blendshape support for ARKit compatiblity
2019-10-31 12:33:50 -07:00
Maia Hansen
de5570ced8
Merge pull request #16421 from amerhifi/dev-2571new
case DEV-2771: Audio client shutdown lock
2019-10-31 09:50:56 -07:00
amer cerkic
4b4b722875 fixed issues related to context switching and selection with hmd 2019-10-30 16:27:19 -07:00