Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 03:42:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81183 commits 25 branches 0 tags 1.1 GiB
Commit graph

899 commits

Author SHA1 Message Date
sabrina-shanman
99a2fedd5f Quick fix for non-matching vertex attributes in GLTF mesh primitives 2019-10-11 14:16:30 -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