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

11158 Commits (7fcd961a20d7bf61d7d5d96ab9d3c1d716276a86)

Author SHA1 Message Date
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
IOhannes m zmölnig c8cdf3009e X3D: replace 'here' debugging printout by an assertion. 
if mNodeElementCur is NULL, we get a crash anyhow...
 2021-12-01 12:19:19 +01:00
IOhannes m zmölnig 23d7811276 X3D: consistent initialization with nullptr 2021-12-01 11:35:06 +01:00
IOhannes m zmölnig 836963428e Fix file-extension check for X3D-files 
using the pre-existing and well-tested GetExtension() (which happens
to also normalize the extension), rather than attempting our own
buggy one...

Closes: https://github.com/assimp/assimp/issues/4177
 2021-12-01 11:17:42 +01:00
Kim Kulling 8c9a148776
Merge pull request #4216 from inhosens/master 
Interpolate euler rotations for quaternion animations
 2021-12-01 00:24:15 +01:00
Kim Kulling 834ec20008
Merge branch 'master' into master 2021-11-30 23:44:42 +01:00
Kim Kulling cc05b4c8f1
Merge pull request #4211 from ms-maxvollmer/ms-maxvollmer/crashfixes2 
Added checks for out of bounds data access/writing
 2021-11-30 23:44:00 +01:00
Kim Kulling d6f3f292f2
Merge branch 'master' into ms-maxvollmer/crashfixes2 2021-11-30 23:17:59 +01:00
Inho Lee 4a37aa2ef8 Interpolate euler rotations for quaternion animations 
FBX uses euler rotation but assimp library's base type is
quaternion. When assimp convert FBX some animation information
can be lost.
This patch interpolates euler-angle rotations and insert
additional keyframes for the FBX format.
 2021-11-30 12:49:59 +01:00
Kim Kulling 745f5e7e65
Merge pull request #4193 from PencilAmazing/BlenderCollections 
Update blender importer to work with Blender 2.8+ files
 2021-11-28 23:51:06 +01:00
Pencil Amazing 095bd67e10 Fix memory leaks in CollectionObject by making ob a weak pointer and removing prev pointer. 
Something was cyclic in CollectionObject and we don't traverse backwards anyways
 2021-11-26 22:09:06 -04:00
Pencil Amazing e831ecf3c2 Add a separate test case for Blender 276 and update Box.blend to be 293 2021-11-26 22:09:06 -04:00
Pencil Amazing 44fa1ec6a7 Make Blender importer aware of collections, and use them when available. Also add the default startup file for Blender 2.93 2021-11-26 22:09:06 -04:00
Kim Kulling 70c1aec7c7
Merge pull request #4212 from assimp/kimkulling-remove_deprecated_data 
Delete test/models/3DS/UVTransformTest directory
 2021-11-26 19:34:02 +01:00
Kim Kulling 34daf87428
Delete test/models/3DS/UVTransformTest directory 
- Remove deprecated data
 2021-11-26 19:17:42 +01:00
Max Vollmer (Microsoft Havok) 5e1188c44e Check that positions exist before accessing them 2021-11-26 13:01:38 +00:00
Max Vollmer (Microsoft Havok) 0015823bef Reject files with an invalid byteLength value 2021-11-26 13:01:15 +00:00
Max Vollmer (Microsoft Havok) 38382715f7 Ensure we don't access the vector with an out of bounds index 2021-11-26 13:01:00 +00:00
Kim Kulling da8772c57b
Merge pull request #4207 from jakrams/msft-jakras-fix-corrupted-accessor 
Prevent out-of-range memory writes by sparse accessors
 2021-11-26 09:02:17 +01:00
Jan Krassnigg 1a5d66714f Prevent out-of-range memory writes by sparse accessors 
This turned up during fuzz testing. Corrupted data would make assimp write to random memory locations, leading to subsequent crashes.
 2021-11-25 11:20:26 +01:00
Kim Kulling 690e558b88
Update IOSystem.cpp 2021-11-25 09:32:52 +01:00
Thomas Nicky Thulesen 8b78a63b50 Allow dlclose of so library by avoiding unique symbols. 2021-11-23 20:39:48 +01:00
RichardTea d18709b899 Small float values should be true 2021-11-23 14:15:32 +00:00
RichardTea 5143044cc8 redefine AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS 
This key is deprecated but is used by Qt5 & Qt 6.2.1 QtQuick3D
 2021-11-23 13:55:27 +00:00
RichardTea 2fdf52488f float and integer material property bool conversion 
All reading float and integer material property values as bool
Zero => False
Non-Zero => True
 2021-11-23 13:53:58 +00:00
RichardTea 42766af702 Merge branch 'master' into deprecated_gltfpbr_macros 2021-11-23 12:03:23 +00:00
Kim Kulling 889e559696
Merge pull request #4195 from ruyo/fix-gltf2-sparse-indicesType 
Fixed an incorrect indeiciesType in the glTF2 sparse accessor.
 2021-11-22 22:43:43 +01:00
Kim Kulling b22098c234
Merge branch 'master' into fix-gltf2-sparse-indicesType 2021-11-22 22:02:05 +01:00
Kim Kulling 85ea57dcdb
Merge pull request #4196 from Rodousse/fix_mingw_compile_flags 
Use adviced c++ flag to supress warning on mingw
 2021-11-22 22:01:05 +01:00
Robin Dousse 6819b84b8b Use adviced c++ flag to supress warning on mingw 2021-11-22 09:27:14 +01:00
ruyo 60bfde78eb Fixed an incorrect indeiciesType in the glTF2 sparse accessor. 2021-11-21 23:23:22 +09:00
Kim Kulling bf1f142a72 Fix warnings 2021-11-20 18:40:38 +01:00