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

11089 Commits (3dd2dbd916d228a1d35d05569ecfc821450640bf)

Author SHA1 Message Date
Kim Kulling cab7b330ee
Merge branch 'master' into so-unloading 2021-12-20 17:58:18 +01:00
Kim Kulling 80b0b897ed
Merge pull request #4266 from assimp/kimkulling-patch-1 
Update version to 5.1.4
 2021-12-18 21:42:19 +01:00
Kim Kulling 572e31ddcb
Update version to 5.1.4 2021-12-18 21:30:04 +01:00
Kim Kulling 9dfd401624
Merge pull request #4263 from RivIs-sssa01/fix_X3DImporter.cpp_closingBraces 
Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define.
 2021-12-18 21:28:32 +01:00
Kim Kulling 5a46597e47
Merge branch 'master' into fix_X3DImporter.cpp_closingBraces 2021-12-18 21:17:23 +01:00
Kim Kulling 01f68dd916
Merge pull request #4264 from Garux/IMAGE1.bmp_jpg 
fix test/models/3DS/IMAGE1.bmp: is jpg
 2021-12-18 21:16:59 +01:00
Garux 46f618a6ef add Inter-Quake Model (IQM) Importer 2021-12-18 15:34:58 +03:00
Garux 7fc4603579 fix test/models/3DS/IMAGE1.bmp: is jpg 2021-12-18 14:32:46 +03: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 6693e7e08c
Merge pull request #4256 from rumgot/cmake_no_known_features_error_fix 
Fixed cmake error: No known features for C compiler when using the assimp library from another project
 2021-12-16 21:35:52 +01:00
Kim Kulling 3e97329fa1
Merge branch 'master' into cmake_no_known_features_error_fix 2021-12-16 20:27:58 +01:00
Kim Kulling c72e3905c2
Merge pull request #4261 from assimp/kimkulling-enable_language_support_issue4257-2 
Enable C++11 and C99
 2021-12-16 20:27:17 +01:00
Kim Kulling 2ffa0c59eb
Switch to C++11 until gtest gets an update. 2021-12-16 19:54:40 +01:00
Kim Kulling af42d53c92
Enable C++17 and C99 
- closes https://github.com/assimp/assimp/issues/4257
 2021-12-16 19:41:15 +01:00
Kim Kulling c4d858cf4d
Merge pull request #4260 from assimp/kimkulling-patch-1 
Fix a typo in the Visual-Studio Dll-Versions
 2021-12-16 15:39:01 +01:00
Kim Kulling 7a29147095
Fix a typo 2021-12-16 14:55:23 +01:00
Kim Kulling efdaf603b0
Merge branch 'master' into so-unloading 2021-12-16 14:52:58 +01:00
Kim Kulling 46b28a442b
Merge pull request #4226 from umlaeute/bugfix/import-crashes 
Bugfix/import crashes
 2021-12-16 14:51:34 +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 8322e393c5
Merge pull request #4244 from kovacsv/copyscene_fix 
Bug: Export crashes when any of the meshes contains texture coordinate names #4243
 2021-12-14 00:14:42 +01:00
Kim Kulling 003942aafe
Merge branch 'master' into copyscene_fix 2021-12-13 21:19:08 +01:00
Kim Kulling 0491eb3591
Merge pull request #4253 from assimp/kimkulling_fix_double_prec_build_issue4248 
Use correct XmlParser-methods and add some missing casts
 2021-12-13 21:17:15 +01:00
Viktor Kovacs d619f7015a
Merge branch 'master' into copyscene_fix 2021-12-13 20:08:45 +01:00
Kim Kulling 65bc801734 Some fixes for possible divisions by zero 2021-12-13 18:48:58 +01:00
Kim Kulling e4f38810ca Add missing static casts 2021-12-13 18:12:19 +01:00
Kim Kulling cb657e4c13 Use correct XmlParser-methods and add some missing casts 2021-12-13 18:06:23 +01:00
Kim Kulling 052594568a
Merge pull request #4247 from inhosens/master 
Revert "FBXConverter : Fix timescales of FBX animations"
 2021-12-12 21:42:14 +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 819d9f7257
Merge pull request #4250 from assimp/kimkulling-fix_division_by_zero_issue4235-1 
Update HMPLoader.cpp
 2021-12-10 15:03:01 +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 6bb856335f
Merge pull request #4249 from assimp/kimkulling-fix_nullptr_dereferencing_issue4237 
Fix nullptr dereferencing from std::shared_ptr
 2021-12-10 11:02:32 +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 ea2e442046
Merge pull request #4245 from assimp/kimkulling-fix-division-by-zero-issue4240 
Fix division by zero in PointInTriangle2D
 2021-12-07 21:37:50 +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
IOhannes m zmölnig 6e090c88b8 fix index variable for surfaces 
Closes: https://github.com/assimp/assimp/issues/4209
 2021-12-07 12:13:31 +01:00
RichardTea 75e7d0f6ef
Merge branch 'master' into deprecated_gltfpbr_macros 2021-12-07 09:01:50 +00:00
Kim Kulling 70f5cca9c3
Merge pull request #4219 from assimp/kimkulling-v5.1.3 
Update CMakeLists.txt
 2021-12-04 21:01:52 +01:00
Kim Kulling 5b4829155c
Merge branch 'master' into so-unloading 2021-12-04 20:28:12 +01:00
Kim Kulling 983b20cda6
Update CMakeLists.txt 
- tag v5.1.3
 2021-12-04 20:26:29 +01:00
Kim Kulling 16149348ed
Merge pull request #4217 from umlaeute/bugfix/x3d-extension-check 
Fix file-extension check for X3D-files
 2021-12-01 16:07:12 +01:00
IOhannes m zmölnig 0e2ac2a91c X3D: simplistic attempt to avoid crashes due to nullptr access 
Related: https://github.com/assimp/assimp/issues/4201

while the crashes go away, i'm not sure whether this is the correct fix.
also, afaict the X3D importer produces wrong results anyhow
 2021-12-01 12:21:29 +01:00