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

5744 Commits (37c81e7a285989c5580c06619f50597d612834a6)

Author SHA1 Message Date
Kim Kulling 37c81e7a28
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport 2021-11-12 10:37:19 +01:00
Kim Kulling c22524351a
Merge branch 'master' into master 2021-11-12 09:56:56 +01:00
Kim Kulling 97b8e41997
Fix formatting 2021-11-12 09:56:45 +01:00
Kim Kulling 13731b37c4
Merge branch 'master' into 3ds_export_4157 2021-11-12 07:06:52 +01:00
Kim Kulling 43b0ef181a
Merge branch 'master' into fix_gltf_warning_4126 2021-11-11 20:30:07 +01:00
Kim Kulling 7120504c46
Merge branch 'master' into fix_aiMesh_abi_4162 2021-11-11 20:02:46 +01:00
Kim Kulling eafb79e7dc Merge branch 'Artenuvielle-x3d_pugi_migration_artenuvielle' of https://github.com/assimp/assimp into Artenuvielle-x3d_pugi_migration_artenuvielle 2021-11-11 19:06:33 +01:00
Kim Kulling 952f0a53c9 Try to fix a leak 2021-11-11 19:06:25 +01:00
Kim Kulling 9f28ef4c25
Merge branch 'master' into Artenuvielle-x3d_pugi_migration_artenuvielle 2021-11-10 20:43:39 +01:00
Kim Kulling a31c979abc Use helloworld as X3D-Testcase 2021-11-10 20:40:05 +01:00
Kim Kulling 8ed18621db Fixes 2021-11-10 20:37:27 +01:00
Kim Kulling 39664d608d
Merge branch 'master' into master 2021-11-10 10:51:18 +01:00
Aaron Gokaslan b8a10e62f9 Remove optimization fence 2021-11-09 13:08:13 -05:00
RichardTea 86a25b62e4 Better aiMesh ABI compatibility with 5.0.1, make smaller 
Move new mTextureCoordsNames member to end of struct
Convert to pointer-to-array, saving ~8KB per aiMesh in almost all cases
Add C++ accessor functions for simpler usage
 2021-11-09 13:03:06 +00:00
Kim Kulling 30143e9626
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport 2021-11-09 10:53:58 +01:00
RichardTea aaae3e3a10 size_t is 32bit on some platforms 
Also assert if size_t is smaller than uint32_t (probably not necessary)
Note: 32bit builds will crash OOM if a really large model is loaded, as cannot allocate that much in total, let alone contiguously.
 2021-11-08 15:05:20 +00:00
RichardTea 9433fc526a Apply clangformat 2021-11-08 14:42:21 +00:00
RichardTea 69cafe64b4 Cap glTFv1 & 2 json size to ~4GB 
Ensures size_t cannot overflow
Limits the maximum contiguous memory allocation to something plausible.
 2021-11-08 14:41:13 +00:00
RichardTea ee19ce6021 3DS Export: Add support for aiShadingMode_PBR_BRDF 
Export as Phong.
If no Diffuse texture, export the PBR base color instead,
 2021-11-08 11:06:15 +00:00
Kim Kulling 5a3401b69f
Update D3MFOpcPackage.cpp 
- Log an error in case of a nullptr-exception in reading out the 3MF-Archive
- closes https://github.com/assimp/assimp/issues/4153
 2021-11-02 10:38:38 +01:00
Alex Rebert 145f972d76
Fix out-of-bounds read in RemoveLineComments 
Follow up to 6f07e89fdf, which was not sufficient to fix the bug.

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24553
 2021-10-30 13:43:41 -04:00
Alex Rebert e900617796
Fix out-of-bounds read in FileSystemFilter::Cleanup 
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=33238
 2021-10-29 09:17:40 -04:00
Alex Rebert 6f07e89fdf
Fix out-of-bounds read in RemoveLineComments 
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24553
 2021-10-28 23:50:16 -04:00
