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

10089 Commits (58bc4bcb63924ae10bd9c5a8a8f6639c681f5eea)

Author SHA1 Message Date
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
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 21678df589 ogre + collada migration. 2020-07-10 22:25:38 +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
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
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 a211aff522
Merge pull request #3307 from MalcolmTyrrell/defsIncludeFix 
Ensure asserts are defined where expected.
 2020-07-05 20:20:23 +02:00
Kim Kulling d04f8b3174
Merge branch 'master' into defsIncludeFix 2020-07-05 18:59:37 +02:00
Kim Kulling 95a23af16f
Merge pull request #3309 from mahiuchun/const 
Improve ToBinary() for double precision.
 2020-07-04 21:22:42 +02:00
Kim Kulling 77b705048b fix merge issues. 2020-07-04 13:42:23 +02:00
Kim Kulling 839986ca14 next step of AMF-Migration. 2020-07-04 09:04:06 +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
Kim Kulling d74c10dcb7 Merge branch 'master' into pugi_xml 2020-07-03 17:29:38 +02:00
Kim Kulling 10c709831f
Merge pull request #3306 from assimp/issue_3305 
closes https://github.com/assimp/assimp/issues/3305: remove merge issue.
 2020-07-02 17:46:53 +02: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
Kim Kulling b1369d0912 next steps. 2020-07-02 15:18:59 +02:00
RichardTea 9e27fb3b89 Rollup to upstream/master 2020-07-01 16:28:32 +01:00
Kim Kulling 7b7764afb9
Merge pull request #3301 from mahiuchun/double 
Fix build when ASSIMP_DOUBLE_PRECISION is on.
 2020-06-30 21:24:35 +02:00
Kim Kulling 7fda533484
Merge branch 'master' into double 2020-06-30 21:12:02 +02:00