Commit graph

124 commits

Author SHA1 Message Date
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
sabrina-shanman
2b355e9d52 Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared 2019-02-12 11:56:44 -08:00
sabrina-shanman
e16e968e98 Merge branch 'fst' of github.com:SamGondelman/hifi into gltf_mat-support 2019-02-11 16:23:15 -08:00
sabrina-shanman
23806ed67d Add support for GLTF roughness/metallic 2019-02-08 18:54:40 -08:00
sabrina-shanman
203e8e2455 Realize joint properties isFree and freeLineage are unused, so tear them out 2019-01-29 11:55:35 -08:00
sabrina-shanman
ff9280a496 Remove unused properties related to mapping from FBXSerializer 2019-01-28 16:29:36 -08:00
Jeff Clinton
9b09c09aeb
Merge pull request #14770 from sabrina-shanman/hfm_prep_tangents
(case 20822) Add normal/tangent generation to HFM preparation step
2019-01-28 12:41:55 -08:00
Shannon Romano
b9b21b7f87
Merge pull request #14712 from AndrewMeadows/shaped-zones-2
case 20597: fix zones using FBX models with non-trivial mesh.modelTransform
2019-01-25 17:33:45 -08:00
sabrina-shanman
fe60b8e69b Remove now redundant tangent generation code 2019-01-24 13:03:51 -08:00
Andrew Meadows
4771fa5f27 fix zones using FBX models with non-trivial mesh.modelTransform 2019-01-15 09:17:48 -08:00
Seth Alves
114bcc003a quiet build warnings 2019-01-11 15:53:49 -08:00
Andrew Meadows
13a3982b5a fix ZoneEntityItem::contains() for model shapes 2019-01-04 12:38:32 -08:00
Adam Smith
0d27cb65ca
Merge pull request #14576 from sabrina-shanman/hfm_prep_graphics
(case 20297) Move graphics preparation from Serializers to runtime preparation step
2018-12-27 15:46:21 -08:00
amantley
defdc9fbcb removed humanIK joint name code from fbx serializer 2018-12-17 10:56:53 -08:00
amantley
6e5c52972a removed member declarations in hfm.h and debug print statements 2018-12-17 10:42:08 -08:00
sabrina-shanman
ec748c60cf Give more appropriate names for some model-related constants and move them into HFM.h 2018-12-13 10:37:35 -08:00
Shannon Romano
a3c870ed90
Merge pull request #14479 from sabrina-shanman/hfm_mimetype
(case 20037) Add robust MIME type detection for loading models in ModelCache
2018-12-11 18:41:55 +00:00
sabrina-shanman
79e9bff225 Nest if statement for invalid id checking in hfm::FormatRegistry::getSerializerForMediaType 2018-12-10 16:18:11 -08:00
sabrina-shanman
b960b66542 Fix mac warning for std::move on temporary object 2018-12-10 11:10:29 -08:00
sabrina-shanman
8792824960 Remove FormatSerializerRegister as it is unused 2018-12-10 09:58:59 -08:00
sabrina-shanman
031085b384 Remove now unused HFMSimpleFormat 2018-12-07 16:17:33 -08:00
sabrina-shanman
7cbe3776f5 Simplify serializer registration process 2018-12-07 12:05:27 -08:00
amantley
ca0133a2a6 put the lean joint back in 2018-12-06 16:24:06 -08:00
sabrina-shanman
6ea4769173 Re-name MIMETypeLibrary to MediaTypeLibrary and update related references 2018-12-06 13:39:18 -08:00
amantley
edab74caa4 mapped the model joint names to hifi compliant joint names in FBX serializer 2018-12-04 16:20:46 -08:00
sabrina-shanman
ed1684967f Remove straggler HFMSimpleFormat.cpp 2018-12-04 10:08:14 -08:00
sabrina-shanman
da9f37bb39 Fix up HFMFormatRegistry to accept subclass factory unique pointers 2018-12-04 09:30:04 -08:00
sabrina-shanman
19459c15a5 Split MIMETypeLibrary file type detection into three separate functions 2018-12-04 09:30:04 -08:00
sabrina-shanman
660d8c4e92 Remove unused mapping parameter from MIME type detection 2018-12-04 09:30:04 -08:00
sabrina-shanman
0da4669370 Replace ReadWriteLockable with std::lock_guard in HFMFormatRegistry/ModelFormatRegistry 2018-12-04 09:30:04 -08:00
sabrina-shanman
bf1c5f2fa5 Make Serializer::Factory stored by HFMFormatRegistry unique_ptr 2018-12-04 09:30:03 -08:00
sabrina-shanman
2178baf1a8 Create SimpleFormat 2018-12-04 09:29:57 -08:00
amantley
f7fcf503c2 removed joint lean from fbxSerializer. it was unused 2018-12-03 14:50:57 -08:00
Angus Antley
a73f74d63c Merge remote-tracking branch 'upstream/master' into jointNameMapping 2018-11-30 21:29:29 -08:00
sabrina-shanman
d1ac501967 Create hfm::FormatRegistry, for more general model format definition 2018-11-30 16:50:45 -08:00
sabrina-shanman
be511378cd Merge branch 'master' into hfm_serializer 2018-11-20 13:42:24 -08:00
amantley
fd9c05ce80 joint mapping. adding to fbx reader and avatar classes to get non standard names to map to hifi 2018-11-16 17:39:46 -08:00
amantley
3bf4a7844d moved the jointrotationoffsets to hfmModel.h from fbx.h 2018-11-15 10:56:17 -08:00
sabrina-shanman
93c7578f54 Convert hfm::Serializer to use hifi-namespaced types 2018-11-12 16:12:21 -08:00
sabrina-shanman
f971294d6d Make HFMSerializer return a smart pointer to an HFMModel 2018-11-12 16:12:21 -08:00
sabrina-shanman
baa8cdb054 Remove combineParts from the Serializer interface 2018-11-12 16:12:21 -08:00
sabrina-shanman
00f2b4eeb9 Make the existing model serializers based on HFMSerializer 2018-11-12 16:12:20 -08:00
sabrina-shanman
0271f7d334 Create the HFMSerializer interface class 2018-11-12 16:12:20 -08:00
sabrina-shanman
4d9c20343a Link shared library in hfm 2018-11-07 11:44:58 -08:00
sabrina-shanman
8b37133875 Remove unnecessary draco dependency from hfm library 2018-11-06 17:10:44 -08:00
sabrina-shanman
e654ff9bbc Remove forward declaration in HFM.h so ModelPackager and other things can use it instead 2018-11-06 14:53:23 -08:00
sabrina-shanman
70c9db38ef Do not reference HFM inside the hfm namespace 2018-11-06 14:13:48 -08:00
sabrina-shanman
8fa72396ef Consolidate HFM class implementations into source file and move model
logging.
2018-11-06 14:05:36 -08:00
sabrina-shanman
1a69afb3e8 Move HFM.h to hfm subfolder per convention 2018-11-06 11:43:19 -08:00
sabrina-shanman
c85b809e04 Fix Qt metatypes breaking by moving them back out of the hfm namespace 2018-11-05 13:40:38 -08:00
sabrina-shanman
a98a9b1c0c Move HFM prefixed classes to hfm namespace and add HFM prefixed names as typedefs 2018-11-05 12:47:34 -08:00
sabrina-shanman
e00024e8b0 Create HFM library 2018-11-05 12:47:34 -08:00