Commit Graph

451 Commits

Author SHA1 Message Date
Kim Kulling
6ee5e248ee Fix typo 2020-10-22 22:26:29 +02:00
john
d48ac9d0a4 fix xcode compile bug 2020-10-18 10:54:04 +08:00
Kim Kulling
857f62cde0 closes pParam.mReference = source; 2020-10-14 20:34:46 +02:00
Kim Kulling
d6892b3f58 Merge branch 'master' into pugi_xml 2020-09-25 21:00:09 +02:00
Kim Kulling
0e9621012c Adapt code style - finally :-). 2020-09-14 08:43:31 +02:00
Kim Kulling
1ff9e2b522 Adapt code style. 2020-09-14 08:40:21 +02:00
Kim Kulling
23defc275a Merge branch 'master' into makeInternalErrorsAccessible 2020-09-14 08:36:13 +02:00
Denis Blank
f3b25b999b Fix an unreferenced formal parameter warning on MSVC when no exporter is built 2020-09-05 23:20:31 +02:00
kimkulling
0730eebe6f fix collada handling of xml nodes. 2020-08-28 16:17:56 +02:00
Malcolm Tyrrell
8f893e3653 Actually, just keep the old behaviour for now. 2020-08-20 14:32:15 +01:00
Malcolm Tyrrell
9b5e758bdd Even simpler DeadlyErrorBase 2020-08-19 17:59:13 +01:00
Malcolm Tyrrell
6f9c61e157 Use case which matches surrounding code. 2020-08-19 17:57:25 +01:00
Malcolm Tyrrell
e1a0163e7e Make all exceptions available. 2020-08-18 18:14:51 +01:00
Malcolm Tyrrell
0ffcdf160e Build formatting into DeadlyImportError 2020-08-18 16:32:34 +01:00
Malcolm Tyrrell
829ff1adf0 Maybe this will help. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell
b1ed751b83 Provide an API for accessing internal errors. 2020-08-18 10:33:42 +01:00
Kim Kulling
729882debb Fix incorrect index
closes https://github.com/assimp/assimp/issues/3364
2020-08-11 19:57:36 +02:00
kimkulling
13d7fad7f7 closes https://github.com/assimp/assimp/issues/2992: add single or double precision + missing compilers. 2020-08-07 14:23:07 +02:00
Kim Kulling
e7ae576614 undo change 2020-08-03 15:54:19 +02:00
Kim Kulling
435bba30dd Move functions into the correct preprocessor branch 2020-08-03 09:30:02 +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
Kim Kulling
fa486240d5 Merge branch 'master' into rbsheth_update_hunter 2020-07-17 11:39:55 +02:00
Kim Kulling
516bdc2a4b Merge branch 'master' into master 2020-07-16 22:48:02 +02:00
Kim Kulling
df8792d24b Merge branch 'master' into gltf1_gltf2_split 2020-07-16 10:45:55 +02:00
Kota Iguchi
84e68eaf24 fix invalid pointer for bone animation 2020-07-16 15:26:02 +09:00
Rahul Sheth
209a61d0e7 Update hunter and utf8cpp inclusion 2020-07-14 19:00:23 -04:00
Ryan Styrczula
84e342acd7 DefaultIOStream: Remove assert on empty count
fwrite() is valid to call with a 0 count, and will simply return 0.
See:
    https://en.cppreference.com/w/cpp/io/c/fwrite
    http://www.cplusplus.com/reference/cstdio/fwrite/

There are code paths where StreamWriter will call Tell(), which calls
Flush(), which calls Write(buffer.data(), 1, buffer.size()). This can
happen when nothing has yet been written to the buffer, so size is 0.
2020-07-14 10:39:18 -04:00
Kim Kulling
306e03d497 Merge branch 'master' into extras_property_callback 2020-07-11 22:46:19 +02:00
kimkulling
9aa468262f closes https://github.com/assimp/assimp/issues/3252: fix build. 2020-07-07 17:35:03 +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
Hill Ma
3fb7747429 Improve ToBinary() for double precision.
The constant 0x80000000 is specific to 32 bit types. Make the bit mask
according to the size of types.
2020-07-03 18:14:45 -07:00
Yingying Wang
97085c1c05 update sync 2020-06-30 11:48:37 -07:00
Yingying Wang
36f899bf09 sync update 2020-06-30 11:45:11 -07:00
Hill Ma
30f09e9fc0 Fix build when ASSIMP_DOUBLE_PRECISION is on.
Tested:
$ cmake -DASSIMP_DOUBLE_PRECISION=1 -DASSIMP_BUILD_MDL_IMPORTER=0 ..; make

The MDL importer is disabled due to the fact that there is some float-only code
in MDL. This also means bin/assimp and bin/unit would not link successfully with
the above build flags.
2020-06-28 17:36:21 -07:00
Kim Kulling
95e822a6ec Merge branch 'master' into aiAssertHandler 2020-06-24 20:47:10 +02:00
Kim Kulling
6205af4efb replace NULL and avoid ai_assert with more than 2 tests. 2020-06-23 21:05:42 +02:00
Malcolm Tyrrell
9188f56839 Allow assert handling to be replaced. 2020-06-23 11:55:51 +01:00
kimkulling
524e2e4728 fix warning, hopefully ... 2020-06-15 21:34:49 +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
Yingying Wang
578a7ac502 add Callback API in ExporterProperties 2020-06-09 11:20:48 -07:00
Kim Kulling
88c1509d69 Remove dead code 2020-06-09 10:15:35 +02: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
Malcolm Tyrrell
e11d78596f Use verbose debug logging in certain places 2020-05-15 17:26:17 +01:00
Malcolm Tyrrell
5e0136d737 Add concept of verboseDebug 2020-05-15 17:23:07 +01: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
Kim Kulling
c6131ce38a scenecombiner: fix leak. 2020-04-29 20:43:23 +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