Commit graph

957 commits

Author SHA1 Message Date
kasenvr
103fd8eef2
Merge branch 'master' into fix/revert-instancing-temporarily-1 2020-06-03 22:44:32 -04:00
HifiExperiments
ade6bf24bb fix issues with glb urls 2020-06-03 15:19:54 -07:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
HifiExperiments
69714a89ca material entities support cullFaceMode and support gltf doubleSided 2019-11-26 14:48:48 -08:00
HifiExperiments
5371fd613a properly implement alphaModes 2019-11-22 00:41:32 -08:00
Sabrina Shanman
579eb04df9
Merge pull request #16491 from sabrina-shanman/instancing
Fix code style / remove cruft
2019-11-13 12:53:10 -08:00
sabrina-shanman
516debdcb2 Fix code style / remove cruft 2019-11-13 12:50:13 -08:00
sabrina-shanman
f39121c53b Fix build error/warning 2019-11-12 09:52:58 -08:00
sabrina-shanman
2169952613 Remove unused mesh.part.materialID 2019-11-11 17:52:16 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master
Merge master into instancing
2019-11-08 10:10:50 -08:00
Anthony J. Thibault
821a46697a Update fixUpLegacyBlendshapes as well 2019-11-04 10:55:05 -08:00
sabrina-shanman
df4ca90d49 Remove unused cluster fields from hfm 2019-11-01 10:47:10 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master
Merge master into instancing
2019-10-31 17:39:15 -07:00
sabrina-shanman
ecdca05679 Do not apply geometric offset to loaded FBX. Proper fix TBD 2019-10-30 14:28:55 -07:00
sabrina-shanman
9b41fa20c6 Clean up hfm joint geometric offset definition 2019-10-30 14:08:02 -07:00
sabrina-shanman
0d1bd6afbf Fix wrong transformForCluster for non-root joints with Z up axis 2019-10-30 13:32:30 -07:00
sabrina-shanman
296cd4a47b Rename globalTransformForCluster(s) -> transformForCluster(s) 2019-10-30 12:05:50 -07:00
sabrina-shanman
c8bf1ddfea Only recalculate globalTransformForCluster if needed 2019-10-30 12:01:25 -07:00
sabrina-shanman
61825f2e06 Remove joint.transform self-assignment 2019-10-30 11:50:10 -07:00
sabrina-shanman
ff908a36d6 Define separately globalTransformForCluster and localTransformForCluster for clarity 2019-10-30 11:49:28 -07:00
sabrina-shanman
fe1fe6aa83 Fix build warnings 2019-10-30 09:09:17 -07:00
sabrina-shanman
3c078eeef6 It makes more sense for joint.globalTransform to have the hfmModel.offset applied 2019-10-29 17:37:26 -07:00
sabrina-shanman
28e3fd4bc4 Refactor joint transform definition 2019-10-29 17:37:25 -07:00
sabrina-shanman
27b30a9646 Move hfm debug dump to hfm::Model 2019-10-29 16:49:55 -07:00
sabrina-shanman
8686dcac13 Remove FBXSerializer debug 2019-10-29 11:26:19 -07:00
sabrina-shanman
a70f0f2791 (WIP, has debug) Fix FBXSerializer applying geometric transform inconsistently, let HFM prep calculate FBX extents 2019-10-29 10:47:27 -07:00
sabrina-shanman
f8017d28ff Separate cluster-related transform from joint.globalTransform 2019-10-29 09:20:17 -07:00
sabrina-shanman
d961c4a892 Use safeMaterialID in FBXSerializer_Mesh.cpp 2019-10-28 15:32:45 -07:00
sabrina-shanman
993aa06301 Let hfm prep calculate OBJ model extents 2019-10-28 13:05:27 -07:00
sabrina-shanman
9fd76cac84 Fix FBX UpAxis transform not being applied to skinned models 2019-10-28 11:50:53 -07:00
sabrina-shanman
3de61b4a18 Properly calculate shape extents for FBX aside from geometricTransform/upAxis, speed up model extents calculation 2019-10-28 10:59:44 -07:00
sabrina-shanman
77dcad21db Fix OBJSerializer crash with empty groupMaterialName 2019-10-25 09:56:27 -07:00
sabrina-shanman
fa51ec3daf (WIP) (has debug) Fix baked FBX materials 2019-10-25 09:56:27 -07:00
sabrina-shanman
4e0db5d641 Fix build warnings 2019-10-24 15:49:03 -07:00
sabrina-shanman
83229db458 Fix GLTFSerializer not reading tangents 2019-10-24 15:49:03 -07:00
sabrina-shanman
1fe1321b6c Disable GLTF skinning 2019-10-24 15:48:59 -07:00
sabrina-shanman
d497052505 Fix GLTF claiming to have no cluster weights when it is skinned 2019-10-23 17:13:38 -07:00
Sabrina Shanman
6db993fe05
Merge pull request #16397 from sabrina-shanman/instancing_skinning
(DEV-561) First pass at skinning for GLTF
2019-10-23 15:41:12 -07:00
sabrina-shanman
ca164375f1 New skinning for GLTF 2019-10-23 10:41:36 -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
sabrina-shanman
ad6720240f Introduce hfm::Mesh.clusterWeightsPerVertex 2019-10-18 11:30:48 -07:00
Sam Gateau
c93ac05994
Merge pull request #16378 from sabrina-shanman/instancing_skinning
(DEV-559) Move skinning reweighting code out of model prep
2019-10-18 10:21:26 -07:00
sabrina-shanman
be9931bcab Move skinning reweighting code out of model prep to hfm library; use in FBXSerializer. 2019-10-18 10:08:45 -07:00
Sam Gateau
c89e682b77 address warning 2019-10-17 16:24:21 -07:00
Sam Gateau
bd57cc7b14 Fixing bad indexing 2019-10-17 15:56:41 -07:00
Sam Gateau
55ed7d9a53 Add support for shape generation for obj serializer 2019-10-17 14:53:32 -07:00
sabrina-shanman
acbdd2b3b5 Fix not building due to removed shape.transform 2019-10-16 17:04:19 -07:00
sabrina-shanman
0c3e81f52f Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-16 14:03:01 -07:00
Anthony J. Thibault
da0911e01b Delete legacy blendshape code
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
2019-10-16 10:36:37 -07:00