Commit graph

807 commits

Author SHA1 Message Date
sabrina-shanman
041db33578 Attempt to fix build warnings 2019-03-15 10:20:58 -07:00
sabrina-shanman
ddc4f5349e Merge branch 'master' into hfm_oven_wip 2019-03-12 16:23:07 -07:00
sabrina-shanman
efc9f993f5 Add FSTBaker, and make ModelBaker output an FST
Restore feature to look for baked model file in other oven directory
2019-03-12 15:34:57 -07:00
SamGondelman
b24b7fed3d the root node isn't the first onegit add ../.git add ../. 2019-03-11 15:34:41 -07:00
SamGondelman
b7e1798d1b better handling of unrigged vertices on skinned mesh 2019-03-11 11:28:30 -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
2af17015d3 Convert serializers and FBX.h to use HifiTypes.h 2019-03-06 15:19:01 -08:00
sabrina-shanman
8ff212ac95 Move custom draco mesh attributes from FBX.h to HFM.h 2019-03-06 15:18:58 -08:00
Anthony Thibault
7585391642
Merge pull request #15031 from luiscuenca/upVectorFBXFix
Read and apply the upVector parameter when importing FBX files
2019-03-05 16:27:42 -08:00
luiscuenca
b2d08e9d42 apply axis rotation to translation and meshes 2019-03-04 15:33:21 -07:00
raveenajain
dfb17c922b fix model not loading in bounding box 2019-03-01 11:21:29 -08:00
raveenajain
c1516df58d transforms using joints 2019-02-28 11:35:29 -08:00
luiscuenca
ff7995ae18 Right fix 2019-02-26 18:29:55 -07:00
luiscuenca
f47ec09927 use UP_AXIS_Y 2019-02-26 14:01:30 -07:00
luiscuenca
db1c78246f Read and apply the FBX upVector parameter 2019-02-26 11:32:43 -07:00
John Conklin II
5f0db88a20
Merge pull request #14914 from raveenajain/gltf_tangents
Case 21165: tangent attribute
2019-02-15 11:24:21 -08:00
raveenajain
01def37efd spacing 2019-02-14 14:22:43 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
raveenajain
a967d7a1bc tangent attribute 2019-02-13 15:59: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
2c5446dfb5 Merge branch 'master' into gltf_mat-support 2019-02-11 17:46:23 -08:00
Jeff Clinton
123c2301da
Merge pull request #14858 from SamGondelman/fst
Case 21046: Fix Subsurface Scattering and ResourceCache "extra" bug
2019-02-11 17:40:44 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -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
SamGondelman
4202685a4b Merge remote-tracking branch 'upstream/master' into fst 2019-02-11 16:07:36 -08:00
sabrina-shanman
23806ed67d Add support for GLTF roughness/metallic 2019-02-08 18:54:40 -08:00
raveenajain
709f784fea :} 2019-02-08 16:51:18 -08:00
raveenajain
43a1c78402
Merge branch 'master' into glb_files 2019-02-08 15:59:01 -08:00
Shannon Romano
bd33855820
Merge pull request #14786 from raveenajain/gltf_update
Case 20866: gltf color attribute
2019-02-08 15:27:41 -08:00
Shannon Romano
48db974aec
Merge pull request #14843 from raveenajain/gltf_embedded
Case 20937: gltf embedded data
2019-02-08 15:27:07 -08:00
raveenajain
446176d3a5 update to parse glb files 2019-02-07 15:08:04 -08:00
SamGondelman
e601f6c59f move material mapping to hfm prep step 2019-02-07 14:10:09 -08:00
SamGondelman
3addcb630c Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping 2019-02-07 11:45:59 -08:00
SamGondelman
3ee448a89a fix scattering and working on resource cache bug 2019-02-05 17:32:15 -08:00
raveenajain
253e3554af feedback 2019-02-05 10:18:34 -08:00
raveenajain
21fa1878cb spaces 2019-02-05 09:28:47 -08:00
raveenajain
d109c0fb1b feedback changes 2019-02-05 09:23:10 -08:00
raveenajain
d1d8832e7a read in embedded data 2019-02-01 11:27:43 -08:00
raveenajain
997660d430 review changes 2019-01-31 13:50:17 -08:00
raveenajain
216e9bd4cb Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_update 2019-01-31 13:47:38 -08:00
raveenajain
ae09aec5d9 embedded model geometry 2019-01-31 13:36:53 -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
eace901278 Fix not calculating joint freeLineage list properly 2019-01-29 10:29:12 -08:00
sabrina-shanman
3e7a80ac4c Move FST joint name and rig processing to the model preparation step 2019-01-28 17:49:29 -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
raveenajain
e112bf19cb gltf color attribute 2019-01-28 11:08:09 -08:00
Adam Smith
e648ce38c0
Merge pull request #14679 from sabrina-shanman/bug_uv-scale
(case 20096) Fix missing support for UV scaling parameters in FBX files
2019-01-25 16:21:15 -08:00
sabrina-shanman
fe60b8e69b Remove now redundant tangent generation code 2019-01-24 13:03:51 -08:00