Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 02:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83223 commits 25 branches 0 tags 1.1 GiB
Commit graph

957 commits

Author SHA1 Message Date
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
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