Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,820 Commits 19 Branches 43 Tags
7eec3f0d8fcd2f9331aea23daefb3dae4597b983
Commit Graph

5834 Commits

Author SHA1 Message Date
Viktor Kovacs
c8ab39dd04 Merge branch 'master' into common_base64 2022-01-15 23:42:56 +01:00
Kim Kulling
d3e24196c0 Merge branch 'master' into so-unloading 2022-01-13 20:19:23 +01:00
Viktor Kovacs
c71f4bc95a Merge branch 'master' into common_base64 2022-01-11 18:46:08 +01:00
Kim Kulling
d68224f2ed Merge branch 'master' into patch-1 2022-01-10 23:45:03 +01:00
Kim Kulling
f63b10bf45 OpenGEX: Fix usage of texture specular token 2022-01-10 21:22:44 +01:00
Viktor Kovacs
6b9732721a Merge branch 'assimp:master' into common_base64 2022-01-10 21:15:31 +01:00
Kim Kulling
50c7301a38 Update copyrights 2022-01-10 21:13:43 +01:00
Ben Wolsieffer
629c8850ec Fix imported target include directory 
Fix the imported target include directory when the headers are not installed in '${CMAKE_INSTALL_PREFIX}/include'.
 2022-01-09 20:59:14 -05:00
Kim Kulling
8cb5ab69b0 Merge branch 'master' into fix-bone-fit-check 2022-01-08 11:35:59 +01:00
Kim Kulling
776130534b Fix nullptr-dereferencing 
- Fix a possible nullptr-exception.
 2022-01-06 22:35:32 +01:00
Alex Rebert
b14b34d2b8 LWSLoader: Fix out of bounds iterator access 
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38947
Fix #4222
 2022-01-05 15:43:16 -05:00
Alex Rebert
310c81aaa2 Add support for spanned archives 
Without it, assimp would crash on some inputs by jumping to a NULL
opendisk function. This commit adds an opendisk implementation, which
required adding a filename member to ZipFile.

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38873
Fix #4229
 2022-01-05 15:43:10 -05:00
Alex Rebert
34d8fba100 Fix stack overflow in ZipArchiveIOSystem::MapArchive 
The function allocates a filename buffer of 256, and copies the filename
extracted from the zip file into it. However, a filename might be larger
than 256 characters, in which case the function would write out of bounds.

This commit skips any file whose name is larger than 256 to avoid the
overflow.

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38870
Fix #4228
 2022-01-05 10:01:46 -05:00
