54f5d01190
Fix Heap-buffer-overflow WRITE in Assimp::ObjFileImporter::createVertexArray
2023-05-31 11:37:15 +00:00
c3e69b5b82
Fix Heap-buffer-overflow READ in Assimp::ObjFileParser::getFace
2023-05-31 08:01:41 +00:00
466f6960ac
Merge branch 'gltf2_metadata_export' of https://github.com/C-Tech-Development-Corp/assimp into C-Tech-Development-Corp-gltf2_metadata_export
2023-05-30 08:14:49 +02:00
17c1a9125f
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization
2023-05-24 23:36:59 +02:00
b7a8c4ba75
Update glTF2Asset.inl
2023-05-23 10:33:14 +02:00
e947471549
Merge branch 'master' into refactor/KHR_material_specular
2023-05-22 09:49:01 +02:00
03163a1dda
Merge branch 'master' into master
2023-05-21 18:26:56 +02:00
7e16d4046e
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization
2023-05-21 18:14:29 +02:00
9c45f727e3
Update ASELoader.cpp
2023-05-20 14:27:57 +02:00
aed43878ef
Merge branch 'master' into FlorianBorn71-SmallAllocationFixInFBXLoader
2023-05-15 14:28:46 +02:00
121f09b62a
Fix: Fix the build.
2023-05-15 11:02:58 +02:00
e627f691a8
Merge branch 'SmallAllocationFixInFBXLoader' of https://github.com/FlorianBorn71/assimp into FlorianBorn71-SmallAllocationFixInFBXLoader
2023-05-15 09:30:57 +02:00
d825eb7cf0
Skinning weights i gltf were broken by PR#5003 (vertex remapping)
2023-05-08 20:04:38 +02:00
1243325f10
Merge branch 'master' into kimkulling/refactoring_geoutils
2023-05-04 21:10:00 +02:00
75d024c91b
Reafctoring: Add GeoUtils usage
2023-05-04 20:57:20 +02:00
cabf3a5d17
Fix warning related to unreachable-code-return.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 00:30:21 +08:00
a8e7c23605
Fix warning related to unreachable-code.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 00:29:33 +08:00
230bee2e34
Merge branch 'master' into msvc-clang-missing-variable-declarations
2023-04-26 11:15:32 +02:00
71366fff8e
Merge branch 'master' into msvc-clang-inconsistent-missing-destructor-override
2023-04-26 09:31:55 +02:00
1ecb8e9196
Merge branch 'master' into msvc-clang-missing-noreturn
2023-04-25 23:56:39 +02:00
46677b835c
Fix warning related to missing-variable-declarations, add static to global variable.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:28:36 +08:00
5738b3d172
Fix warning related to missing-variable-declarations, add static to global variable.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:27:23 +08:00
739cf15a1e
Fix warning related to missing-variable-declarations, remove unused global variables.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:26:03 +08:00
c0947b704e
Fix warning related to missing-variable-declarations, remove unused global variables.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:24:40 +08:00
4d962057e5
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:35 +08:00
12bc34a45c
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:35 +08:00
0a05a1f17f
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:34 +08:00
cec41f6dd5
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:34 +08:00
7620a69e3e
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:34 +08:00
9e80dfc42d
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:34 +08:00
9e056218cf
Merge branch 'master' into msvc-clang-unreachable-code-return
2023-04-17 22:04:07 +02:00
ca937788ee
Fix: Fix leak in Scope class, FBX
...
- closes https://github.com/assimp/assimp/issues/3421
2023-04-17 20:08:58 +02:00
aee4df9be8
Fix possible dereferencing of invalid pointer.
...
- closes https://github.com/assimp/assimp/issues/4918
2023-04-17 15:40:29 +02:00
5d841ec9a5
Refactoring: Cleanup post-processing steps.
2023-04-16 18:20:14 +02:00
e193220ad8
Merge branch 'master' into refactor/KHR_material_specular
2023-04-06 02:42:18 +02:00
3dd08cdd60
Added note
2023-04-05 13:01:38 +02:00
74509ef8bd
Revert "FBXConverter : import FbxCamera correctly"
...
This reverts commit cdfdd75a66
2023-04-05 12:19:39 +02:00
d4c21ba9a8
Fix warning related to error=return-type.
...
/home/runner/work/assimp/assimp/code/AssetLib/Ogre/OgreXmlSerializer.cpp: In member function ‘T Assimp::Ogre::OgreXmlSerializer::ReadAttribute(Assimp::XmlNode&, const char*) const [with T = bool]’:
Error: /home/runner/work/assimp/assimp/code/AssetLib/Ogre/OgreXmlSerializer.cpp:131:1: error: control reaches end of non-void function [-Werror=return-type]
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:39:17 +08:00
a7cb3b4dbb
Fix warning related to unreachable-code-return, remove redundant return.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:37:49 +08:00
55c6eaee0c
Fix warning related to unreachable-code-return, remove redundant return.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:37:48 +08:00
502bceb6e8
Fix warning related to unreachable-code-return, remove redundant return.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:37:48 +08:00
a87585668d
Fix warning related to unreachable-code-return, disable warning.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:37:48 +08:00
89ccc89298
Merge branch 'master' into fix_pretransform_vertices_with_cameras
2023-04-04 17:21:05 +02:00
1733d9f795
Merge branch 'master' into msvc-clang-unreachable-code
2023-04-04 17:02:22 +02:00
a259277498
Merge branch 'master' into master
2023-04-03 23:54:28 +02:00
9915e875bf
glTF2: Fix incorrect camera position
2023-04-03 23:35:04 +02:00
8aa959fa19
Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr
2023-04-03 20:48:51 +02:00
d6885d4025
Merge branch 'master' into msvc-clang-nested-anon-types
2023-04-03 19:59:59 +02:00
19ff57a6c3
Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr
2023-04-03 11:28:10 +02:00
7df4efea44
Fix warning related to inconsistent-missing-destructor-override.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 21:49:38 +08:00
87c309566f
Fix warning related to missing-noreturn.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 18:46:12 +08:00
04066ece8e
Fix warning related to unreachable-code.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:02:04 +08:00
1dcb5da1cd
Fix warning related to unreachable-code.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:01:22 +08:00
6b54761310
Fix warning related to nested-anon-types.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 10:30:10 +08:00
4438b3ecc9
Fix Issue #4486 using the fix described by @jianliang79
2023-03-29 18:36:18 +00:00
8ac0af5c58
.
2023-03-26 17:13:16 +02:00
b6ecba9114
fix
2023-03-26 17:03:46 +02:00
83053f3d56
Made usePbrSpecGloss a exportproperty, fixed mat_specular to spec
2023-03-26 16:55:38 +02:00
fa00571049
fixed compilation bug
2023-03-26 14:52:44 +02:00
c9177b7811
Merge branch 'master' into refactor/KHR_material_specular
2023-03-24 21:47:19 +01:00
7095c4f52f
Merge branch 'master' into master
2023-03-23 07:30:49 +01:00
5ddd18d1c7
Add more AMF unit tests
2023-03-22 12:06:30 +02:00
7cc0c06fdb
Merge branch 'assimp:master' into master
2023-03-22 08:30:52 +01:00
cdfdd75a66
FBXConverter : import FbxCamera correctly
...
FbxCamera's default value is correct but its transformed
values are described in each NodeProperties.
2023-03-21 10:35:24 +01:00
e7e4e3100f
Merge branch 'master' into 1-3193
2023-03-20 14:01:35 +01:00
3a69e353f3
Make Blender MVert no field optional
2023-03-20 12:00:20 +02:00
eb3b48e523
Invert logic in build_bone_children_hierarchy.
2023-03-14 09:21:45 -04:00
4c015077b8
Add missing member initializer.
2023-03-13 19:07:14 -04:00
054dacd068
Improved comments.
2023-03-13 19:07:14 -04:00
4b4cb55f22
Fix HL1MDLLoader flattened bone hierarchy.
2023-03-13 19:06:18 -04:00
8176c6a0e4
Adjusting the unit tests to pass new gltf
2023-03-10 18:36:43 +01:00
60cefdd549
Jan's fedback
2023-03-10 12:10:38 +01:00
dfd70b5c10
GLTF Importer: Build a list of the actual vertices so it works well with shared attribute lists
2023-03-09 19:06:58 +01:00
05249353d4
Merge branch 'master' into UseNewMetaDataTypesInFBXConverter
2023-03-08 10:53:00 +01:00
069b3ecdf8
After Kim's addition to meta data types, use it in the FBX converter
2023-03-07 17:44:48 +01:00
44c2785663
Make debug message more professional.
2023-03-07 17:01:08 +01:00
2efd48dee2
disable another debug print message
2023-03-04 14:53:48 +01:00
424f53b4d6
bugfix remove duplicated data.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-03-04 16:25:56 +08:00
e8f0eb930d
Fix loading binary LWO files
2023-02-24 14:40:27 +02:00
3bdc43a216
Add debug logging to LWO node graph generation
2023-02-24 14:40:27 +02:00
657c1d8ad0
Use unique_ptr to store pivot nodes until moved to mapPivot
2023-02-24 14:40:23 +02:00
3bdfecb0ed
Destroy mapPivot nodes as we go
2023-02-24 13:26:34 +02:00
be28f0949b
Whitespace
2023-02-24 13:20:40 +02:00
53c6cc0966
Add a scope so mapPivot is destroyed when no longer used
2023-02-24 13:19:38 +02:00
92f7c50c91
Remove dead code
2023-02-24 13:18:04 +02:00
28d4e394c0
Use std::unique_ptr a bit
2023-02-24 13:17:32 +02:00
eb73464055
Merge branch 'master' into fix-fbx-document-duplicate-id-leak
2023-02-23 10:39:52 +01:00
c8d50dc83f
Merge branch 'master' into patch-2
2023-02-22 21:33:20 +01:00
fa4273ee1f
Fix index out of bounds
2023-02-20 19:56:57 +01:00
f8132bf17c
Fix index out of bounds
2023-02-20 19:50:06 +01:00
53e5f19b14
Use C++ style casts
2023-02-17 11:20:00 -08:00
e4386d3013
Fix implicit conversion errors on macOS
2023-02-16 15:21:43 -08:00
2cd3da4831
Fix a leak in FBXDocument when duplicate object IDs are found
...
When a duplicate ID is encountered, existing LazyObject is overwritten. Previously allocated instance leaks.
This change deletes the previously allocated instance before overwriting the pointer.
2023-02-16 11:21:29 +01:00
839cd35a54
Merge branch 'master' into master
2023-02-04 19:08:39 +01:00
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
88ef9eecc1
ACLoader: add support for reading more than one texture per object
2023-02-03 20:29:56 -05:00
8d405d60d9
Fix Terragen loader
...
Fixes e8d2b84017
2023-02-03 11:44:27 +02:00
feb3e9ff7a
Merge branch 'master' into PLYcomments#4866
2023-02-01 13:05:55 -05:00
df28e7830f
Merge branch 'master' into fix-build-without-armaturepopulate-post-process
2023-01-29 01:14:33 +01:00
6dc12f57a2
Merge branch 'master' into PLYcomments#4866
2023-01-23 21:50:26 -05:00
4d733d80f1
Merge branch 'master' into PLYcomments#4866
2023-01-23 15:56:04 -05:00
b31c04e37c
Merge branch 'master' into fix-msvc-emplace-warnings
2023-01-23 21:37:41 +01:00
f830d7998e
Merge branch 'master' into clean-up-ctors-dtors
2023-01-23 21:21:34 +01:00
cb8320945d
Fix issue #4866 by continuing to resetting read loop after hitting a comment
2023-01-23 14:18:50 -05:00
036f2b3771
Merge branch 'master' into remove-stray-semicolon
2023-01-23 20:06:43 +01:00
3e20502e0f
Merge branch 'master' into fix_gltf2_camera_fov
2023-01-23 19:14:42 +01:00
3bd2f788f6
Merge branch 'master' into replace-variables-with-literals
2023-01-23 18:55:20 +01:00
f2f967b8ba
Merge branch 'master' into remove-useless-virtual
2023-01-22 20:25:45 +01:00
f8bc8293ce
Update FBXMeshGeometry.h
2023-01-22 16:48:45 +01:00
303c30668f
Merge branch 'master' into trim-whitespace
2023-01-22 16:37:43 +01:00
d331a7e5d4
Merge branch 'master' into fix-build-without-armaturepopulate-post-process
2023-01-20 13:52:13 +01:00
72f360710a
Fix MSVC Warnings With “emplace_back()”
...
Several places in the code call `std::vector<aiVector3D>.emplace_back(0, 0, 0)`. The constructor of `aiVector3D` actually expects arguments of the type `ai_real`, (alias of `float` if compiling without `ASSIMP_DOUBLE_PRECISION`) but the literal `0` is of type `int`.
`emplace_back()` does support promotion, but `int` to `float` is a potentially lossy conversion. tl;dr: On warning level 4, MSVC spits out a very deeply nested `warning C4244: 'argument': conversion from '_Ty' to 'TReal', possible loss of data with _Ty=int and TReal=ai_real`.
2023-01-18 00:08:38 +01:00
20acfeaf97
Merge branch 'master' into fix_gltf2_camera_fov
2023-01-17 14:39:54 -08:00
b298b79a46
add missing parens
2023-01-17 10:53:41 -08:00
7f6e96747b
Merge branch 'master' into f-FixWhitespaceBetweenTagAndNum
2023-01-17 13:32:39 +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
43a062a5d7
Remove Stray Semicolon
2023-01-16 20:45:00 +01:00
39cbef1e21
Fix: fix incorrect math for calculating the horizontal FOV of a perspective camera in GLTF2 import #4435
2023-01-16 11:39:13 -08: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
5cbc00a595
Fix Build With M3D Import Only
...
`M3DWrapper.h` is designed to omit the definition of `class M3DWrapper` if neither M3D import nor M3D export are compiled.
608bccd9cf
2023-01-16 08:29:49 +01:00
bad76fd0f1
Replace Variables With Literals
2023-01-16 08:18:36 +01:00
e5c02e8d45
Remove Useless “virtual”
...
These functions are already marked “override”, and their neighbors had “virtual” removed as well.
2023-01-16 08:12:24 +01:00
43c0f8bb3d
Remove whitespace between a <v> tag and the first number, otherwise first call to strtoul10() returns 0 and the indices are broken, leading to possible out-of-bound access and memory corruption/crash
2023-01-15 23:03:41 +01:00
2d37f49f51
Remove deprecated comment
...
- closes https://github.com/assimp/assimp/issues/4869
2023-01-15 19:12:24 +01:00
b393132b58
Merge branch 'master' into spelling
2023-01-08 17:43:55 +01:00
96b071bdb1
Fix: Fix possible division by zero
...
- closes https://github.com/assimp/assimp/issues/4860
2023-01-04 09:19:37 +01:00
e893248e7c
Fix several spelling mistakes & a comment
2023-01-01 13:31:48 -05:00
376f66a06d
Merge branch 'master' into master
2022-12-16 10:11:56 +01:00
c3d15a3f51
Fix minor review findings.
2022-12-16 09:03:40 +01:00
c92b84e38d
Merge branch 'master' into patch-10
2022-12-16 09:00:41 +01:00
db8ff41679
Update MD5Parser.cpp
2022-12-15 14:06:57 +01:00
2612950b7b
Merge branch 'master' into patch-9
2022-12-15 14:05:35 +01:00
917352dd8b
Fixes Heap-buffer-overflow READ 1 in Assimp::ObjFileParser::getFace
...
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49274
2022-12-11 01:54:57 +01:00
90769ef3e6
Fixes Heap-buffer-overflow READ 1 in Assimp::MD5::MD5Parser::ParseHeader
...
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49422
When it reaches the `SkipSpacesAndLineEnd`, `in` already points past `bufferEnd` and it leads to out of bounds memory read.
2022-12-11 00:02:09 +00:00
d5294be00b
Fixes Heap-buffer-overflow READ 4 in Assimp::ScenePreprocessor::ProcessMesh
...
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49797
2022-12-10 01:22:00 +00:00
2d372b302f
Fixed bug when exporting binary FBX
...
Fixed vector subscript out of range bug when NULL_RECORD is passed to PutString and is actually null
2022-12-08 14:59:25 +01:00
3f66b92797
Merge branch 'master' into master
2022-12-06 20:34:51 +01:00
9d57ac9cc5
Fix:Add missing semicolon.
2022-12-05 13:15:42 +01:00
81f85a6f93
Avoid undefined-shift in Assimp::ASE::Parser::ParseLV4MeshFace.
2022-12-05 13:07:52 +01:00
62486c6e7c
FIX: Fix possible division by zero
...
- closes https://github.com/assimp/assimp/issues/4819
2022-12-02 09:24:51 +01:00
d8b9e2b64b
Merge branch 'master' into master
2022-12-02 08:41:43 +01:00
f578b15759
Merge branch 'master' into explspec
2022-11-30 14:03:09 +01:00
7d06d798af
[BlenderDNA.h] Declare explicit specializations
...
It is an ODR violation to use a template specialization for which an
explicit specialization is defined somewhere whose declaration is not
visible at the point of use.
Found via clang's -Wundefined-func-template warning.
2022-11-29 18:38:33 +00:00
54068637ee
Merge branch 'master' into refactor/KHR_material_specular
2022-11-29 17:35:52 +01:00
8fb7ba3444
Merge branch 'master' into modernize-smartptrs-literals
2022-11-29 09:58:17 +01:00
ab82428bb5
Merge branch 'master' into master
2022-11-22 07:15:38 -08:00
5689ac7869
Add overfolow check for invalid data.
...
- closes https://github.com/assimp/assimp/issues/3422
2022-11-22 10:50:52 +01:00
371d5c78f4
Updated ConvertMaterials function to assign appopriate material index when using material references.
2022-11-21 15:49:48 -08:00
1d1cd93371
Merge branch 'master' into KHR_materials_emissive_strength
2022-11-21 20:55:13 +01:00
Alex
Kim Kulling
Kim Kulling
Florian Born
Kim Kulling
Jackie9527
Adam Beili
Suhajda Tamás
aniongithub
inhosens
Turo Lamminen
Inho Lee
Marc-Antoine Lortie
Urs Hanselmann
Johan Mattsson
Aaron Jacobs
Anton Vaneev
Matthias Möller
Robert Reif
PencilAmazing
krishty
Krishty
shimaowo
Martin Mory
Martin Mory
Andy Maloney
Umesh Rajesh Ramchandani
Thomas Köppe
naota29
Justice Colby