Commit Graph

9112 Commits (iamAdrianIusca-master)

Author SHA1 Message Date
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 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 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
Kim Kulling 231447c8d6
Merge pull request #3227 from thomasbiang/gltf2_sparseAccessor_export
Gltf2 Sparse Accessor Export (blendshape export using sparse accessor)
2020-07-11 23:06:47 +02:00
Kim Kulling b1dd77fbbc
Merge branch 'master' into gltf2_sparseAccessor_export 2020-07-11 22:57:31 +02:00
Kim Kulling ec156e4da3
Merge pull request #3280 from thomasbiang/extras_property_callback
Customize Extras in Gltf2 Exporter with ExporterProperty Callback
2020-07-11 22:56:38 +02:00
Kim Kulling 306e03d497
Merge branch 'master' into extras_property_callback 2020-07-11 22:46:19 +02:00
Kim Kulling 108b3a62e5
Update Exporter.hpp
revert merge issue
2020-07-11 22:45:45 +02:00
Kim Kulling 1324b4b27d
Merge pull request #3321 from assimp/kimkulling-patch-7
use c-style cast in a c-file
2020-07-11 22:43:44 +02:00
Kim Kulling b8ec93aa21
use c-styl cast in a c-file 2020-07-11 22:34:43 +02:00
Kim Kulling 2cd1192bf1
Merge pull request #3300 from mahiuchun/strrchr
Use strrchr() when finding the '.' that begins the file extension.
2020-07-11 21:19:55 +02:00
Kim Kulling 9682ab0685
Merge branch 'master' into strrchr 2020-07-11 21:10:58 +02:00
Kim Kulling 1379175f18
Merge pull request #3314 from assimp/issue_3252
closes https://github.com/assimp/assimp/issues/3252: fix build.
2020-07-09 09:50:32 +02:00
Robert Reif 628394baec check for invalid vertex 2020-07-07 23:29:54 -04:00
RichardTea d79a617e18 Rollup to 'upstream/master' 2020-07-07 20:03:10 +01:00
kimkulling 9aa468262f closes https://github.com/assimp/assimp/issues/3252: fix build. 2020-07-07 17:35:03 +02:00
kimkulling 81c15b38ae fix merge 2020-07-07 17:16:53 +02:00
Robert Reif 37c74f6fa3 add test to unit for acc file format loader 2020-07-06 20:16:22 -04:00
Robert Reif f753a6e7ad add acc file test using existing ac file converted to acc format 2020-07-06 20:14:03 -04:00
Robert Reif 6c29247180 add triangle strip support to AC file loader 2020-07-06 17:41:14 -04:00