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
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
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
5333e41607
Update AndroidJNIIOSystem.h
2021-10-28 17:52:01 +02:00
e5cd5733e1
Update AndroidJNIIOSystem.cpp
2021-10-28 17:50:25 +02:00
6e5600a9a5
Added another constructor to avoid requiring a full ANativeActivity
2021-10-28 10:26:14 -04:00
8c0b869998
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-10-28 13:38:41 +02:00
817fbed8c2
Merge pull request #4130 from MalcolmTyrrell/MalcolmTyrrell/spatialSortImprovements
...
SpatialSort improvements
2021-10-27 17:46:25 +02:00
5af71feef2
Merge branch 'master' into MalcolmTyrrell/spatialSortImprovements
2021-10-27 17:20:47 +02:00
0e38cec58c
Merge pull request #4140 from assimp/kimkulling-patch-cleanup
...
Remove dead code.
2021-10-27 00:03:13 +02:00
e01b488075
Remove dead code.
2021-10-26 22:06:10 +02:00
2239442c64
Merge branch 'master' into MalcolmTyrrell/spatialSortImprovements
2021-10-21 08:55:11 +01:00
db0127859a
CalculateDistance method
2021-10-21 08:39:44 +01:00
791cb195be
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-10-20 21:14:43 +02:00
f81d7c0b3e
Merge pull request #4112 from diharaw/master
...
[GLTF2] Add read and write support for KHR_materials_volume and KHR_materials_ior extensions.
2021-10-20 21:14:11 +02:00
f3baab1153
Merge branch 'master' into master
2021-10-20 20:51:43 +02:00
4ba99c1bb0
Comments
2021-10-20 16:15:00 +01:00
c644f9d719
Subtract the centroid
2021-10-20 15:08:08 +01:00
4d10f5d133
Move distance initialization to Finalize.
2021-10-20 12:47:44 +01:00
5b13b97f27
Ensure the usage pattern of SpatialSort.
2021-10-19 14:22:28 +01:00
a83db61289
Merge pull request #4110 from marcappelsmeier/master
...
Fix a warning about deprecated array comparison
2021-10-19 14:23:45 +02:00
cff5035b5f
Merge branch 'master' into master
2021-10-19 09:31:19 +02:00
e157d7550b
Merge pull request #4109 from umlaeute/debian-fixes
...
Spelling fixes
2021-10-19 09:30:42 +02:00
36c937cc19
Merge branch 'master' into debian-fixes
2021-10-18 09:07:47 +02:00
6689438696
Merge pull request #4124 from assimp/kimkulling-remove_deprecated_irrxml
...
Delete fast_atof.h
2021-10-18 00:11:44 +02:00
e7b9118b96
Delete fast_atof.h
2021-10-17 21:04:18 +02:00
11cb1a170f
Merge pull request #4123 from assimp/fix_no_export_build
...
Fix no export build
2021-10-17 16:00:30 +02:00
0e3d058504
Add some exporter macros.
2021-10-17 15:10:25 +02:00
4caae783ae
Disable dump when export is not supported.
2021-10-17 15:09:44 +02:00
a82dc887fc
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-10-14 09:27:07 +02:00
f678e67974
Merge pull request #4115 from lerppana/fix-missing-include
...
Added missing include
2021-10-13 14:05:40 +02:00
a01a5b4e3a
Added missing include
2021-10-09 20:12:29 +03:00
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
3b8126d26a
Fix spelling mistake
2021-10-08 08:48:01 +02:00
5a1bcc6aa5
Fix build and test
2021-10-07 10:01:33 +01:00
ceddfe19d8
Add comment with link to schema repo.
2021-10-07 10:01:32 +01:00
7788c1a04e
Add a unit test for json schemas.
2021-10-07 10:01:32 +01:00
a283a255a5
Allow schema checking of glTF2 file.
2021-10-07 10:01:32 +01:00
0fb66f8437
Replaced AI_MATKEY_IOR with AI_MATKEY_REFRACTI.
2021-10-07 09:39:08 +01:00
b01d008bc0
Revert "Removed KHR_materials_ior support."
...
This reverts commit 0738742611
2021-10-07 09:36:53 +01:00
0738742611
Removed KHR_materials_ior support.
2021-10-07 09:30:22 +01:00
ad0d945c80
Merge pull request #1 from marcappelsmeier/fixDeprecatedArrayComparision
...
Fix warning for array comparison
2021-10-05 19:25:08 +02:00
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
babf3b8e3d
Merge pull request #4108 from davidepi/fix-aistring-embedtextures
...
Fix aiString length not updated in the EmbedTextures postprocess task
2021-10-04 15:22:49 +02:00
ae951fbef9
Fix aiString length in aiProcess_EmbedTextures
2021-10-03 00:41:09 +02:00
3e4cca4d2f
Merge pull request #4106 from assimp/kimkulling-issues-3726
...
Add support for normal maps, the classic way
2021-10-01 14:58:19 +02:00
ac6b8988df
Add support for normal maps, the classic way
...
- get compiant to tinyobjloader and other importers
- closes https://github.com/assimp/assimp/issues/3726
2021-10-01 14:24:40 +02:00
2f5a31110c
Merge pull request #3743 from Garux/Q1MDLgroup
...
Fix Q1 MDL group frame loading, e.g. Q1 progs/flame2.mdl
2021-10-01 14:03:08 +02:00
1f76b2e6b9
Merge branch 'master' into Q1MDLgroup
2021-10-01 13:36:55 +02:00
46a7de7a0b
Moved KHR_material_volume thickness texture under aiTextureType_TRANSMISSION.
2021-09-30 08:56:16 +01:00
Alex Rebert
Kim Kulling
Daniel-Genkin
Malcolm Tyrrell
Malcolm Tyrrell
Kim Kulling
Lassi Helynranta
IOhannes m zmölnig
diharaw
Marc
Davide Pizzolotto