Paul Arden
9e46f9751f
Check for invalid texture coordinate accessor. Fixes #3269 .
2020-06-09 15:49:38 +10:00
Yingying Wang
8fed101432
avoid all zero
2020-06-08 16:18:11 -07:00
Yingying Wang
f18f1a35f6
accommodate linux build
2020-06-08 14:49:50 -07:00
Yingying Wang
2065512470
remove comments
2020-06-08 14:41:53 -07:00
Yingying Wang
12dc736d94
Merge branch 'master' of https://github.com/thomasbiang/assimp into gltf2_sparseAccessor_export
2020-06-08 14:32:23 -07: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
Yingying Wang
98767cbb08
pull master
2020-05-27 10:23:28 -07: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
50f0a86798
conditional export
2020-05-19 16:10:41 -07:00
Yingying Wang
c10e409a5d
merge
2020-05-18 12:16:45 -07: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
Yingying Wang
b8e39b58d1
clean up
2020-05-15 12:32:58 -07:00
Yingying Wang
f6720271cb
sparce accessor exporter
2020-05-15 12:20:31 -07: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