Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,491 Commits 19 Branches 43 Tags
e0803b3ec2ff6e5c6540ac1315f481bd04de8469
Commit Graph

100 Commits

Author SHA1 Message Date
Maki
ca653e0c6a Fix glTF from memory loading .bin with a custom IOHandler 2020-12-28 07:18:50 +00:00
Kim Kulling
3f5238d7c1 Merge branch 'master' into gltf2_fixes 2020-12-24 16:48:36 +01:00
Max Vollmer
a15adc9fbc Fixed copypaste error 2020-12-14 17:01:42 +00:00
Max Vollmer
1db51503d8 Throw instead of assert on invalid file input 2020-12-14 16:44:56 +00:00
Max Vollmer
5436e16802 * Fix memory leak in GLTF2 Importer that occurs when an exception gets thrown while constructing a scene 
* Fix crash in GLTF2 Importer when a scene with dangling/uninitialized pointers gets deleted after an exception was thrown
* Fix crash in GLTF2 Importer when channel sampler is not set (negative index)
 2020-12-14 16:37:02 +00:00
Jean-Louis Boudrand
d18fce3f06 Fix https://github.com/assimp/assimp/issues/3054 
Corrected the animation of each bone of an animation were exported in different animations (+tabs fixes)
 2020-12-13 17:02:50 +01:00
Jean-Louis Boudrand
8701a86c9d Fixed a crash of the Gltf 2 exporter in the case of an animation without a translation, rotation or scale animation key. 2020-12-10 23:47:54 +01:00
Kim Kulling
816bbc852c Merge branch 'master' into master 2020-12-08 19:54:04 +01:00
FRICOTEAUX
b47c5c8c27 glTF2Exporter: fix crash when exporting a scene with several meshes per node (regression coming from commit e8d2b84 on 08/03/2020 "clean all warnings for vs-2019") 2020-11-30 20:11:41 +01:00
Max Vollmer
7d72c78c8e Some improvements 2020-11-30 15:20:51 +00:00
Max Vollmer
6ed1488e6e * Improved error messages 
* Throw instead of asserts on invalid file input
 2020-11-30 15:04:06 +00:00
Kim Kulling
4590f06756 Merge branch 'master' into master 2020-11-25 16:57:49 +01:00
Evangel
98e42e22b8 Added check around setting pScene->mName from asset.scene. 2020-11-22 15:49:41 +10:00
Evangel
30584c1ec1 Replaced name with scene_name to avoid shadowing. 2020-11-22 15:36:08 +10:00
Evangel
67abcb10ba Added mName to aiScene. Primarily to provide access to the "name" member of glTF2 scenes. 2020-11-22 15:33:31 +10:00
Kim Kulling
d10bf9a0d3 Merge branch 'master' into master 2020-11-18 21:30:58 +01:00
Inho Lee
e3083c21f0 glTF2: import correct animation values for CUBICSPLINE 
CUBICSPLINE interpolation has tangent values with the animation data.
Current import don't care this interpolation type but it will help not
to fetch tangent values instead of animation data.

Note: Assimp cannot support interpolation types yet.
 2020-11-17 17:21:07 +01:00
Kim Kulling
c4ba5eeeea Merge branch 'master' into issue_3500 2020-11-16 21:52:14 +01:00
Jean-François Verdon
09ca11d063 Fixing issue 3500, invalid outer cone angle readed from gltf2 file on machines which defines M_PI as a double value 2020-11-16 09:19:13 +01:00
Inho Lee
8845d7eed3 Prevent to generate redundant morph targets for glTF2 2020-11-11 20:49:22 +01:00
Malcolm Tyrrell
0f246edb97 Prevent GetValue from corrupting memory 2020-11-06 13:43:16 +00:00
Malcolm Tyrrell
34e3e6293a Style 2020-11-06 09:57:48 +00:00
Malcolm Tyrrell
0af05e7a60 Better message 2020-11-05 15:10:52 +00:00
Malcolm Tyrrell
01b2088dd3 A missing bufferview was causing a crash. 2020-11-05 15:02:41 +00:00
Max Vollmer
4006bb71f4 Fixes for crashes in GLTF2 Importer 2020-10-23 12:01:43 +01:00
Inho Lee
ad7f8910e9 Rollback the method to handle empty bones for GLTF2 
A patch made the assimp to ignore empty bones.
However, some assets can have bones which don't have weights
but are connected to other bones.
 2020-10-16 17:09:17 +02:00
Kim Kulling
c0e58c1895 Merge branch 'master' into gltfBufferViewSizeFix 2020-09-22 20:02:16 +02:00
Max Vollmer (Microsoft Havok)
9c1edaee96 Merge branch 'master' into gltfBufferViewSizeFix 2020-09-16 10:08:47 +01:00
Kim Kulling
9e2c4e0cf4 Merge branch 'master' into rbsheth_hunter_rapidjson 2020-09-14 09:00:11 +02:00
Max Vollmer
615ffdf93f What: Throw instead of assert when input file is invalid. 
Why: Assimp shouldn't crash on invalid files. Asserts are disabled on Release builds.
 2020-09-10 10:47:58 +01:00
Rahul Sheth
59c8b4ed84 Move RapidJSON definitions to CMake 2020-08-27 16:51:06 -04:00
Malcolm Tyrrell
0f6127e90e No need to build strings. 2020-08-18 18:21:20 +01:00
Malcolm Tyrrell
b7c789da67 Stop concatenating std::strings. Use formatter. 2020-08-18 17:35:08 +01:00
Rahul Sheth
ad18e365e5 Fixing more warnings 2020-07-24 16:33:36 -04:00
Kim Kulling
c7a9ef30cc Merge branch 'master' into fix-mingw-priumax 2020-07-24 11:14:15 +02:00
Kim Kulling
0f442b1ff2 Merge branch 'master' into gltfIndexOutOfRangeFix 2020-07-23 11:27:34 +02:00
Kim Kulling
b2e53783de Merge branch 'master' into fix-mingw-priumax 2020-07-17 12:07:46 +02:00
Kim Kulling
df8792d24b Merge branch 'master' into gltf1_gltf2_split 2020-07-16 10:45:55 +02:00
Malcolm Tyrrell
04df5f8b1e Don't use make_unique 2020-07-15 15:47:25 +01:00
Malcolm Tyrrell
e1bab44e19 Exception safety 2020-07-15 15:02:27 +01:00
Malcolm Tyrrell
37e1fb9cd7 Fix message 2020-07-15 14:19:13 +01:00
Malcolm Tyrrell
f3170a96ba Ensure data does not depend on faces we may not have created. 2020-07-15 12:36:48 +01:00
Malcolm Tyrrell
fff6396e3c Rename to avoid overloading problems. 2020-07-15 12:22:28 +01:00
Malcolm Tyrrell
212903e935 Unit test for all indices out of range, and fix. 2020-07-15 12:19:00 +01:00
Malcolm Tyrrell
c0d978786e Fix warning 2020-07-15 09:12:52 +01:00
Malcolm Tyrrell
a56134ba33 Drop faces when indices are out of range. 2020-07-15 09:05:09 +01:00
awr1
3bf6963d20 Use a better divider for import error 2020-07-14 21:34:30 -05:00
awr1
93d567e3b1 Fix sprintf format string 2020-07-14 21:32:22 -05:00
awr1
700d8e6614 Fix MinGW builds (issues related to pragmas and format strings) 2020-07-14 21:19:07 -05:00
Kim Kulling
eaac92830a Merge branch 'master' of https://github.com/LoicFr/assimp into LoicFr-master 2020-07-12 12:05:34 +02:00