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

76 Commits

Author SHA1 Message Date
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
Kim Kulling
b1dd77fbbc Merge branch 'master' into gltf2_sparseAccessor_export 2020-07-11 22:57:31 +02:00
Max Vollmer
abf43eaf74 * Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently. 
* ASSIMP_BUILD_NO_GLTF_IMPORTER and ASSIMP_BUILD_NO_GLTF_EXPORTER remain with same behavior as before
 2020-07-05 19:22:31 +01:00
Yingying Wang
97085c1c05 update sync 2020-06-30 11:48:37 -07:00
Yingying Wang
3f2e5518eb update sync 2020-06-30 11:29:08 -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
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