Commit graph

590 commits

Author SHA1 Message Date
David Back
f137fadc98 fix uint warnings 2018-02-08 16:56:13 -08:00
David Back
f929fa3bcb filename space fix 2018-02-08 14:50:30 -08:00
David Back
6a23eea6ee adjust shininess value 2018-02-08 14:15:47 -08:00
David Back
784b265a86 better texture option parsing 2018-02-07 18:11:00 -08:00
David Back
26a56f0173 Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-02-06 16:12:30 -08:00
David Rowe
a7ec4501e6 FBX node IDs aren't alphanumerically ordered per logical structure 2018-02-01 13:43:14 +13:00
David Rowe
4cd130dd63 Don't reparent model node with clusters if it's a root node 2018-02-01 13:39:57 +13:00
Seth Alves
c146a231fa
Merge pull request #12284 from ctrlaltdavid/21717
FBX reader fixes
2018-01-30 10:49:02 -08:00
David Rowe
cadd4e61ad Fix indent 2018-01-30 14:36:53 +13:00
David Rowe
09b92b93aa Handle geometric offsets in FBX mesh extents calculations 2018-01-30 14:36:34 +13:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
David Rowe
d334f1c35c Don't append trailing FBX root nodes to the tail of the tree 2018-01-29 13:45:39 +13:00
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
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
Brad Davis
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -08:00
David Back
d4db63f8f8 Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-01-17 17:02:29 -08:00
David Back
514eea5477 CR changes 2018-01-17 17:02:10 -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
David Back
0145b770da fix warnings 2018-01-11 17:16:22 -08:00
David Back
5d96559579 Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-01-11 17:01:00 -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
David Back
eaee9b3872 constants, pre-PR tweaks 2018-01-08 16:41:51 -08:00
Anthony J. Thibault
59b843781e Merge branch 'master' into feature/dual-quat 2018-01-08 13:18:42 -08:00
David Back
4985c9db83 Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-01-05 13:55:43 -08:00
David Back
7c99c85eca Revert "temp obj import fixes"
This reverts commit 188e476f2f.
2018-01-05 13:54:16 -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
David Back
fcac489efb illum mode adjustments, small tweaks 2018-01-04 16:39:44 -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
2c5a433ea1 fix datum reset with comment token 2018-01-04 12:56:57 -08:00
David Back
e9f30549f4 ignore Tf, disable illum test 2018-01-03 18:20:07 -08:00
David Back
cbaba86881 more texture options 2018-01-03 15:50:24 -08:00
David Back
dfb9d9ce6b illum model wip 2018-01-03 13:58:27 -08:00
humbletim
513a69cdcd changes per CR feedback 2018-01-03 04:08:43 -05:00
David Back
88b034aa78 bump multiplier 2018-01-02 16:35:43 -08:00
David Back
a44e00142d texture line parse wip 2018-01-02 15:41:14 -08:00
unknown
7531a2ef3b map_bump wip 2017-12-29 18:00:07 -08:00
David Back
cee6bd2700 ignore Ni 2017-12-28 17:20:16 -08:00
David Back
a855916eb8 fix relative paths 2017-12-28 16:39:02 -08:00