921 commits

Author	SHA1	Message	Date
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
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
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
sabrina-shanman	acca22e2d6	Remove unused primitive reference in GLTFSerializer	2019-10-14 15:30:03 -07:00
sabrina-shanman	82247072de	Create new mesh if GLTF primitive has different vertex attributes	2019-10-14 14:51:57 -07:00
Sam Gateau	8a1f3648f9	fooling around to get the cluster working	2019-10-11 18:06:44 -07:00
sabrina-shanman	6b46f8e6c4	Remove empty for loop	2019-10-11 14:51:48 -07:00
sabrina-shanman	99a2fedd5f	Quick fix for non-matching vertex attributes in GLTF mesh primitives	2019-10-11 14:16:30 -07:00
Sam Gateau	a995f2c09f	in the middle of something	2019-10-10 17:09:54 -07:00
sabrina-shanman	8e69905e0e	Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf	2019-10-10 16:16:37 -07:00
sabrina-shanman	bf65711e04	Fix build warning with cluster.jointIndex in FBXSerializer	2019-10-10 11:14:58 -07:00
sabrina-shanman	f9dd3a9aec	Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf	2019-10-10 10:16:01 -07:00
Sam Gateau	3e8d6671f7	Merge branch 'instancing' of github.com:highfidelity/hifi into instancing	2019-10-10 09:04:22 -07:00
sabrina-shanman	9fd3d44a0d	Make GLTF joint.globalTransform more correct	2019-10-09 17:32:28 -07:00
sabrina-shanman	d3ed0bc71b	Remove unused joint/transform calculation in GLTFSerializer	2019-10-09 17:32:27 -07:00
sabrina-shanman	0b924eea78	Fix GLTF skinning crash, misc fixes and cleanup	2019-10-09 17:32:27 -07:00
Sabrina Shanman	63fa9afa13	Merge pull request #16323 from highfidelity/master ... Merge master into instancing	2019-10-09 16:59:54 -07:00
Sam Gateau	9905fc076c	Materials of baked models fbx are loading correctly, still using the name/id of the mateiral in the part struct	2019-10-09 16:44:06 -07:00
Sam Gateau	1f3993c308	getting the transform right for the rigid bodies	2019-10-08 18:13:24 -07:00
Brad Davis	960cab9994	Qt 5.13 warnings & fixes	2019-10-08 15:40:13 -07:00
sabrina-shanman	da4ffcd91b	GLTF WIP	2019-10-07 16:37:37 -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
Sam Gateau	09a8d69555	landing on the new code base	2019-10-04 18:02:45 -07:00
sabrina-shanman	30680e027b	Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf	2019-10-03 16:49:31 -07:00
sabrina-shanman	b15771e9fe	Fix build warnings and wrong use of indexOf	2019-10-03 16:47:41 -07:00
sabrina-shanman	e8d421fa35	Fix transforms and other issues with FBXSerializer	2019-10-03 14:46:21 -07:00
sabrina-shanman	ba6833df8f	Make small improvements to FBXSerializer code changes	2019-10-03 10:52:05 -07:00
sabrina-shanman	ff5fef9c3a	Update FBXSerializer to reference shapes, support instancing (deformers ... WIP)	2019-10-02 15:50:37 -07:00
sabrina-shanman	bac22c69c1	Move ExtractedMesh out of HFM	2019-10-02 15:47:39 -07:00
Brad Davis	9518aa9ed0	.	2019-09-27 08:33:55 -07:00
Brad Davis	911fd27fc5	wip	2019-09-25 09:30:35 -07:00
Brad Davis	af205c7f1e	Merge remote-tracking branch 'upstream/instancing' into instancing	2019-09-24 12:03:42 -07:00
Brad Davis	c4a1fe9a00	Warnings	2019-09-24 11:05:33 -07:00
sabrina-shanman	725d4ee643	Fix build warnings	2019-09-24 10:57:16 -07:00
Brad Davis	85b22be68b	Fixing warnings	2019-09-23 16:42:34 -07:00
Brad Davis	5edb312346	gltf wip	2019-09-23 10:22:13 -07:00