Commit graph

83 commits

Author SHA1 Message Date
Anthony J. Thibault
3ae33353d9 Fixed unused variables warnings 2019-05-16 16:38:47 -07:00
Anthony J. Thibault
98fe059d97 Fix blender::run crash
Pass a shared_ptr of the HFMModel to the Blender.  This will prevent the HFMModel
from being destroyed on the main thread if an Avatar changes their skeletonModelURL.

Also the _blendshapeOffset hash in Model has been eliminated, it was not necessary and
was also a source of data races.

The body of Blender::run has been updated slightly to reduce the number of allocation necessary for temporary QVectors.
2019-05-16 13:12:16 -07:00
SamGondelman
5a184bd584 fix model bounds 2019-04-30 13:38:11 -07:00
SamGondelman
c1c45d8a01 revert some now unnecessary changes that were impacting performance
(cherry picked from commit b6984de16c2fd17f04ea72de7b339c31db6467ab)
2019-03-22 11:55:04 -07:00
SamGondelman
2b32b77bed handle case when clusterMatrices.size() == 0 2019-03-11 17:32:40 -07:00
SamGondelman
b24b7fed3d the root node isn't the first onegit add ../.git add ../. 2019-03-11 15:34:41 -07:00
SamGondelman
6d6cd42adb fix bound scaling 2019-02-22 12:00:00 -08:00
Anthony Thibault
39b4eaac34 Revert "AnimPose operator* optimizations"
This reverts commit 569bef50fd.
2019-02-14 16:13:00 -08:00
Anthony Thibault
569bef50fd AnimPose operator* optimizations 2019-02-05 14:48:05 -08:00
SamGondelman
1b5c1d0677 working on primitiveMode and groupCulled 2019-01-08 10:02:03 -08:00
Angus Antley
77fa4e7d13 took out the unnecessary hfm.jointindex code 2018-12-16 17:29:16 -08:00
amantley
c8cd65c3bd added getter for the orginal cluster bind matrix values in AnimSkeleton 2018-11-15 09:58:10 -08:00
amantley
80ebde1036 started cleanup of pr 2018-11-14 17:27:45 -08:00
amantley
8256c652fc added the hook to put the copy of the mutated bind poses into tthe skeleton 2018-11-14 17:02:25 -08:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
SamGondelman
327c2f4e3d move blendshape buffers to render thread 2018-10-10 15:32:53 -07:00
Sam Gateau
c593f00839 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-01 19:10:18 -07:00
Seth Alves
90d9af35b5 minimize diff 2018-09-30 16:05:08 -07:00
Seth Alves
e30497595c static_cast can be used here rather than dynamic 2018-09-30 15:49:42 -07:00
Seth Alves
749b02cfb8 get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctor 2018-09-30 15:12:49 -07:00
sam gateau
cc0019479a fixing review comments 2018-09-25 14:07:07 -07:00
sam gateau
ec6117e9bb bringing the blendshape in skin shader only work in master 2018-09-18 17:40:29 -07:00
SamGondelman
1a36693161 I hate blendshapes 2018-09-11 16:58:38 -07:00
SamGondelman
cde2dc2eaa please work 2018-09-05 17:04:05 -07:00
SamGondelman
028092f803 fix blendshapes one last time 2018-08-31 13:33:45 -07:00
SamGondelman
248c2621a4 fix blendshapes crash 2018-08-29 17:57:54 -07:00
SamGondelman
70f4d0c634 Merge remote-tracking branch 'upstream/master' into perf 2018-08-24 14:04:37 -07:00
SamGondelman
9ab1fc0500 Merge remote-tracking branch 'upstream/master' into perf 2018-08-20 17:04:42 -07:00
SamGondelman
05ff99a1d2 working on blendshapes 2018-08-20 11:40:25 -07:00
sabrina-shanman
79fd3cb181 Rename createVisibleRenderItemSet() to createRenderItemSet() in Model class 2018-06-14 15:49:40 -07:00
sabrina-shanman
440c77905a Remove functionality for rendering collision meshes directly in the Model class 2018-06-11 11:03:57 -07:00
John Conklin II
277758cd03
Merge pull request #13275 from luiscuenca/fixNoAvatarMaterials
Check for null material pointer in CauterizedModel
2018-06-07 09:41:03 -07:00
luiscuenca
60758dec8d Check for null pointer 2018-05-31 11:32:45 -07:00
samcake
2e9076c71e Clean up and trying to get ready for merge 2018-05-30 11:14:49 -07:00
Sam Gateau
2f94c43968 Removing the getLayer from the meshPArtPayload and check that it s working 2018-05-28 23:20:04 -07:00
samcake
2fc23d799a adding the correct flag maybe? 2018-03-15 18:05:58 -07:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
SamGondelman
cc53b338db Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-02-27 13:30:03 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
2018-02-27 11:33:05 -08:00
Anthony J. Thibault
f5fcaae283 Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions 2018-02-26 10:55:44 -08:00
Anthony J. Thibault
0404b722e4 Code review feedback 2018-02-26 10:00:32 -08:00
SamGondelman
b56f755034 material reflection 2018-02-23 17:58:46 -08:00
Nissim Hadar
194c7f4101 WIP - for review. 2018-02-16 09:28:15 -08:00
Anthony J. Thibault
7f5f48bca9 Models can now switch between dual quats and matrix palette skinning.
but not dynamically, because we still only compile one version of the shader.
2018-02-13 11:37:14 -08:00
Anthony J. Thibault
cf5452313a WIP check in of making the use of dq or mat dynamic per model 2018-02-12 18:44:24 -08:00
Seth Alves
861497e907 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-02-02 08:56:18 -08:00
Anthony J. Thibault
a1b67afabf Fix for rigidly bound mesh not being properly cauterized.
For example, sometimes in first person view, you can see the back of your avatar's eyes or the brim of your avatar's hat.
2018-02-01 11:57:50 -08:00
Seth Alves
64a46bf5df merge from upstream 2018-01-31 10:43:41 -08:00