Kim Kulling
8a1563d61a
Merge pull request #4170 from assimp/Artenuvielle-x3d_pugi_migration_artenuvielle
...
Artenuvielle x3d pugi migration artenuvielle
2021-11-11 19:19:33 +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
Viktor Kovacs
b6994c5e1f
Merge branch 'master' into readme_add_assimpjs
2021-11-11 07:38:42 +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
fe511fddc4
Merge pull request #4165 from irajsb/master
...
Added UE4 plugin
2021-11-10 11:06:22 +01:00
Kim Kulling
39664d608d
Merge branch 'master' into master
2021-11-10 10:51:18 +01:00
Kim Kulling
baf3f00644
Merge branch 'master' into master
2021-11-10 10:37:49 +01:00
Kim Kulling
d4755648b4
Merge pull request #4167 from assimp/kimkulling-fix_uninitialized_attribs_issue-4158
...
Update anim.h
2021-11-10 09:34:52 +01:00
Kim Kulling
5fd2a5559c
Update mesh.h
...
- Add initialization for armature attributes.
- closes https://github.com/assimp/assimp/issues/4158
2021-11-10 09:19:29 +01:00
Kim Kulling
c01d33a77a
Update anim.h
...
- Add missing whitespaces
2021-11-10 09:12:35 +01:00
Kim Kulling
83950845ee
Merge pull request #4166 from assimp/kimkulling-fix_version_issue-4161
...
Change version to 5.1.0
2021-11-10 09:08:23 +01:00
Kim Kulling
8a613a8655
Fix unittest
2021-11-09 23:27:58 +01:00
Kim Kulling
e206d699da
Change version to 5.1.0
...
- Change version for Version 5.1.0-RC1 to 5.1.0
- closes https://github.com/assimp/assimp/issues/4161
2021-11-09 23:26:20 +01:00
iraj mohtasham
7ddd9b2484
Added UE4 plugin
2021-11-10 00:04:12 +03:30
Kim Kulling
50ba15191b
Merge pull request #4164 from Skylion007/update-performance-fixes
...
Remove optimization fence preventing automatic move
2021-11-09 20:09:31 +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
2b4b3e820b
Merge pull request #4154 from assimp/kimkulling-fuzzer-issue-4153
...
Update D3MFOpcPackage.cpp
2021-11-02 10:51:58 +01: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
kovacsv
3b2a9d1543
Add assimpjs link.
2021-11-01 08:09:16 +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
Kim Kulling
3664fe20c0
Merge pull request #4146 from alpire/master
...
Fix fuzzer crashes
2021-10-29 20:20:04 +02:00
Kim Kulling
322de54323
Merge branch 'master' into master
2021-10-29 19:35:27 +02:00
Kim Kulling
7f4839a26c
Merge pull request #4145 from Daniel-Genkin/master
...
Fixed building of Android port
2021-10-29 19:21:27 +02: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
Daniel-Genkin
f28500dd0f
Fixed building of Android port
2021-10-29 09:03:55 -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
1909b3e8d2
Fix overflow in IOStreamBuffer
...
`getNextLine` & `getNextDataLine` now double the buffer size each time
it is needed to avoid writing out of bounds.
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24465
2021-10-28 23:33:07 -04:00
Alex Rebert
6a3ac623b9
Fix out-of-bounds reads in OpenDDLParser
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=31795
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24463
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=36594
2021-10-28 23:13:29 -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
d273a784d0
Merge pull request #4142 from Daniel-Genkin/master
...
Added another constructor to avoid requiring a full ANativeActivity
2021-10-28 22:16:07 +02:00
Kim Kulling
5333e41607
Update AndroidJNIIOSystem.h
2021-10-28 17:52:01 +02:00
Kim Kulling
e5cd5733e1
Update AndroidJNIIOSystem.cpp
2021-10-28 17:50:25 +02:00
Daniel-Genkin
6e5600a9a5
Added another constructor to avoid requiring a full ANativeActivity
2021-10-28 10:26:14 -04:00
Kim Kulling
8c0b869998
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-10-28 13:38:41 +02:00
Kim Kulling
817fbed8c2
Merge pull request #4130 from MalcolmTyrrell/MalcolmTyrrell/spatialSortImprovements
...
SpatialSort improvements
2021-10-27 17:46:25 +02:00
Kim Kulling
5af71feef2
Merge branch 'master' into MalcolmTyrrell/spatialSortImprovements
2021-10-27 17:20:47 +02:00
Kim Kulling
0e38cec58c
Merge pull request #4140 from assimp/kimkulling-patch-cleanup
...
Remove dead code.
2021-10-27 00:03:13 +02:00