Commit graph

101 commits

Author SHA1 Message Date
sabrina-shanman
ad6720240f Introduce hfm::Mesh.clusterWeightsPerVertex 2019-10-18 11:30:48 -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
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
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
sabrina-shanman
8e69905e0e Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-10 16:16:37 -07:00
sabrina-shanman
726a91cdb9 Fix un-transformed vertex being added to extents instead of transformed one 2019-10-09 17:32:27 -07:00
sabrina-shanman
09f584818b Add extent calculation utilities, CalculateExtentsTask, make tangent
calculation more lenient
2019-10-07 16:38:01 -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
30680e027b Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-03 16:49:31 -07:00
sabrina-shanman
4a8cdee38a Update HFM format and deprecate hfm::TransformNode 2019-10-03 14:30:03 -07:00
sabrina-shanman
bac22c69c1 Move ExtractedMesh out of HFM 2019-10-02 15:47:39 -07:00
Brad Davis
56f01cb7bd Merge remote-tracking branch 'upstream/instancing' into instancing 2019-09-25 16:27:22 -07:00
sabrina-shanman
af460d7f5f Add hfm::Shape::transformedExtents. Mark select hfm fields as
deprecated.
2019-09-25 16:11:48 -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
sabrina-shanman
99386565b0 Fix build warnings/errors 2019-09-19 11:15:38 -07:00
sabrina-shanman
cf8e584ced Make the cluster jointIndex unsigned 2019-09-18 15:11:12 -07:00
sabrina-shanman
ac06234c3d Make hfm::Deformer more closely resemble original model data. Leave weight-based blendshape packing to preparations step. 2019-09-16 16:07:01 -07:00
sabrina-shanman
517bef63a9 Make fields for TransformNode, Deformer, DynamicTransform public 2019-09-16 11:09:48 -07:00
sabrina-shanman
76b1f551b1 Merge branch 'master' into instancing 2019-09-16 10:17:59 -07:00
sabrina-shanman
46616b4efd Fix more integer conversion warnings 2019-09-16 09:55:25 -07:00
sabrina-shanman
b14593202c Give hfm::Shape keys special undefined value 2019-09-13 14:26:18 -07:00
sabrina-shanman
c765e1af39 Add dynamicTransforms to hfm::Model 2019-09-13 14:26:18 -07:00
sabrina-shanman
d948e434dd DyanamicTransform concept 2019-09-13 09:54:46 -07:00
sabrina-shanman
ccdfb11de2 Re-order hfm::Model variables and add shapeTransforms list 2019-09-11 16:57:57 -07:00
sabrina-shanman
b944db3e79 std::vector-ize joints and materials in hfm::Model 2019-09-11 16:54:07 -07:00
sabrina-shanman
c4db6c78d8 std::vector-ize meshes/mesh parts in hfm::Model 2019-09-11 16:50:50 -07:00
sabrina-shanman
df5684c437 Introduce hfm::Shape object 2019-09-11 14:58:23 -07:00
sabrina-shanman
384b7fd629 Fix FBXBaker failing when an unbaked mesh is empty
Error early for all model bakers for draco errors
2019-09-10 15:22:54 -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
luiscuenca
0d92ec1f5b
Fix comparison warning 2019-04-08 11:24:59 -07:00
luiscuenca
d9eaa2076d
Fix out of bounds when the model url is incorrect 2019-04-08 10:36:58 -07:00
Anthony Thibault
b8b7798ad9
Merge pull request #15296 from luiscuenca/kdopsRotOffsetFix
Add joint rotation offset to the avatar multi-sphere shapes
2019-04-05 15:55:34 -07:00
luiscuenca
a7c36c9505 Merge branch 'master' into kdopsRotOffsetFix 2019-03-29 10:29:30 -07:00
David Rowe
9a1bb27034 AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc 2019-03-26 13:58:43 +13:00
sabrina-shanman
ddc4f5349e Merge branch 'master' into hfm_oven_wip 2019-03-12 16:23:07 -07:00
sabrina-shanman
1576125c42 Integrate HFM Asset Engine (aka model prep step) into Oven
Add 'deduplicateIndices' parameter to FBXSerializer and make deduplicate a required parameter for extractMesh

Add draco mesh and FBX draco node version

Support generating/saving draco meshes from FBX Model nodes
2019-03-06 15:54:12 -08:00
sabrina-shanman
8ff212ac95 Move custom draco mesh attributes from FBX.h to HFM.h 2019-03-06 15:18:58 -08:00
luiscuenca
dfb434ea09 Fix warning and refactoring 2019-03-06 09:25:49 -07:00
luiscuenca
76609197e2 Read flow data from the fst file 2019-03-05 18:50:53 -07:00
luiscuenca
79b7a3d28d Apply kdop computation after reading the joint rotation offsets 2019-03-04 13:15:15 -07:00
Andrew Meadows
efe2767f3f
Merge pull request #14913 from SamGondelman/pal
Case 21147, Case 20944: Fix setTextures (pal, etc.)
2019-02-13 17:50:08 -08:00
SamGondelman
9e002c59d4 fix pal 2019-02-13 15:24:55 -08:00
sabrina-shanman
b2af6d1374 Have only one ColorChannel enum as header in image library 2019-02-12 16:14:41 -08:00