Commit graph

823 commits

Author SHA1 Message Date
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
HifiExperiments
405d557725
Merge branch 'master' into blendshapes 2020-05-07 13:38:59 -07:00
HifiExperiments
8017e30ab9
Merge branch 'master' into blendshapes 2020-05-07 13:27:22 -07:00
HifiExperiments
91e177f68b add spaces after fors 2020-05-07 13:23:22 -07:00
HifiExperiments
3bf690571c
Merge branch 'master' into zoneOcclusion 2020-05-07 13:13:20 -07:00
HifiExperiments
bc319cb340 zone occlusion 2020-01-11 22:29:07 -08:00
HifiExperiments
ef8f085b47 support blendshapes on model entities 2020-01-05 02:37:44 -08:00
Brad Hefta-Gaub
fb70569fc2
Merge pull request #16548 from HifiExperiments/visible
Case 17368: Fix wearables not disappearing with avatar
2019-12-13 13:20:15 -08:00
HifiExperiments
6156495345 stupid, shadows still broken 2019-12-12 23:04:47 -05:00
SamGondelman
1736252f0d trying and failing to fix models 2019-12-12 23:04:47 -05:00
HifiExperiments
e0a29d9367 material entities support cullFaceMode and support gltf doubleSided 2019-12-12 23:01:57 -05:00
HifiExperiments
413bf10f79 stupid, shadows still broken 2019-11-26 22:28:06 -08:00
HifiExperiments
3dfd63d46b merge with master 2019-11-26 20:42:44 -08:00
HifiExperiments
69714a89ca material entities support cullFaceMode and support gltf doubleSided 2019-11-26 14:48:48 -08:00
sabrina-shanman
79d470c70e Call updateGeometry before Model::createRenderItemSet to ensure well-defined state 2019-11-21 16:12:49 -08:00
sabrina-shanman
516debdcb2 Fix code style / remove cruft 2019-11-13 12:50:13 -08:00
sabrina-shanman
b7da5d0d72 Update Model::calculateTriangleSets to use hfm::Shapes 2019-11-08 13:56:49 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master
Merge master into instancing
2019-10-31 17:39:15 -07:00
Anthony J. Thibault
92f1b59cc8 Full legacy API and FST support 2019-10-18 16:30:32 -07:00
Sam Gateau
a95a4b5aa2 Address warnings and comments from review 2019-10-18 11:43:25 -07:00
Sam Gateau
695b9cdba6 Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform 2019-10-18 03:31:06 -07:00
Sam Gateau
9159258b50 clean ups 2019-10-16 17:42:36 -07:00
Sam Gateau
eecaeb1155 FOund the issue why the skinning was incorrect, removed unecessary data structures in the newly added objects and renamed Deformer to SkinCluster and DYnamicTransform to SkinDeformer 2019-10-16 04:02:05 -07:00
Sam Gateau
f049ab7887 Understanding that CLuster can be just one for a mesh and we need the bindingMatrix to be applied correctly, differenciating intentionnally the transform for bound evaluation and the one used for render in the case of SKinned mesh because the clusterMatrices contain the extra offset from rig to model 2019-10-15 18:12:09 -07:00
Sam Gateau
108d331d86 more 2019-10-14 17:45:07 -07:00
Sam Gateau
05ac9aefa8 the clusterMatrices should be working, but n skin index and weights are assigned yet 2019-10-14 02:21:01 -07:00
Sam Gateau
8a1f3648f9 fooling around to get the cluster working 2019-10-11 18:06:44 -07:00
Sam Gateau
a995f2c09f in the middle of something 2019-10-10 17:09:54 -07:00
Sam Gateau
1f3993c308 getting the transform right for the rigid bodies 2019-10-08 18:13:24 -07:00
Sam Gateau
936ac6f120 REmoving more repetitions of the meshParts 2019-10-07 18:03:33 -07:00
Sam Gateau
521ce3936b I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion... 2019-10-07 15:19:23 -07:00
sabrina-shanman
a166b41216 Fix build warnings/errors 2019-09-13 15:39:29 -07:00
sabrina-shanman
c4db6c78d8 std::vector-ize meshes/mesh parts in hfm::Model 2019-09-11 16:50:50 -07:00
SamGondelman
9c1b139d5f merge with master 2019-06-25 23:46:39 -07:00
Ken Cooke
4c5c61231d Only use QVector resize when actually needed 2019-06-25 12:57:55 -07:00
Ken Cooke
0a34745ff9 Use QVector resize() instead of reserve() to silence Debug builds about size not being set.
Causes unneeded default initialization, but no obvious way to avoid.
2019-06-25 12:53:07 -07:00
Ken Cooke
75aea88f20 CR feedback 2019-06-24 11:51:03 -07:00
Ken Cooke
87e0f5b2bb Runtime dispatch for AVX2 2019-06-23 10:40:15 -07:00
Ken Cooke
8653118b6c Full SIMD implementation of packBlendshapeOffsets() using AVX2.
6x speedup over the existing (partial SIMD) version.
60x speedup over the original (pure GLM) version.
2019-06-23 10:32:57 -07:00
Ken Cooke
cceff21cd0 Pull packBlendshapeOffsets() into separate function 2019-06-23 08:57:56 -07:00
Ken Cooke
87c680382f Strip-mining optimization to improve cache utilization.
For each mesh: init, accumulate, and pack using a recycled offset buffer.
2019-06-23 08:42:38 -07:00
Ken Cooke
9e309b095d Fix bug that was packing zero offsets that were never used 2019-06-23 08:00:13 -07:00
Sam Gondelman
a7842fe3ea
Merge branch 'master' into proceduralMesh 2019-05-21 09:51:33 -07:00
SamGondelman
0039fb2f54 attempt to fix material crash 2019-05-17 14:51:42 -07:00
SamGondelman
6d3e23a7fe merge with master 2019-05-16 20:03:10 -07:00
SamGondelman
de90c5088c (✿◠‿◠) 2019-05-16 19:33:07 -07:00
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