Commit Graph

4734 Commits

Author SHA1 Message Date
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
hoshiryu
3fdcd0861f Fix fbx rotation ; 2020-05-11 10:28:05 +02:00
kimkulling
a1bcca2c99 remove step prototype: does not work this way. 2020-05-07 14:00:40 +02:00
Kim Kulling
89a865ce19 Merge branch 'master' into master 2020-05-06 22:07:39 +02:00
Sercan Degirmenci
201347700f fix incorrect header path on framework build 2020-05-06 16:15:23 +03:00
Yingying Wang
60e8146b9f fix wrong target idx when importing 2020-05-05 12:51:40 -07:00
Kim Kulling
ddee1b1ddb Merge branch 'master' into aaronfranke-file-formatting 2020-05-05 10:21:46 +02: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
bf95d1da7c fix conversion 2020-05-04 21:48:46 +02:00
Kim Kulling
91fa9a102b closes https://github.com/assimp/assimp/issues/3181: fix typo for light type. 2020-05-03 12:17:32 +02:00
Kim Kulling
3b06f57150 add missing inclde + 2020-05-02 21:11:47 +02:00
Kim Kulling
514593548d add assert-test for nullptr. 2020-05-02 21:07:41 +02:00
Kim Kulling
3329e76263 closes https://github.com/assimp/assimp/issues/3178: throw exception in case of invalid export stream. 2020-05-02 21:06:55 +02:00
Kim Kulling
f8e6512a63 Move format importer and exporter into its won folder. 2020-05-02 15:14:38 +02:00
Kim Kulling
2d9d112015 fix warning 2020-04-29 21:35:42 +02:00
Kim Kulling
1c30b7bf8e tryout: check if leak is coupled to type double. 2020-04-29 21:31:01 +02:00
Kim Kulling
e0bc0f7fad try to fix double memleak. 2020-04-29 21:19:15 +02:00
Kim Kulling
da2bf5c7a4 fix wrong size 2020-04-29 21:13:46 +02:00
Kim Kulling
f808ed9fb5 fbxconverter: fix memoryleak. 2020-04-29 20:52:49 +02:00
Kim Kulling
c6131ce38a scenecombiner: fix leak. 2020-04-29 20:43:23 +02:00
Kim Kulling
efa046366e Retrigger build 2020-04-28 09:14:53 +02:00
luca
4488e3e745 build on Linux with gcc and clang; warning as error only for 'assimp' target 2020-04-27 23:38:33 -07:00
luca
d98787f35b CI: use clang on Unix, msvc on Windows;Remove explicit flags in CMakeLists.txt; 2020-04-26 12:50:42 -07:00
Kim Kulling
6c1e21d754 fix formatting. 2020-04-26 19:14:30 +02:00
Kim Kulling
bafb8e3189 closes https://github.com/assimp/assimp/issues/3165: remove deprecated code whch causes compiler warning. 2020-04-26 08:59:52 +02:00
Kim Kulling
638df2ceac Merge branch 'master' into master 2020-04-25 12:07:06 +02:00
Kim Kulling
9b1759dcc2 Merge branch 'master' into migenius-migenius-rsws53-mig-2 2020-04-22 19:59:53 +02:00
Kim Kulling
ca70b44e44 Merge branch 'migenius-rsws53-mig-2' of https://github.com/migenius/assimp into migenius-migenius-rsws53-mig-2 2020-04-22 19:58:41 +02:00
Kim Kulling
c36b028412 fix type error for template deduction. 2020-04-21 16:39:18 +02:00
Kim Kulling
c91d3764ca Merge branch 'master' into optimized_bonelimits 2020-04-21 08:45:50 +02:00
Kim Kulling
f71b332ed1 Update glTF2Asset.inl
fix VS-compiler warning.
2020-04-19 21:14:47 +02:00
Kim Kulling
e3563212d7 Merge branch 'master' into master 2020-04-19 21:13:12 +02:00
Kim Kulling
e0f6eb09e6 Merge branch 'master' into optimized_bonelimits 2020-04-17 20:37:28 +02:00
Hehongyuanlove
9c52fd7633 Update D3MFExporter.cpp 2020-04-17 12:58:41 +08:00
Hehongyuanlove
e9a72a5053 repair formate 3MF 2020-04-17 12:38:07 +08:00
Hehongyuanlove
3bbc8e76bd Rgba2Hex to repair rgba(1,1,1,1) 2020-04-17 12:34:05 +08:00
Kim Kulling
c0dc26de8e Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-16 11:29:37 +02:00
Kim Kulling
996abd3fbe Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-16 11:08:29 +02:00
Kim Kulling
d12e938a70 Merge branch 'master' into ifdef_export_defines 2020-04-16 10:24:23 +02:00
Kim Kulling
e341eadfd9 Fix typo 2020-04-16 10:23:50 +02:00
Timur Umayev
69f8d47941 glTF2 support targetNames 2020-04-15 09:39:46 +01:00
Max Vollmer (Microsoft Havok)
a14b5fb06f Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-10 08:44:19 +01:00
Max Vollmer (Microsoft Havok)
485d7ab52e Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-10 08:44:18 +01:00
Kim Kulling
79af2b1a5c Merge branch 'master' into kimkulling_dev 2020-04-09 19:55:45 +02:00
Kim Kulling
9a11d91cb8 code reformattings. 2020-04-06 13:33:03 +02:00
Kim Kulling
131aed73b0 closes https://github.com/assimp/assimp/issues/2166: add missing setter for metadata. 2020-04-06 11:16:16 +02:00
Kim Kulling
132ecae6f4 Merge branch 'master' into kimkulling_dev 2020-04-04 18:28:50 +02:00
Max Vollmer (Microsoft Havok)
a07bf8b26f Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-03 08:40:32 +01:00
Max Vollmer (Microsoft Havok)
d966f3394b Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-03 08:40:29 +01:00
Kim Kulling
c21a1ffffa Remove comments to increase readability 2020-04-01 11:16:39 +02:00