Colin Reeder
87e9dbac40 Fix bone fitted check in gltf2 exporter 2022-01-03 16:32:34 -07:00
kovacsv
125acf9ec8 Merge remote-tracking branch 'origin/master' into common_base64 2022-01-02 19:47:57 +01:00
kovacsv
bbe12240ca Move Base64 encode/decode functionality to the common folder. 2022-01-02 19:47:43 +01:00
Kim Kulling
ab19cff328 Merge branch 'master' into pbr-obj 2021-12-31 08:33:30 +01:00
Kim Kulling
a86ab45161 Merge branch 'master' into ps-devel-fix-namespace-001 2021-12-31 08:20:24 +01:00
Peter Seiderer
a099fe7cd3 BlenderScene: use explicit namespace instead of using namespace 
Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320):

  .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
           const FileDatabase &db) const {
                                   ^
 In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
                   from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
  .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error:   from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
       void Convert(T &dest, const FileDatabase &db) const;
            ^
  .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
           const FileDatabase &db) const {
                                   ^
  In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
                   from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
  .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error:   from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
       void Convert(T &dest, const FileDatabase &db) const;
            ^

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
 2021-12-30 18:01:54 +01:00
Kim Kulling
0a5bd792de Merge branch 'master' into fix-fbx-metalness-import 2021-12-29 19:08:16 +01:00
Jérôme Leclercq
81fc50f612 CMake: Replace CMAKE_COMPILER_IS_MINGW by MINGW 
See https://discourse.cmake.org/t/cmake-compiler-is-mingw-removed/4539 and https://cmake.org/cmake/help/latest/variable/MINGW.html
 2021-12-28 15:58:37 +01:00
Vyacheslav Vanin
2da06dd41a Merge branch 'master' into fix-fbx-metalness-import 2021-12-26 17:31:33 +03:00
Kim Kulling
d44641398f Add console progresshandler 2021-12-26 11:16:02 +01:00
Kim Kulling
db2500c393 MDL: Do not try to copy empty embedded texture 
- When an embedded texture is empty, skip it instead of trying to copy it. This must fail.
- closes https://github.com/assimp/assimp/issues/4238
- Found from the Google fuzzer.
 2021-12-23 12:28:43 +01:00
Kim Kulling
635153b3a4 LWS-Import: Avoid access to empty string token 
- Fix invalid access to string pointer when string token is empty
- closes https://github.com/assimp/assimp/issues/4222
 2021-12-22 21:08:28 +01:00
Kim Kulling
2c66d4d3a2 Optimize the check 2021-12-22 20:43:44 +01:00
Kim Kulling
215f4e1f4d Fix typo 2021-12-22 20:02:29 +01:00
Kim Kulling
2eb86d75b8 Make sure no overflow can happen 
- During UTF32 LE with BOM make sure that the byteswap operation will have enough space when iterating through the text buffer, which shall get encoded.
- closes https://github.com/assimp/assimp/issues/4230
 2021-12-22 19:45:19 +01:00
Rene Sepulveda
19371af6e6 Support PBR properties/maps in Obj importer 2021-12-20 13:43:46 -05:00
Kim Kulling
cab7b330ee Merge branch 'master' into so-unloading 2021-12-20 17:58:18 +01:00
sssaoi
d7bf8d6e07 Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define. 2021-12-18 14:50:22 +09:00
Vyacheslav Vanin
53968550e4 Merge branch 'master' into fix-fbx-metalness-import 2021-12-17 12:08:55 +03:00
Kim Kulling
3e97329fa1 Merge branch 'master' into cmake_no_known_features_error_fix 2021-12-16 20:27:58 +01:00
Kim Kulling
efdaf603b0 Merge branch 'master' into so-unloading 2021-12-16 14:52:58 +01:00
Vyacheslav.Vanin
1afe7e6255 fix fbx import metalness 
Can't import metalness textures in fbx importer
 2021-12-16 12:09:06 +03:00
Kim Kulling
26dc168449 Merge branch 'master' into bugfix/import-crashes 2021-12-15 07:54:48 +01:00
rumgot
92aef9236f Fixed cmake error: No known features for C compiler when using the assimp library from another project. 2021-12-14 23:54:36 +03:00
Kim Kulling
003942aafe Merge branch 'master' into copyscene_fix 2021-12-13 21:19:08 +01:00
Viktor Kovacs
d619f7015a Merge branch 'master' into copyscene_fix 2021-12-13 20:08:45 +01:00
Kim Kulling
cb657e4c13 Use correct XmlParser-methods and add some missing casts 2021-12-13 18:06:23 +01:00
Kim Kulling
54e60b031e Merge branch 'master' into master 2021-12-12 21:12:37 +01:00
Viktor Kovacs
4959924dab Merge branch 'master' into copyscene_fix 2021-12-10 20:10:25 +01:00
Kim Kulling
33c6762272 Update HMPLoader.cpp 
- Fix possible division by zero
- closes https://github.com/assimp/assimp/issues/4235
 2021-12-10 14:32:45 +01:00
Kim Kulling
68682d75b5 Fix nullptr dereferencing from std::shared_ptr 
- Finding from fuzzer
- closes https://github.com/assimp/assimp/issues/4237
 2021-12-10 08:39:21 +01:00
Inho Lee
c2297e9199 Revert "FBXConverter : Fix timescales of FBX animations" 
The previous patch was made by misunderstanding about mTime.
It is not real time value, but time ticks.

This reverts commit b8bf1eac04.
 2021-12-09 10:57:39 +01:00
Viktor Kovacs
d2c8cb755e Merge branch 'master' into copyscene_fix 2021-12-08 14:29:31 +01:00
Kim Kulling
e51feac2c5 Update PolyTools.h 2021-12-07 21:19:01 +01:00
Kim Kulling
1e4861f86e Fix division by zero in PointInTriangle2D 
- closes https://github.com/assimp/assimp/issues/4240
 2021-12-07 20:45:21 +01:00
kovacsv
2be6bac4b0 Bug: Export crashes when any of the meshes contains texture coordinate names #4243 2021-12-07 20:42:43 +01:00
IOhannes m zmölnig
9a7ee0ac14 Throw a DeadlyImportError rather than an assertion if all materials are redundant and thus removed 
Closes: https://github.com/assimp/assimp/issues/4224
Closes: https://github.com/assimp/assimp/issues/4225
 2021-12-07 12:35:15 +01:00