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

5762 Commits

Author SHA1 Message Date
RichardTea
74b3be194d Read the Value, not the Attribute 
Correct some mistakes made when moving to pugixml from IrrXML
Fixes #4179
 2021-11-17 17:10:10 +00:00
RichardTea
bab8b8dbab apply clangformat 2021-11-17 17:08:19 +00:00
Jérémie Dumas
b0d564467e Merge branch 'master' into jdumas/ziplib 2021-11-14 08:25:59 -08:00
Jérémie Dumas
78d72bff59 Fix 3MF presence test. 2021-11-14 08:24:27 -08:00
Kim Kulling
b1c336799c Merge branch 'master' into master 2021-11-13 09:16:27 +01:00
Kim Kulling
c3ac5569c5 Merge branch 'master' into jdumas/ziplib 2021-11-13 08:46:46 +01:00
freizhang
b9937994ca Fix glTF2 skinning bone weight exporting issue 2021-11-13 12:07:29 +08:00
freizhang
6e6807ee6c Verbose processor bone weight count fix 2021-11-13 11:56:15 +08:00
freizhang
1407491a67 glTF2 exporter buffer overrun issue fix. 2021-11-13 11:52:49 +08:00
Jérémie Dumas
57d22e4dbf Merge branch 'master' into jdumas/ziplib 2021-11-12 10:13:21 -08:00
Kim Kulling
159fadebbf Update M3DExporter.cpp 2021-11-12 17:53:46 +01:00
Kim Kulling
0beacc3854 Merge branch 'master' into kimkulling-diable_m3m_issue-4126 2021-11-12 16:02:51 +01:00
Kim Kulling
f03dcc27c0 Update M3DExporter.h 2021-11-12 15:39:21 +01:00
Kim Kulling
e2ccd17494 Fix typo 2021-11-12 11:20:22 +01:00
Kim Kulling
157e032bde Fix small findings 
- Merge anonymous functions into one block.
- Some reformattings
 2021-11-12 11:08:19 +01:00
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
ece61c6c68 Update M3DWrapper.cpp 2021-11-12 09:17:32 +01:00
Kim Kulling
608bccd9cf Update M3DWrapper.h 2021-11-12 09:13:48 +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
Jeremie Dumas
cedf1819c3 Do not build ziplib when 3MF exporter is disabled. 2021-11-04 01:14:24 -07: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