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

759 Commits

Author SHA1 Message Date
Kim Kulling
30143e9626 Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport 2021-11-09 10:53: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
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
e01b488075 Remove dead code. 2021-10-26 22:06:10 +02:00
Kim Kulling
f3baab1153 Merge branch 'master' into master 2021-10-20 20:51:43 +02: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
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
Kim Kulling
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
Kim Kulling
1f76b2e6b9 Merge branch 'master' into Q1MDLgroup 2021-10-01 13:36:55 +02:00
diharaw
addd541251 Added gltf2 KHR_materials_ior support. 2021-09-30 08:47:53 +01:00
diharaw
d3276de47d Added gltf2 KHR_materials_volume write support. 2021-09-30 08:10:02 +01:00
diharaw
200bf8df7a Added gltf2 KHR_materials_volume import support. 2021-09-29 17:05:17 +01:00
Kim Kulling
6cb6a6acdd Merge branch 'master' into const-tokens 2021-09-24 13:37:57 +02:00
Kim Kulling
95263b2e54 Update ObjTools.h 2021-09-21 11:34:58 +02:00
Kim Kulling
fb5b5e9d40 Fix possible nullptr dereferencing in material parsing 
* Return 0.0f for empty buffer
* closes https://github.com/assimp/assimp/issues/3442
 2021-09-21 11:06:18 +02:00
Hill Ma
79f3368c85 Merge branch 'master' into static 2021-09-17 09:06:16 -07:00
krishty
8c84afaff0 Merge branch 'master' into const-tokens 2021-09-15 23:31:00 +02:00
Kim Kulling
880a2f25bb Merge branch 'master' into remove-useless-code 2021-09-14 23:33:34 +02:00
Kim Kulling
8a975549a9 Add missing override 2021-09-14 20:49:20 +02:00
Kim Kulling
0fef0e1101 Move duplicate code to glFT common header. 2021-09-14 20:45:36 +02:00
Kim Kulling
18531e3677 Next iteration for c++11 features. 2021-09-13 22:38:20 +02:00
Krishty
5895c0c22c more const in format detection 
BaseImporter::SearchFileHeaderForToken() expected a pointer to a non-const token list. This was probably an oversight, as nobody would realistically expect the function to change the list. Furthermore, it prevented token lists from being compiled to read-only memory, in some cases even causing the compiler to generate thread-safe initialization.

The list is now const and all callers declare their token lists static const, thus compiling them to read-only memory.
 2021-09-11 23:23:05 +02:00
Krishty
4cf4e7454f removed useless code 
In destructors, zeroing attributes or clearing containers is utterly useless.
 2021-09-11 21:51:20 +02:00
Hill Ma
93edbe883f Use Safe Constants Idioms for ObjFileParser::DEFAULT_MATERIAL. 
Reference: "A static Class Member" in https://abseil.io/tips/140
 2021-09-10 11:56:37 -07:00
Kim Kulling
bc0a2762df Merge branch 'master' into master 2021-09-09 09:16:50 +02:00
Kim Kulling
768024d5a0 Merge branch 'master' into master 2021-09-07 11:39:34 +02:00
Kim Kulling
74e8a6a366 Merge branch 'master' into xgl-fix 2021-09-07 09:03:40 +02:00
Max Vollmer (Microsoft Havok)
bf8e36ae28 Fixed typo 2021-09-02 10:07:28 +01:00
Max Vollmer (Microsoft Havok)
72ea80b41f Revert last change (gltf2::Ref type is not a pointer and has a bool() operator) 2021-09-02 10:00:56 +01:00
Kim Kulling
d710d0700f Make nullptr test more explicit. 2021-09-02 10:10:42 +02:00
Max Vollmer (Microsoft Havok)
4c86772091 Added another nullptr safety check 2021-09-02 08:27:03 +01:00
Madrich
9b535d1c15 Fix Double Precision errors/warnings 2021-08-31 12:59:31 +02:00
Kim Kulling
155db25883 Merge branch 'master' into ms-maxvollmer/code_improvements 2021-08-31 08:55:47 +02:00
Doug Roeper
96f0787f51 Fix the -Werror=unused-but-set-parameter warning by removing the skipFirst variable. 2021-08-30 18:15:37 -04:00
Max Vollmer (Microsoft Havok)
51f294c587 Fixes issues our internal compliance and code quality tool found: 
* Adds nullptr checks and asserts to protect certain code paths
* Fixes wrong integer type in a printf call
* Adds const to const values
* Prevents integer overflow with explicit casts
 2021-08-30 14:59:17 +01:00
Viktor Kovacs
82d8c4e849 Merge branch 'master' into compressed_json 2021-08-30 10:11:03 +02:00
Kim Kulling
38c611a02c Update ColladaLoader.cpp 2021-08-30 08:33:35 +02:00
Kim Kulling
e2c2a60c45 Remove not used attribute 2021-08-29 18:41:07 +02:00