Commit graph

109 commits

Author SHA1 Message Date
Kasen IO
fe0109aa13 Fix crash for indices out of bounds in GLTF.
Co-Authored-By: hifiexperiments <hifiexperiments@users.noreply.github.com>
2020-07-02 23:52:26 -04:00
Kasen IO
71fec167ec Prevent a crash for corrupted GLTF models.
Co-Authored-By: hifiexperiments <hifiexperiments@users.noreply.github.com>
2020-06-23 20:52:48 -04:00
kasenvr
103fd8eef2
Merge branch 'master' into fix/revert-instancing-temporarily-1 2020-06-03 22:44:32 -04:00
HifiExperiments
ade6bf24bb fix issues with glb urls 2020-06-03 15:19:54 -07:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
HifiExperiments
69714a89ca material entities support cullFaceMode and support gltf doubleSided 2019-11-26 14:48:48 -08:00
HifiExperiments
5371fd613a properly implement alphaModes 2019-11-22 00:41:32 -08:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master
Merge master into instancing
2019-10-31 17:39:15 -07:00
sabrina-shanman
61825f2e06 Remove joint.transform self-assignment 2019-10-30 11:50:10 -07:00
sabrina-shanman
3c078eeef6 It makes more sense for joint.globalTransform to have the hfmModel.offset applied 2019-10-29 17:37:26 -07:00
sabrina-shanman
27b30a9646 Move hfm debug dump to hfm::Model 2019-10-29 16:49:55 -07:00
sabrina-shanman
4e0db5d641 Fix build warnings 2019-10-24 15:49:03 -07:00
sabrina-shanman
83229db458 Fix GLTFSerializer not reading tangents 2019-10-24 15:49:03 -07:00
sabrina-shanman
1fe1321b6c Disable GLTF skinning 2019-10-24 15:48:59 -07:00
sabrina-shanman
d497052505 Fix GLTF claiming to have no cluster weights when it is skinned 2019-10-23 17:13:38 -07:00
sabrina-shanman
ca164375f1 New skinning for GLTF 2019-10-23 10:41:36 -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
Anthony J. Thibault
da0911e01b Delete legacy blendshape code
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
2019-10-16 10:36:37 -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
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
sabrina-shanman
f9dd3a9aec Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-10 10:16:01 -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
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
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
c4a1fe9a00 Warnings 2019-09-24 11:05:33 -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
5837053f50 Fix miscellaneous build errors/warnings 2019-09-13 16:56:30 -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
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
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