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

1041 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
Kim Kulling
37c81e7a28 Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport 2021-11-12 10:37:19 +01:00
Kim Kulling
7120504c46 Merge branch 'master' into fix_aiMesh_abi_4162 2021-11-11 20:02:46 +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
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
Kim Kulling
322de54323 Merge branch 'master' into master 2021-10-29 19:35:27 +02:00
Daniel-Genkin
f28500dd0f Fixed building of Android port 2021-10-29 09:03:55 -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
Kim Kulling
5333e41607 Update AndroidJNIIOSystem.h 2021-10-28 17:52:01 +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
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
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
IOhannes m zmölnig
3b8126d26a Fix spelling mistake 2021-10-08 08:48:01 +02: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
diharaw
46a7de7a0b Moved KHR_material_volume thickness texture under aiTextureType_TRANSMISSION. 2021-09-30 08:56:16 +01:00
diharaw
addd541251 Added gltf2 KHR_materials_ior support. 2021-09-30 08:47:53 +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
krishty
8c84afaff0 Merge branch 'master' into const-tokens 2021-09-15 23:31:00 +02:00
Mark's Offline
1eb0d18371 Including <exception> 
Assimp wasn't compiling on GNU/Linux
 2021-09-15 05:17:16 -05:00
Kim Kulling
113217790b Merge branch 'master' into cleanup_public_header 2021-09-14 20:46:22 +02:00
Ingo Wald
e9d03f3379 fixed wrong comment 2021-09-13 15:10:48 -06: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
Kim Kulling
f47479aba4 Rework format + introdule missing C++11 features 2021-09-08 23:19:10 +02:00
Kim Kulling
df739f00dd Merge branch 'master' into issue_3398 2021-08-28 13:56:50 +02:00
Kim Kulling
4b1ff645e3 closes https://github.com/assimp/assimp/issues/3398: Add support for embedded textures 2021-08-12 21:13:07 +02:00
krishty
aac77e58b6 Merge branch 'master' into fix-logger-comments 2021-08-11 12:16:58 +02:00
krishty
73b25d2578 Merge branch 'master' into fix-logger-comments 2021-08-06 09:40:35 +02:00
krishty
6cb54d1c95 Merge branch 'master' into trim-trailing-whitespace 2021-08-06 09:40:03 +02:00
Hill Ma
538cb3125c Use strlen() rather than fixed length in fast_atof.h 
This avoids reading past the length of the input string.
 2021-08-02 13:21:07 -07:00
Krishty
a1eaaaa0e3 fix comments 
fixes some copy-paste errors in logger comments introduced with 89584c167a
 2021-07-29 14:45:39 +02:00
Krishty
758116b083 removed trailing spaces and tabs from source and text 
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
 2021-07-29 13:28:51 +02:00
Kim Kulling
92af44f092 Fix euler angles 2021-07-26 15:47:19 +02:00
Kim Kulling
b5350899b2 Merge branch 'master' into master 2021-06-24 16:15:51 +02:00
Kim Kulling
00bf757688 Update material.h 2021-06-24 13:28:49 +02:00
Jerome St-Louis
170063643c include/material.h: Fixed broken C support 
- The aiGetMaterialFloat() and aiGetMaterialInteger() C preprocessor definitions were broken because:
   - They had a space before the opening parenthesis
   - Using material key definitions expanding 1 to argument into 3 breaks the invocation of macros expecting 5 parameters
 2021-06-23 18:15:01 -04:00
Evangel63
e736538df3 Merge branch 'master' into master 2021-06-23 13:45:23 +10:00
Kim Kulling
760953c834 Merge branch 'master' into clean_gltf_pbr_brdf 2021-06-22 20:10:03 +02:00
Kim Kulling
a8c75c34a1 Update scene.h 
Add some more checks against nullptr dereferecnes.
 2021-06-17 21:31:28 +02:00