b08c04b87a
Fix compile errro in VC140
2022-03-31 15:08:12 +08:00
f985fe12cc
Fix compile error
...
When enable macro ASSIMP_DOUBLE_PRECISION
2022-03-31 11:20:18 +08:00
5e69517742
Merge branch 'master' into update_ai_texture_type_max
2022-03-10 11:37:46 +01:00
7aa87a9765
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-03-08 19:10:53 +01:00
8a6a1fc2df
Update AI_TEXTURE_TYPE_MAX
...
Must be equal to the largest aiTextureType_XXX enum
2022-03-01 12:12:07 +00:00
d704824be3
Merge branch 'master' into deprecated_gltfpbr_macros
2022-03-01 10:01:43 +00:00
94178df61b
Merge branch 'master' into master
2022-02-24 19:31:31 +01:00
0dc24ab3a7
Fix declaration of offset
2022-02-24 17:04:39 +01:00
cf96639119
Fix possible negative array access
...
- Return when the calculated offset gets negative
- closes https://github.com/assimp/assimp/issues/4414
2022-02-24 16:49:35 +01:00
4ddacdb5df
Expose the original OBJ illum model as a material property.
2022-02-22 17:55:41 -07:00
17123ed4a1
Add support for bump -bm (bump/normal multiplier)
2022-02-17 22:10:46 -07:00
9e23d771bc
Fix invalid initialization of constexpr.
2022-02-16 21:19:17 +01:00
76a7614c4b
Adapt ai_epsilon to code
2022-02-16 20:07:27 +01:00
50d7e6fc61
Add definition for skeleton
2022-02-16 00:18:32 +01:00
067c5d9ec4
Refactoring: add usage of ai_epsilon to fbx.
2022-02-16 00:17:26 +01:00
9335cc30ab
INtroduce compression class to encapsulate compression via zlib
2022-02-06 20:42:58 +01:00
4141260fc9
Merge branch 'master' into master
2022-02-02 21:21:01 +01:00
ed6b6cd65c
use fully qualified namespace in byteswap macros
...
Closes: https://github.com/assimp/assimp/issues/4358
2022-01-31 14:42:59 +01:00
3976f9a092
fix compilation with clangcl on windows
2022-01-30 22:04:41 +01:00
8b1d94d6b1
Merge branch 'master' into deprecated_gltfpbr_macros
2022-01-23 12:16:49 +01:00
17d5633a5b
Add missing SImpleExtensionCheck
2022-01-19 21:42:14 +01:00
6ad7505376
Merge branch 'master' into krishty-new-file-detection
2022-01-16 20:43:57 +01:00
05746acb07
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection
2022-01-16 20:41:24 +01:00
f8253c3e3c
Update Base64.hpp
2022-01-16 13:21:01 +01:00
c8ab39dd04
Merge branch 'master' into common_base64
2022-01-15 23:42:56 +01:00
d3e24196c0
Merge branch 'master' into so-unloading
2022-01-13 20:19:23 +01:00
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
6b9732721a
Merge branch 'assimp:master' into common_base64
2022-01-10 21:15:31 +01:00
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
a591944c04
Add link to used enum for a better understandability for the mesh morphing method.
2022-01-04 17:32:18 +01:00
125acf9ec8
Merge remote-tracking branch 'origin/master' into common_base64
2022-01-02 19:47:57 +01:00
bbe12240ca
Move Base64 encode/decode functionality to the common folder.
2022-01-02 19:47:43 +01:00
ab19cff328
Merge branch 'master' into pbr-obj
2021-12-31 08:33:30 +01:00
d44641398f
Add console progresshandler
2021-12-26 11:16:02 +01:00
19371af6e6
Support PBR properties/maps in Obj importer
2021-12-20 13:43:46 -05:00
efdaf603b0
Merge branch 'master' into so-unloading
2021-12-16 14:52:58 +01:00
003942aafe
Merge branch 'master' into copyscene_fix
2021-12-13 21:19:08 +01:00
65bc801734
Some fixes for possible divisions by zero
2021-12-13 18:48:58 +01:00
e4f38810ca
Add missing static casts
2021-12-13 18:12:19 +01:00
cb657e4c13
Use correct XmlParser-methods and add some missing casts
2021-12-13 18:06:23 +01:00
2be6bac4b0
Bug: Export crashes when any of the meshes contains texture coordinate names #4243
2021-12-07 20:42:43 +01:00
75e7d0f6ef
Merge branch 'master' into deprecated_gltfpbr_macros
2021-12-07 09:01:50 +00:00
5b4829155c
Merge branch 'master' into so-unloading
2021-12-04 20:28:12 +01:00
5e1188c44e
Check that positions exist before accessing them
2021-11-26 13:01:38 +00:00
8b78a63b50
Allow dlclose of so library by avoiding unique symbols.
2021-11-23 20:39:48 +01:00
d18709b899
Small float values should be true
2021-11-23 14:15:32 +00:00
5143044cc8
redefine AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS
...
This key is deprecated but is used by Qt5 & Qt 6.2.1 QtQuick3D
2021-11-23 13:55:27 +00:00
2fdf52488f
float and integer material property bool conversion
...
All reading float and integer material property values as bool
Zero => False
Non-Zero => True
2021-11-23 13:53:58 +00:00
0d857bcf9f
Merge branch 'master' into deprecated_gltfpbr_macros
2021-11-20 12:35:56 +01:00
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
33845cd019
Only issue compile warning on gcc and msvc
...
I'm not sure on the proper syntax for clang and mingw
2021-11-17 15:44:16 +00:00
c24f99cd0e
Redefine deprecated glTF-specific PBR material macros
...
Intended to support Qt5 QtQuick3D until it is ported to generic PBR
macros.
2021-11-16 11:42:59 +00:00
37c81e7a28
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-12 10:37:19 +01:00
7120504c46
Merge branch 'master' into fix_aiMesh_abi_4162
2021-11-11 20:02:46 +01:00
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
c01d33a77a
Update anim.h
...
- Add missing whitespaces
2021-11-10 09:12:35 +01:00
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
30143e9626
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-09 10:53:58 +01:00
322de54323
Merge branch 'master' into master
2021-10-29 19:35:27 +02:00
f28500dd0f
Fixed building of Android port
2021-10-29 09:03:55 -04:00
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
5333e41607
Update AndroidJNIIOSystem.h
2021-10-28 17:52:01 +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
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
f3baab1153
Merge branch 'master' into master
2021-10-20 20:51:43 +02: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
3b8126d26a
Fix spelling mistake
2021-10-08 08:48:01 +02: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
46a7de7a0b
Moved KHR_material_volume thickness texture under aiTextureType_TRANSMISSION.
2021-09-30 08:56:16 +01:00
addd541251
Added gltf2 KHR_materials_ior support.
2021-09-30 08:47:53 +01:00
200bf8df7a
Added gltf2 KHR_materials_volume import support.
2021-09-29 17:05:17 +01:00
6cb6a6acdd
Merge branch 'master' into const-tokens
2021-09-24 13:37:57 +02:00
8c84afaff0
Merge branch 'master' into const-tokens
2021-09-15 23:31:00 +02:00
1eb0d18371
Including <exception>
...
Assimp wasn't compiling on GNU/Linux
2021-09-15 05:17:16 -05:00
113217790b
Merge branch 'master' into cleanup_public_header
2021-09-14 20:46:22 +02:00
e9d03f3379
fixed wrong comment
2021-09-13 15:10:48 -06:00
18531e3677
Next iteration for c++11 features.
2021-09-13 22:38:20 +02:00
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
f47479aba4
Rework format + introdule missing C++11 features
2021-09-08 23:19:10 +02:00
df739f00dd
Merge branch 'master' into issue_3398
2021-08-28 13:56:50 +02:00
4b1ff645e3
closes https://github.com/assimp/assimp/issues/3398 : Add support for embedded textures
2021-08-12 21:13:07 +02:00
aac77e58b6
Merge branch 'master' into fix-logger-comments
2021-08-11 12:16:58 +02:00
73b25d2578
Merge branch 'master' into fix-logger-comments
2021-08-06 09:40:35 +02:00
6cb54d1c95
Merge branch 'master' into trim-trailing-whitespace
2021-08-06 09:40:03 +02:00
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
a1eaaaa0e3
fix comments
...
fixes some copy-paste errors in logger comments introduced with 89584c167a
2021-07-29 14:45:39 +02:00
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
92af44f092
Fix euler angles
2021-07-26 15:47:19 +02:00
b5350899b2
Merge branch 'master' into master
2021-06-24 16:15:51 +02:00
00bf757688
Update material.h
2021-06-24 13:28:49 +02:00
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
e736538df3
Merge branch 'master' into master
2021-06-23 13:45:23 +10:00
760953c834
Merge branch 'master' into clean_gltf_pbr_brdf
2021-06-22 20:10:03 +02:00
xiaohunqupo
Kim Kulling
Kim Kulling
RichardTea
Terence Russell
IOhannes m zmölnig (Debian/GNU)
Tomas Maly
Viktor Kovacs
Rene Sepulveda
Max Vollmer (Microsoft Havok)
Thomas Nicky Thulesen
Daniel-Genkin
Alex Rebert
Malcolm Tyrrell
Malcolm Tyrrell
IOhannes m zmölnig
diharaw
krishty
Mark's Offline
Ingo Wald
Krishty
Hill Ma
Jerome St-Louis
Evangel63