Alex Rebert 107371657b
Fix out-of-bounds read in ReadFirstSkin 
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25401
 2021-10-28 23:12:54 -04:00
Alex Rebert 1fe9d405f5
Fix out-of-bounds read in MDLImporter 
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24502
 2021-10-28 22:38:40 -04:00
Alex Rebert 932dfe0562
Fix overflowing allocations in MDLMaterialLoader 
Some allocations might underallocate due to integer overflows. This
commit ensures that we are throwing an exception if the allocation size
does not fit in an unsigned int.

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25341
 2021-10-28 22:27:19 -04:00
Alex Rebert 30f17aa206
Fix heap out-of-bounds write in _m3d_safestr 
While there is a 256 character limit when computing the length of the
newly allocated strength, that limit was missing when copying the
string. This commit adds a new length check in the copy loop, preventing
it from writhing out of bounds.

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34416
 2021-10-28 21:32:38 -04:00
Kim Kulling 8c0b869998
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport 2021-10-28 13:38:41 +02:00
Kim Kulling 5af71feef2
Merge branch 'master' into MalcolmTyrrell/spatialSortImprovements 2021-10-27 17:20:47 +02:00
Kim Kulling e01b488075
Remove dead code. 2021-10-26 22:06:10 +02:00
Malcolm Tyrrell 2239442c64
Merge branch 'master' into MalcolmTyrrell/spatialSortImprovements 2021-10-21 08:55:11 +01:00
Malcolm Tyrrell db0127859a CalculateDistance method 2021-10-21 08:39:44 +01:00
Kim Kulling 791cb195be
Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-10-20 21:14:43 +02:00
Kim Kulling f3baab1153
Merge branch 'master' into master 2021-10-20 20:51:43 +02:00
Malcolm Tyrrell c644f9d719 Subtract the centroid 2021-10-20 15:08:08 +01:00
Malcolm Tyrrell 4d10f5d133 Move distance initialization to Finalize. 2021-10-20 12:47:44 +01:00
Malcolm Tyrrell 5b13b97f27 Ensure the usage pattern of SpatialSort. 2021-10-19 14:22:28 +01:00
Kim Kulling cff5035b5f
Merge branch 'master' into master 2021-10-19 09:31:19 +02:00
Kim Kulling 36c937cc19
Merge branch 'master' into debian-fixes 2021-10-18 09:07:47 +02:00
Kim Kulling 0e3d058504 Add some exporter macros. 2021-10-17 15:10:25 +02:00
Kim Kulling a82dc887fc
Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-10-14 09:27:07 +02:00
Lassi Helynranta a01a5b4e3a Added missing include 2021-10-09 20:12:29 +03:00
IOhannes m zmölnig 1a9403e787 Fix spelling error in comment in exported Pbrt file 
See https://github.com/assimp/assimp/pull/4109#issuecomment-934747675
for a discussion that this is really a comment in the exported file,
and thus the fix should be harmless.
 2021-10-08 08:55:02 +02:00
IOhannes m zmölnig 3b8126d26a Fix spelling mistake 2021-10-08 08:48:01 +02:00
Malcolm Tyrrell ceddfe19d8 Add comment with link to schema repo. 2021-10-07 10:01:32 +01:00
Malcolm Tyrrell a283a255a5 Allow schema checking of glTF2 file. 2021-10-07 10:01:32 +01:00
diharaw 0fb66f8437 Replaced AI_MATKEY_IOR with AI_MATKEY_REFRACTI. 2021-10-07 09:39:08 +01:00
diharaw b01d008bc0 Revert "Removed KHR_materials_ior support." 
This reverts commit 0738742611.
 2021-10-07 09:36:53 +01:00
diharaw 0738742611 Removed KHR_materials_ior support. 2021-10-07 09:30:22 +01:00
Marc 656b0b25d8
Fix warning for array comparison 
The code previously compared two float arrays with the != operator. This is deprecated in Visual Studio 2019 and results in a warning that leads to an error when compiling with warnings as errors. Small fix to make the build work.
 2021-10-05 19:24:42 +02:00