Commit Graph

38 Commits

Author SHA1 Message Date
Yingying Wang
97085c1c05 update sync 2020-06-30 11:48:37 -07:00
Evangel
6d85280c8d Added bool, removed unused debug parameter 2020-06-27 12:53:26 +10:00
Evangel
f6b4370f6a Added arbitrary recursive metadata to allow for glTF2's extensions to be properly represented.
Primary changes are to include/assimp/metadata.h, adding in the aiMetadata GetAiType function,
adding the operator= to allow an aiMetadata type to be assigned, adding a check for the
AI_AIMETADATA type flag as it can't be trivially memcpy'd.

operator= is implemented with a by-value argument as then the copy is made by the copy
constructor and we can just swap everything out and let the destructor handle the mess.

Implemented parsing of the "extensions" flag on all glTF2 Nodes. Doesn't use the ReadValue
helper function on numbers as it did not seem to fill out the Nullable structure properly.
2020-06-26 14:28:41 +10:00
Kim Kulling
31b8d4710f Merge branch 'master' into issue_3165 2020-06-15 20:32:00 +02:00
Kim Kulling
15f11aec93 Merge branch 'master' into gltf2_targetNames_export 2020-06-14 09:43:09 +02:00
kimkulling
f938a6b744 fix leak: just ignore broken texture coordinates. 2020-06-12 14:52:02 +02:00
kimkulling
ad62e6e863 fix unittest check - cannot work, just crash shall not occurr any more. 2020-06-12 12:29:51 +02:00
ywang
e65434bf82 extra callback 2020-06-11 17:37:06 -07:00
ywang
f57e7221c0 temp 2020-06-10 13:23:29 -07:00
Kim Kulling
ffaa634c48 Merge branch 'master' into issue_3165 2020-06-09 10:48:27 +02:00
Kim Kulling
620bebb999 diable warning only for gcc 8.0 or greater 2020-06-09 10:14:57 +02:00
Paul Arden
9e46f9751f Check for invalid texture coordinate accessor. Fixes #3269. 2020-06-09 15:49:38 +10:00
Alec
2c0df39ef3 Added rapidjson define to avoid warnings in c++17 2020-06-06 14:33:41 +02:00
Yingying Wang
4e34853ac7 gltf2 export target names for blendshapes 2020-06-05 12:17:27 -07:00
Kim Kulling
6d04e16c7e Merge branch 'master' into issue_3165 2020-05-28 21:51:58 +02:00
kimkulling
d40a3026db closes https://github.com/assimp/assimp/issues/3165: fix gcc build. 2020-05-28 21:02:13 +02:00
Kim Kulling
78c9ac2889 Merge branch 'master' into gltf2_sparseAccessor_import 2020-05-25 16:11:01 +02:00
Kim Kulling
ecfca1d5c5 Merge branch 'master' into verboseLogging 2020-05-21 18:30:52 +02:00
Yingying Wang
193deb3441 cleanup 2020-05-18 12:01:09 -07:00
Yingying Wang
e39c632809 cleanup 2020-05-18 11:50:51 -07:00
Yingying Wang
0897c4c7be merge 2020-05-18 11:31:44 -07:00
Yingying Wang
02cbd36271 pull master 2020-05-18 11:15:18 -07:00
Kim Kulling
2438e1b52e Merge branch 'master' into gltf2_fix_skin_recursion 2020-05-18 09:05:28 +02:00
Kim Kulling
4b0a3305b1 Merge branch 'master' into master 2020-05-17 13:54:10 +02:00
Malcolm Tyrrell
90cdbd9d9a Fix ups 2020-05-15 17:46:50 +01:00
Malcolm Tyrrell
2ffd1cb8db nits 2020-05-15 17:22:15 +01:00
Malcolm Tyrrell
bcca3a0d79 No need for bespoke macros 2020-05-15 17:22:02 +01:00
Malcolm Tyrrell
6be0ce1ec9 Initial pass at adding logging 2020-05-15 17:21:45 +01:00
Matias Kangasjärvelä
7a16a7a7e4 Fix infinite recursion in gltf2 skin parsing
Previously parsing a node caused the skin that was attached to it
to be parsed, which caused the skins node joints to be parsed,
which could cause the skin to be re-parsed leading to infinite or
at the very least exponential recursion.

The fix is to just get a reference to a temporarily uninitialized
skin as they were being parsed after the scene graph just to be safe
anyway. This way we avoid the recursion problem and all the references
will be valid in the end.
2020-05-15 16:48:41 +03:00
kimkulling
246ec2b0dc Merge branch 'migenius-fix-ortho' of https://github.com/migenius/assimp into migenius-migenius-fix-ortho 2020-05-15 13:37:03 +02:00
kimkulling
a6b5abd698 Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master 2020-05-15 08:51:46 +02:00
Yingying Wang
e9b67cdb89 gltf2 import sparse accessor 2020-05-11 14:34:35 -07:00
Jeremy Cytryn
c3a21666da Make gltf2 export normal normalization safe
This avoids introducing NaNs e.g. when the input mesh has 0-length normals
2020-05-11 12:02:38 -07:00
Jeremy Cytryn
c5a9fbd47f Gracefully handle NaNs and Infs in gltf2 accessor bound computation 2020-05-11 12:02:38 -07:00
Jeremy Cytryn
aef4ecada5 Fail gltf/gltf2 export whenever invalid / incomplete JSON is generated
This can happen currently for example if NaNs are introduced in accessor bounds as rapidjson cannot write NaN/inf floats (see subsequent commit for fix there) and will halt writing to buffer at this point.  Fix here ensures that whenever anything like this happens we throw an exception so this ends up as a registered export failure case, rather than silently exporting the incomplete JSON
2020-05-11 12:02:38 -07:00
Yingying Wang
60e8146b9f fix wrong target idx when importing 2020-05-05 12:51:40 -07:00
kkulling
4e16716924 Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting 2020-05-05 10:17:52 +02:00
Kim Kulling
f8e6512a63 Move format importer and exporter into its won folder. 2020-05-02 15:14:38 +02:00