v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,067 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

4897 Commits (6828cf2f031744e02db2426b692e7dde8193dfd2)

Author SHA1 Message Date
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 51e592123a Fix two deletions. 2020-07-20 18:42:57 +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 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
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 638369e995 Try to fix lexing issue with preproc w/r/t __has_warning 2020-07-14 21:58:36 -05:00
awr1 cc8cd88d7a Preproc conditional should be &&, not || 2020-07-14 21:50:22 -05:00
awr1 bad0df9a1a Remove unnecessary inversion in preproc 2020-07-14 21:48:46 -05:00
awr1 b3f61f8759 Fix error where -Wunused-but-set-variable might not be available 2020-07-14 21:44:33 -05: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
Rahul Sheth abc6b9ce4c ifdef fixes to fix MSVC warnings 2020-07-14 19:00:38 -04: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 f5d5d7c5ed
Merge branch 'master' into master 2020-07-13 20:35:24 +02:00
Ryan Styrczula 0c2f7a119c FBXExporter: Forgot WritePropColor defaultValue 2020-07-13 13:56:06 -04:00
Ryan Styrczula 6619ec8253 FBXExporter: Use scene metadata for global settings 
Models with non-standard axes and scale are not imported and exported
correctly if the input metadata is ignored.
 2020-07-13 13:56:06 -04:00
Kim Kulling 78d0b81b6c
Merge branch 'master' into patch-1 2020-07-12 18:54:34 +02: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
Kim Kulling 306e03d497
Merge branch 'master' into extras_property_callback 2020-07-11 22:46:19 +02:00
Robert Reif 628394baec check for invalid vertex 2020-07-07 23:29:54 -04:00
kimkulling 9aa468262f closes https://github.com/assimp/assimp/issues/3252: fix build. 2020-07-07 17:35:03 +02:00
Robert Reif 6c29247180 add triangle strip support to AC file loader 2020-07-06 17:41:14 -04:00
Max Vollmer (Microsoft Havok) fb11705dd0
Merge branch 'master' into gltf1_gltf2_split 2020-07-06 09:11:06 +01: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
Kim Kulling d04f8b3174
Merge branch 'master' into defsIncludeFix 2020-07-05 18:59:37 +02: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
Malcolm Tyrrell 51150cb3df Ensure asserts are defined where expected. 2020-07-02 14:53:29 +01:00
Kim Kulling 693da43095 closes https://github.com/assimp/assimp/issues/3305: remove merge issue. 2020-07-02 15:22:06 +02:00