db72c6ee38
When "getNextBlock" was called after "getNextLine", the pointer could still on the newline.
...
The pointer to a newline could not advance enough, when the line ended with \r\n. The resulting buffer was correct, as the buffer range went from <start> until \r, but that the pointer increased by just 1 could lead to the problem that the next pointer points at \n, which is still part of the newline and therefore, "getNextBlock" got 1 byte too much.
Refs Issue #4871
2023-02-04 15:16:22 +01:00
df28e7830f
Merge branch 'master' into fix-build-without-armaturepopulate-post-process
2023-01-29 01:14:33 +01:00
eff13f6a40
Update morph mesh documentation now that gltf known to work
2023-01-25 20:52:25 -08:00
f830d7998e
Merge branch 'master' into clean-up-ctors-dtors
2023-01-23 21:21:34 +01:00
36305cf987
Tidy Up Constructors and Destructors
...
This commit does not add or remove c’tors or d’tors, so it is *not* ABI-breaking.
If a c’tor/d’tor does nothing else than the default behavior, this commit replaces it with “= default”.
If an initializer list entry does nothing else than the default behavior, this commit removes it. First and foremost, remove default c’tor calls of base classes (always called by the compiler if no other base c’tor is explicitly called) and c’tor calls of members with complex types (e.g. “std::vector”).
In a few instances, user-defined copy c’tors / move c’tors / assignment operators / move assignment operators were replaced with “= default”, too. I only did this if I had a clear understanding of what’s going on.
2023-01-16 21:47:11 +01:00
3d3e856925
Trim Trailing Whitespace
2023-01-16 09:12:35 +01:00
793284a766
Fix Build Without ArmaturePopulate Post Process Step
...
This post process step introduced new attributes into `aiSkeletonBone`. Said attributes are only defined with the process enabled, i.e. when the `ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS` macro has not been defined.
Some code, however, accessed the variables unconditionally, leading to build failures if `ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS` was defined.
This commit adds the missing checks.
2023-01-16 08:42:50 +01:00
b2672c082d
Change mMethod type to enum aiMorphingMethod
...
Address sanitizer warning
2023-01-12 12:35:28 -08:00
b393132b58
Merge branch 'master' into spelling
2023-01-08 17:43:55 +01:00
df8a9bb2b8
Fix: Fix signed unsigned mismatch
...
- closes https://github.com/assimp/assimp/issues/4854
2023-01-03 21:11:09 +01:00
e893248e7c
Fix several spelling mistakes & a comment
2023-01-01 13:31:48 -05:00
a8e50be781
Refactoring: Move asserthandler header to include
2022-12-23 16:19:39 +01:00
76de8ba1f4
Update material.inl
2022-12-19 08:58:45 +01:00
6743274b31
illegal token on right-side-of ::Windows
...
Error without:
```
assimp\material.inl(101,47): message : error recovery skipped: ') ?'
```
Reference : https://stackoverflow.com/questions/2561368/illegal-token-on-right-side-of
2022-12-19 04:06:36 +05:30
3b5e34ab30
Merge branch 'master' into refactor/KHR_material_specular
2022-11-18 16:10:39 +02:00
3c51eafaf4
Add missing headerh will be needed on Ubuntu
...
- closes https://github.com/assimp/assimp/issues/4720
2022-11-18 11:39:51 +01:00
ffaf378ee6
fixed misnamed matkey
2022-11-10 20:37:46 +02:00
ce7a52fd19
Merge branch 'master' into refactor/KHR_material_specular
2022-11-10 20:21:30 +02:00
822b240694
Support both pbrSpecGlos and materials_specular
2022-11-08 23:09:50 +02:00
b717b1cd3e
Retrigger the build
...
Fix review findings
2022-11-08 13:39:56 +01:00
8da3d277c7
add missing std moves
2022-11-03 12:35:10 -04:00
07aef23d24
Fix: Add missing ahndling for double export in json
2022-10-18 19:05:04 +02:00
4ac3b1fef5
FIX: Use correct epsilon
2022-10-15 16:11:02 +02:00
0dd5cfe3bf
Fix config documentation for STL pointcloud export
2022-09-12 18:32:28 +02:00
4b0e38e44f
Fix aiBone.mOffsetMatrix documentation
...
Fixed the comment on the `mOffsetMatrix` property to be correct.
See https://assimp-docs.readthedocs.io/en/latest/API/API-Documentation.html#_CPPv46aiBone
See also https://stackoverflow.com/a/73603994
2022-09-05 11:00:57 -05:00
e3b01e10db
apply fixes to more headers
2022-09-01 12:28:45 -04:00
f527e56f22
Merge branch 'master' into explicitly-default-dtors
2022-08-30 22:21:06 +02:00
14186bcd6b
Code cleanup and some new unittests for edgecases.
2022-08-27 14:07:45 +02:00
e93fa6699a
Manually fix up 100 more instances where it should be defaulted
2022-08-25 12:20:13 -04:00
0db8b3daae
Use default destructor.
2022-07-06 20:59:17 +02:00
9063216893
Fix a memory leak
2022-07-02 21:21:31 +02:00
39a4627519
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-02 21:47:29 +02:00
c623a363a6
Add unittest to reproduce undefined behaviour: left shift on negative value
2022-05-17 20:48:35 +02:00
1d3d5c4bb6
Rename TextureTypeToString() to aiTextureTypeToString()
...
Closes: https://github.com/assimp/assimp/issues/4493
2022-05-01 13:27:42 +02:00
64a6968254
Add skeleton generation to aiScene
2022-04-28 21:43:02 +02:00
6cdd1d3cc6
Generate container for skeleton during FBX-Import
2022-04-28 21:12:26 +02:00
e5747dad9b
First concepts
2022-04-05 20:07:22 +02:00
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
Matthias Möller
krishty
Steve M
Kim Kulling
Krishty
Andy Maloney
Kim Kulling
RKJ
Adam Beili
Adam
Aaron Gokaslan
Chris
IOhannes m zmölnig
xiaohunqupo
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