Commit graph

553 commits

Author SHA1 Message Date
John Conklin II
049cf43de0
Merge pull request #12242 from hyperlogic/bug-fix/twisted-knees
Bug fix for twisted knees on some avatars.
2018-01-24 16:19:49 -08:00
Anthony J. Thibault
991ba7f195 Bug fix for twisted knees on some avatars.
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix.  The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale.  If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity.  To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.
2018-01-23 16:05:43 -08:00
Brad Davis
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -08:00
Seth Alves
fda4cf10b9
Merge pull request #12159 from Zvork/compactvb
Fix potential assert exception in FBXMesh_Reader.cpp
2018-01-17 15:16:22 -08:00
Bradley Austin Davis
25b778be1d Tracking down remaining SOX crashes 2018-01-17 12:18:39 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
David Rowe
67218a697b Support FBX files that have nodes with non-XYZ rotation order 2018-01-16 14:01:20 +13:00
Sam Gateau
df0660f823 Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles 2018-01-13 01:00:41 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
Anthony J. Thibault
7753b8a0b5 Merge branch 'master' into feature/dual-quat 2018-01-11 17:31:29 -08:00
Olivier Prat
3f8865594b Fixed typo error that could potentially launch an assert when loading objects with blend shapes with normals but without tangents 2018-01-11 08:37:56 +01:00
Olivier Prat
db9e5fdae8 Merged from master but rendering seems broken 2018-01-09 11:05:34 +01:00
Anthony J. Thibault
59b843781e Merge branch 'master' into feature/dual-quat 2018-01-08 13:18:42 -08:00
David Back
7558b00467 better fix for model scale floor, remove abs 2018-01-04 17:49:39 -08:00
David Back
307867a91f adjust to for loop 2018-01-04 16:53:35 -08:00
Anthony J. Thibault
b8c88fca3b Dual Quaternion skinning optimization
Reduce expensive conversion from quat -> matrix -> quat, by keeping
the inverseBindPose in a Transform instance instead of a mat4.
2018-01-04 16:17:23 -08:00
Anthony J. Thibault
b69edceb4f Fixed rotation polarity and weights are now 16 bit. 2018-01-04 16:15:41 -08:00
David Back
fd297f1c03 convert negative relative indices to absolute indices 2017-12-21 10:36:41 -08:00
Olivier Prat
0d34569b1a Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2017-12-21 08:22:35 +01:00
Olivier Prat
24cc19aeaa Partial fix of colors per vertex of FBX models exported by Blender 2.79 2017-12-18 14:37:50 +01:00
Olivier Prat
264f41472d Added tangents to blendshape for possible break of bump mapping when doing blend shape animations 2017-12-15 12:06:07 +01:00
Olivier Prat
2a325d45e0 Mesh color attributes are now stored as RGBA8 2017-12-15 09:21:36 +01:00
Olivier Prat
f38e473218 Working packing of normals and tangents in GL_INT_10_10_10_2_REV format. Need to check this with all available 3D data input formats 2017-12-14 17:57:34 +01:00
Olivier Prat
deb0b6b06f Working interleaved normals and tangents. I'm still wondering why it works with blendshapes though... 2017-12-14 16:12:44 +01:00
Olivier Prat
37deb2674a Texture coordinates are now encoded in vec2 half float in FBXReader 2017-12-13 17:18:05 +01:00
David Back
8b38c03a56 Allow space characters in material library name 2017-12-07 17:40:58 -08:00
Bradley Austin Davis
d6072f2bf2 Add bullet and draco to precompiled libraries 2017-11-28 11:32:34 -08:00
Brad Hefta-Gaub
a85a6f6795
Merge pull request #11308 from luiscuenca/patch-1
glTF import DEMO
2017-11-17 14:52:51 -08:00
Zach Fox
c64c2e17c8 First pass at consolidation 2017-10-24 12:01:05 -07:00
luiscuenca
25b419a1a1 fixed returning a reference to a local variable 2017-10-10 12:44:38 -07:00
luiscuenca
a7a1329c5f Adapt code to coding standard 2017-10-10 12:10:03 -07:00
luiscuenca
297f591ce2 fixed errors and default avatar 2017-10-09 14:37:45 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Ryan Huffman
641addf397 Remove FBX.cpp 2017-09-19 11:13:39 -07:00
Ryan Huffman
d80aa50e79 Remove support for QList in FBXWriter 2017-09-18 09:04:13 -07:00
Stephen Birarda
1f961885cc Merge pull request #11369 from huffman/feat/bake-skinning-support
Add animation support for draco encoded FBXs
2017-09-15 15:21:35 -07:00
Ryan Huffman
2a4f7712c3 Replace magic number for compressed flag in FBXWriter 2017-09-15 14:41:38 -07:00
Ryan Huffman
c5852dfbe8 Add list compression to FBXWriter 2017-09-15 13:53:10 -07:00
Ryan Huffman
7db8d1dcbc Add support for baked skinned meshes 2017-09-14 16:43:52 -07:00
Ryan Huffman
3793062045 Add optional FBX 2015 encoding to FBXWriter 2017-09-14 16:31:10 -07:00
Stephen Birarda
2a62bac4f9 refuse to re-bake an already baked FBX 2017-09-14 16:08:11 -07:00
Stephen Birarda
43196cd0a6 fix buffer resizing to only occur when attribute is present 2017-09-14 14:46:48 -07:00
Stephen Birarda
bb98df38d4 remove re-grabbing of draco faces 2017-09-14 14:42:40 -07:00
Stephen Birarda
9cb4e2c5f2 address code review comments 2017-09-14 13:58:48 -07:00
Stephen Birarda
bfb4dd0cdb disable warning c4267 when including draco 2017-09-13 14:00:41 -07:00
Stephen Birarda
1e6154fbc8 make draco compile flags OS X only 2017-09-13 13:45:26 -07:00
Stephen Birarda
dc86c6fe73 fixes for warnings in FBXReader/FBXWriter 2017-09-13 09:16:58 -07:00