Commit Graph

9922 Commits (0b14eb7523e05a675d383d95fbfbe2abae5b0201)

Author SHA1 Message Date
Kim Kulling b2e53783de
Merge branch 'master' into fix-mingw-priumax 2020-07-17 12:07:46 +02:00
Kim Kulling 37056f0242
Merge pull request #3327 from rbsheth/rbsheth_update_hunter
Hunter-related build fixes
2020-07-17 12:02:28 +02:00
Kim Kulling fa486240d5
Merge branch 'master' into rbsheth_update_hunter 2020-07-17 11:39:55 +02:00
Kim Kulling 1975579268
Merge pull request #3326 from rmstyrczula/master
DefaultIOStream: Remove assert on empty count
2020-07-17 11:33:02 +02:00
RichardTea 719cc82a1f Apply clangformat 2020-07-17 10:29:44 +01:00
RichardTea 8c60879485 Rollup to 'upstream/master' 2020-07-17 10:03:48 +01:00
Kim Kulling 516bdc2a4b
Merge branch 'master' into master 2020-07-16 22:48:02 +02:00
Kim Kulling c55ca47666
Merge pull request #3322 from AndrewJDR/master
Build viewer and publish artifacts on windows-msvc.
2020-07-16 22:47:17 +02:00
Kim Kulling 147c5f7cd2
Merge branch 'master' into master 2020-07-16 21:37:46 +02:00
Kim Kulling 0a165ee666
Merge pull request #3311 from ms-maxvollmer/gltf1_gltf2_split
Added macros to enable/disable GLTF1 and GLTF2 independently
2020-07-16 21:37:08 +02:00
Kim Kulling deddaf49df finish migrate ogrexmlserializer. 2020-07-16 11:33:28 +02:00
Kim Kulling df8792d24b
Merge branch 'master' into gltf1_gltf2_split 2020-07-16 10:45:55 +02:00
Kim Kulling 44fd987d57
Merge pull request #3330 from infosia/bad_nodeanim_ptr
fix invalid pointer for bone animation
2020-07-16 10:39:21 +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 e51e07982d Remove generic lambda usage. 2020-07-15 15:05:42 +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 d4f5f29b44 Add missing asset 2020-07-15 12:22:39 +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 7e7161852a Add a unit test. 2020-07-15 11:19:10 +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 77cf6e3433 Ensure that zip.h warning disable is pushed 2020-07-14 22:07:24 -05: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 0bad2c7b6a Move library configuration outside Hunter block 2020-07-14 19:00:42 -04: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 b19ebf5d54 Fix merge conflicts. 2020-07-14 09:02:14 +02:00
Kim Kulling 8cfd2a4cc1 Migrate OgreSerializer. 2020-07-14 09:00:06 +02:00
Kim Kulling 67a710efad
Merge pull request #3320 from IOBYTE/master
add triangle strip support to AC file loader
2020-07-13 22:10:12 +02:00
Kim Kulling f5d5d7c5ed
Merge branch 'master' into master 2020-07-13 20:35:24 +02:00
Kim Kulling bdcad5cd0a
Merge pull request #3292 from rmstyrczula/master
FBXExporter: Use scene metadata for global settings
2020-07-13 20:32:44 +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 c8d759de64
Merge branch 'master' into master 2020-07-12 19:11:02 +02:00
Kim Kulling aff5bba9da
Merge pull request #3289 from ifiddynine/patch-1
Fix Blender .fbx metalness detection
2020-07-12 19:05:55 +02:00
Kim Kulling 78d0b81b6c
Merge branch 'master' into patch-1 2020-07-12 18:54:34 +02:00
Kim Kulling 411bf89b64
Merge pull request #3323 from assimp/LoicFr-master
Loic fr master
2020-07-12 18:52:38 +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
Andrew Johnson a9a0c30932 Build viewer and publish artifacts on windows-msvc.
This commit introduces Github Actions support for building the tools and viewer and making
these available for download as a zip file in the artifacts area of the Github Actions page.
This allows for continuous validation that the viewer and tools build successfully, and
the download is useful for quick testing of the very latest assimp functionality without needing
to download and build it from source.

This only applies to windows-msvc, since the assimp viewer is only supported on that platform.
It downloads the June 2010 DirectX SDK from the Microsoft servers and installs it. It also
uses a cache to prevent having to perform this DX SDK download and installation repeatedly for every
commit.

Note, it's necessary install the older June 2010 DXSDK because assimp uses the now deprecated D3DX libraries,
and these libraries are not included in the stock Windows Server image provided by Github Actions.
2020-07-11 22:05:06 -07:00