Commit Graph

166 Commits

Author SHA1 Message Date
Malcolm Tyrrell
6b9c477763 The floar parsing routines are now DeadlyErrors. 2020-10-02 13:58:55 +01:00
Sherief Farouk
a3c8cfc0ff Fix for build break due to warnings-as-errors when not building M3D exporter. 2020-09-26 23:21:23 -07:00
Kim Kulling
c0e58c1895 Merge branch 'master' into gltfBufferViewSizeFix 2020-09-22 20:02:16 +02:00
Max Vollmer (Microsoft Havok)
c9fb21661f Merge branch 'master' into gltfBufferViewSizeFix 2020-09-18 08:01:24 +01:00
rahulshethsc
354e09e785 Merge branch 'master' into rbsheth_hunter_rapidjson 2020-09-17 14:39:04 -04:00
Fabian Schmidt
338c0b753c Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 2020-09-16 21:43:35 +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
Kim Kulling
23defc275a Merge branch 'master' into makeInternalErrorsAccessible 2020-09-14 08:36:13 +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
Kim Kulling
ef6b93a949 Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 2020-09-04 16:27:47 +02:00
Rahul Sheth
78b30d1752 Merge branch 'master' into rbsheth_hunter_rapidjson 2020-09-03 09:51:32 -04:00
Gargaj
9053dfea05 add missing define to glTF importer 2020-09-02 16:28:12 +02:00
Joshua Hyatt
638499a278 Replace unique_ptr and add custom deleter 2020-09-01 10:30:31 -06:00
Joshua Hyatt
dcf9a7b2d8 Conform variable names to code standards 2020-08-29 23:58:31 -06:00
Joshua Hyatt
953e976de6 Close stream when finished 2020-08-29 23:56:50 -06:00
Joshua Hyatt
cc2613f264 Replace unique_ptr with raw pointer 2020-08-29 23:06:33 -06:00
Joshua Hyatt
c769f8d4ad Replace unique_ptr with raw pointer to avoid destructing stream 2020-08-29 22:21:34 -06:00
crocdialer
3c98197be0 set aiAnimation->mTicksPerSecond to 1000.0. this is analog to the behaviour of gltf2-importer 2020-08-28 16:09:15 +02:00
Rahul Sheth
59c8b4ed84 Move RapidJSON definitions to CMake 2020-08-27 16:51:06 -04:00
Malcolm Tyrrell
6c2ceb55f8 Simplify some FBX error code. 2020-08-19 17:20:57 +01: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
Malcolm Tyrrell
0ffcdf160e Build formatting into DeadlyImportError 2020-08-18 16:32:34 +01:00
lsliegeo
0d00ff7043 use ai_real instead of float 2020-08-15 14:57:49 +02:00
Kim Kulling
1f348c5fc0 Remove redundant float f 2020-08-04 20:55:29 +02:00
Kim Kulling
aabf12827b fix typo 2020-08-04 17:52:43 +02:00
Kim Kulling
855b47452e Export opacity is 3DS
closes https://github.com/assimp/assimp/issues/3291
2020-08-04 17:41:28 +02:00
Kim Kulling
008e551f8e Merge branch 'master' into fbxVersionCheck 2020-07-31 14:33:21 +02:00
Malcolm Tyrrell
0282f358a4 Remove unneeded check. 2020-07-31 12:40:17 +01:00
Malcolm Tyrrell
301bae3967 Improve message 2020-07-30 16:37:41 +01:00
Malcolm Tyrrell
eaf0587dd8 FBX Version/Size Check 2020-07-30 14:56:01 +01:00
Ryan Styrczula
3170c3d15c FBXExport: Fix crash if scene->mMetaData is null 2020-07-30 09:21:43 -04: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
a33557be71 Merge branch 'master' into acloader_enums 2020-07-22 23:50:51 +02:00
Kim Kulling
76a6bb36f6 Merge branch 'master' into issue-3332_msvc2017 2020-07-20 22:04:35 +02:00
MeyerFabian
a19e4e4112 Make clang with msvc abi work. 2020-07-20 18:28:50 +02:00
MeyerFabian
13ee2306c3 build/clang-cl-windows 2020-07-20 17:04:11 +02:00
RichardTea
9cad10a995 Disable MSVC warnings on all MSVC
Fixes the build on MSVC 2017 (and probably MSVC 2015)
2020-07-17 14:58:51 +01:00
RichardTea
f2e3e43fbc Merge branch 'master' into acloader_enums 2020-07-17 11:30:50 +01:00
RichardTea
17b9403b7a ACLoader: Use enum for Surface flags 2020-07-17 11:23:50 +01:00
Kim Kulling
b2e53783de Merge branch 'master' into fix-mingw-priumax 2020-07-17 12:07:46 +02:00
Kim Kulling
fa486240d5 Merge branch 'master' into rbsheth_update_hunter 2020-07-17 11:39:55 +02:00
RichardTea
719cc82a1f Apply clangformat 2020-07-17 10:29:44 +01: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