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
sabrina-shanman
46616b4efd
Fix more integer conversion warnings
2019-09-16 09:55:25 -07:00
sabrina-shanman
5837053f50
Fix miscellaneous build errors/warnings
2019-09-13 16:56:30 -07:00
sabrina-shanman
a166b41216
Fix build warnings/errors
2019-09-13 15:39:29 -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
Shannon Romano
8d8c7c1a10
Merge pull request #15555 from raveenajain/gltf_walkingBounding
...
Case 22352: gltf walking, bounding, collision
2019-06-07 12:23:52 -07:00
Seth Alves
32de196a2c
remove some spammy logging
2019-06-04 13:00:26 -07:00
raveenajain
3019a13240
stable point for collision capsules
2019-06-03 11:35:23 -07:00
raveenajain
9693f586a2
bounding boxes, avatar walking, temp collision
2019-05-22 14:24:09 -07:00
Shannon Romano
9b1e92145b
Merge pull request #14366 from SaracenOne/gltf_improvements
...
Case 22169: GLTF Importer Improvements
2019-05-15 15:47:21 -07:00
Saracen
9aadea81b3
Fix to use correct texcoord2 array.
2019-05-13 19:13:24 +01:00
Saracen
7987ed14b0
Fix mismatched meshpart attributes (generates dummy buffers), re-added normals generation routine, buffer size checks, detect out-of-range indices,
2019-05-11 04:30:14 +01:00
Shannon Romano
d206c9c87f
Merge pull request #15490 from raveenajain/stuckAvatars
...
Case 22424: gltf avatars break all other available avatars when used
2019-05-06 12:39:43 -07:00
sabrina-shanman
8a799967d1
Do sanity checks on data length in readBinaryArray in FBXSerializer_Node.cpp
2019-05-01 17:02:06 -07:00
raveenajain
0a3a6c52f9
initial information needed for joint shape info
2019-04-30 17:12:35 -07:00
Saracen
a075074303
Revert to previous clusterIndices and clusterWeight expansion implementation.
2019-04-29 21:26:13 +01:00
Saracen
95ec51e37b
Formatting and naming changes. Tweak to structure of skinning code.
2019-04-29 20:35:38 +01:00
Saracen
0bf216ab73
Sparse accessors support for skin inverse bind matrices and shapekey target data.
2019-04-27 12:42:37 +01:00
Saracen
9b7df26d91
Fixed cluster weighting regression.
2019-04-27 12:05:29 +01:00
Saracen
a1279fa0b1
Fixed requested indentation issues.
...
# Conflicts:
# libraries/fbx/src/GLTFSerializer.cpp
2019-04-27 12:05:05 +01:00
Saracen
b00e0640c5
Convert to camel case, removed unused variable, replace tabs with spaces, remove deprecated normals generation.
2019-04-27 12:03:39 +01:00
Saracen
a4b3f02139
Added support for automatic normals generation, sparse accessors,
...
extra threshold for thin bounding boxes, and general refactoring.
# Conflicts:
# libraries/fbx/src/GLTFSerializer.cpp
2019-04-27 12:03:22 +01:00
Saracen
471baf83c6
Support vertex colours and multiple unnamed mesh materials.
...
# Conflicts:
# libraries/fbx/src/GLTFSerializer.cpp
2019-04-27 12:01:34 +01:00
raveenajain
0be36783bf
hfm blendshape name
2019-04-26 01:37:26 +01:00
raveenajain
66ad6451f9
morph targets for avatars
2019-04-26 00:40:44 +01:00
raveenajain
f2312f77c1
remove unused var
2019-04-19 22:47:47 +01:00
raveenajain
65f4fac993
move debug code
2019-04-19 21:40:57 +01:00
Sam Gondelman
38ca699ff5
Merge pull request #15406 from sabrina-shanman/bug_oven_fst-rebake
...
(case 22271) (RC83) Fix baked models unable to rebake
2019-04-19 10:44:54 -07:00
Shannon Romano
d5ab49c64c
Merge pull request #15402 from sabrina-shanman/hfm_bug_model-materials_master
...
(case 22216) Fix Interface not loading some baked models correctly
2019-04-19 08:53:40 -07:00
sabrina-shanman
d80b40e5a5
Fix baked FSTs unable to be rebaked by creating an FST in the original
...
output folder
2019-04-17 16:37:01 -07:00
sabrina-shanman
693cdabc2c
Small style fix for materialID bounds check in FBXSerializer_Mesh.cpp
2019-04-17 13:26:19 -07:00
sabrina-shanman
53f74abd49
Fix another Interface issue loading baked models
2019-04-17 13:24:04 -07:00
sabrina-shanman
343b853b59
Fix Interface not loading some baked models correctly
2019-04-17 13:24:04 -07:00
raveenajain
2fab5a0945
parents, skeleton, break fix
2019-04-17 21:14:44 +01:00
raveenajain
104ed758b9
re-order nodes, cluster update
2019-04-17 17:52:48 +01:00
raveenajain
f458427067
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_brainstem_fix
2019-04-15 12:59:43 -07:00
raveenajain
3c84a46cba
update how nodes are initially parsed
2019-04-15 20:27:54 +01:00
raveenajain
c970a58715
comments, edge case for skinned
2019-04-09 17:29:07 +01:00
raveenajain
40fe156c8b
naming, condition
2019-04-08 19:54:31 +01:00
Sam Gondelman
88c278d357
Merge pull request #15319 from SamGondelman/materialBaker
...
Case 21764: Oven bakes model materials directly to separate material description
2019-04-05 17:08:22 -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
raveenajain
d1d999dd72
init node order fix
2019-04-05 19:58:26 +01:00
SamGondelman
2b376f7881
handle weird material name case
2019-04-03 14:26:45 -07:00
raveenajain
fcc7e9af30
minor syntax fix
2019-04-03 00:09:36 +01:00
raveenajain
1435245279
root cluster
2019-04-02 21:18:16 +01:00
raveenajain
8439019c4e
update use of vectors
2019-04-02 19:56:17 +01:00
raveenajain
ce6f2b7bcc
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_skinning
2019-04-01 21:48:55 +01:00
raveenajain
2920fdc966
variables, cluster size
2019-04-01 21:09:14 +01:00
raveenajain
269b910d24
update variables, loops
2019-03-29 18:25:17 -07:00
Shannon Romano
53c7ade542
Merge pull request #15178 from amantley/fbxJointParentBug
...
Fix for FBX Root Being Given Non-Zero Parent
2019-03-29 17:02:02 -07:00
luiscuenca
a7c36c9505
Merge branch 'master' into kdopsRotOffsetFix
2019-03-29 10:29:30 -07:00
raveenajain
b283bb303d
jenkins warning fixes
2019-03-28 17:55:51 -07:00
raveenajain
5480c9f5ca
skinning, skeleton for models, avatar
2019-03-28 15:27:49 -07:00
SamGondelman
b98f47d1f3
add baked materials to fst materialMapping
2019-03-28 15:11:27 -07:00
Anthony Thibault
cee298acdf
Merge pull request #15205 from amantley/rootTransBug
...
Fixed Bug For Old FBX Files That Have An Exported Pose Different From The Bind Pose
2019-03-28 11:10:03 -07:00
SamGondelman
310d01feff
wip
2019-03-27 15:44:01 -07:00
Angus Antley
fcb45802bd
removed debug print
2019-03-27 11:19:28 -07:00
amantley
2300fe471d
we now read frame zero of the animation to override the bind pose in fbxs that are before version 7500
2019-03-15 16:53:06 -07:00
sabrina-shanman
041db33578
Attempt to fix build warnings
2019-03-15 10:20:58 -07:00
amantley
9d739277c8
changed the fix so that we allow the root to be child
2019-03-13 14:26:27 -07:00
amantley
93d7a4ae3b
will no longer allow a non-zero parent of the root of an fbx model
2019-03-13 11:14:15 -07:00
amantley
c634c1445c
Merge remote-tracking branch 'upstream/master' into fbxJointParentBug
2019-03-13 10:11:11 -07:00
sabrina-shanman
ddc4f5349e
Merge branch 'master' into hfm_oven_wip
2019-03-12 16:23:07 -07:00
amantley
7567e0d355
debugging the root of the fbx, it is not 0 in some cases
2019-03-12 15:48:42 -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
amantley
7c7e632589
debug statements to find the node parsing error
2019-03-11 17:50:20 -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
luiscuenca
79b7a3d28d
Apply kdop computation after reading the joint rotation offsets
2019-03-04 13:15:15 -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
Anthony Thibault
5146f3dfae
Bug fix for avatars that have mesh/joint name duplicates
...
This change has two parts. First we do a better job of identifying joints vs meshes in the FBXSerializer.
Second we use this information to better handle duplicate names in AnimSkeleton.
When a duplicate is detected, allow joints to override meshes.
This will ensure that when joints are looked up by name we will not return a mesh object with the same name by mistake.
2019-01-22 10:47:01 -08:00
sabrina-shanman
df17614fc3
Actually, don't support 3d vectors for Maya uv scale/offset
2019-01-15 11:16:22 -08:00
sabrina-shanman
f02d6433e3
Be more descriptive about Maya uv scale/translation property, and better guess for 3d vector case
2019-01-15 11:09:16 -08:00
sabrina-shanman
c875492d50
Be more efficient with MaterialParam in FBXSerializer::getTexture
2019-01-15 10:29:12 -08:00
sabrina-shanman
5173577a92
Fix issues with uv scale checking
2019-01-14 10:11:30 -08:00
sabrina-shanman
00a9e9e92f
Add support for Maya material uv scale/translation
2019-01-11 17:14:10 -08:00
sabrina-shanman
5b207775e7
Remove redundant TextureParam transform variables
2019-01-11 17:12:09 -08:00
Seth Alves
114bcc003a
quiet build warnings
2019-01-11 15:53:49 -08:00
sabrina-shanman
f349e48a25
Fix support for FBX texture scaling using ModelUVTranslation/ModelUVScaling
2019-01-09 17:14:03 -08:00
Ryan Huffman
c2ceeb3d76
Apply AvatarPackager code review cleanup
2019-01-04 09:41:31 -08:00
Thijs Wenker
cb33a91a34
- rename functionality
...
- avatar packager works in tablet now
2018-12-29 03:31:56 +01:00
Thijs Wenker
1ec8aa8fa5
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-28 17:13:05 +01: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
Thijs Wenker
1a38abe230
- add jointIndexes to new
...
- attempt to fix OSX / linux build
- ability to actually load a recent project (previously was only able to load the top recent project)
2018-12-27 21:47:10 +01:00
Ryan Huffman
1da179dc04
Update avatar packager styling
2018-12-27 00:13:45 -08:00
Thijs Wenker
ad2d9bc79a
- fst read/write should work
...
- images are being copied into the correct directory
- scripts are added to fst upon project load
- modal overlay fix
2018-12-21 19:34:54 +01:00
Thijs Wenker
ea901aa179
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-21 14:11:57 +01:00
Thijs Wenker
dab4a621a3
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2018-12-21 01:59:11 +01:00
Ryan Huffman
556f516be6
Update uploader screen
2018-12-20 16:30:08 -08:00
luiscuenca
52bfaafd91
Fix crash on glTF import when the file contains embedded buffers
2018-12-20 13:25:19 -07:00
Thijs Wenker
79a9c82168
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-20 18:56:33 +01:00
Ryan Huffman
202326dbac
Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager
2018-12-19 12:03:30 -08:00
Thijs Wenker
cb74313de8
create projects / style changes
2018-12-19 19:23:24 +01:00
Ryan Huffman
720cd90dc7
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-18 13:17:28 -08:00
amantley
3e1beb2dca
removed white space and stray semi colon
2018-12-17 15:05:51 -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
Angus Antley
77fa4e7d13
took out the unnecessary hfm.jointindex code
2018-12-16 17:29:16 -08:00
Ryan Huffman
78c4c2599e
Add start of marketplace uploading and project file list
2018-12-13 13:27:31 -08:00
sabrina-shanman
e8a2622ed6
Move graphics prep to baker and add related tasks for splitting
...
up the model
2018-12-13 11:15:56 -08:00
