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
5441f07d05
Merge branch 'master' into refactor/KHR_material_specular
2022-11-19 17:40:22 +02:00
1cd5841b2f
.
2022-11-18 17:24:37 +02:00
08f2f0f82f
Don't hide out-of-memory during FBX import
2022-11-18 13:50:33 +01: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
95d98ec98b
fixed indentation error
2022-11-08 20:55:20 +02:00
49bc22ddb5
Merge branch 'master' into KHR_materials_emissive_strength
2022-11-08 20:51:20 +02:00
3730b7414f
Use make_shared in IFCBoolean
2022-11-08 11:30:53 -05:00
d635bc6914
Fix some indentation
2022-11-08 11:19:12 -05:00
ccfb175460
Apply various clang-tidy checks for smartprs and modern C++ types
2022-11-08 11:03:55 -05:00
97cb1c6b15
Fix perfect fowards
2022-11-07 11:01:16 -05:00
5a0df03d2b
Fix another missing move in glTFCommon.h
2022-11-07 09:34:00 -05:00
945d93b46a
fixed indentation
2022-11-04 09:37:28 -07:00
852ea8325c
Added support for KHR_materials_emissive_strength
...
according to spec https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_emissive_strength
2022-11-03 23:11:21 +02:00
899f8e1d17
Remove redundant ctor
2022-11-03 12:46:40 -04:00
02378b5e70
Add one more missing move
2022-11-03 12:36:58 -04:00
8da3d277c7
add missing std moves
2022-11-03 12:35:10 -04:00
99e515fbfd
Fix:Fix possible nullptr dereferencing + refactorings.
2022-10-29 17:08:26 +02:00
ac87b9ce7e
fixed error with trailing zero symbol as placeholder character
2022-10-19 09:30:32 +03:00
35136bc90c
Merge branch 'master' into master
2022-10-18 19:25:14 +02:00
07aef23d24
Fix: Add missing ahndling for double export in json
2022-10-18 19:05:04 +02:00
e17976e6e2
* fix bug reading ply file in case of presence of "end_header\n<BINARY_DATA>..." with <BINARY_DATA> starting by "\n"
2022-10-14 13:16:18 +02:00
e0fb1674d1
Merge branch 'clang-fix' of github.com:slinky55/assimp into clang-fix
2022-09-30 22:04:11 -04:00
38ccb7e6c9
Used sizeof for buffer sizes instead of hardcoding values
2022-09-30 22:03:59 -04:00
5f28370f7f
Merge branch 'master' into clang-fix
2022-09-30 21:57:32 -04:00
e2e45f7a14
Fixed issue with clang complaining about sprintf being depreciated
2022-09-30 00:34:33 -04:00
7eb9edf0b9
Make FBX parser resilient to missing data streams
2022-09-21 11:45:54 +02:00
6415c0bfc9
FIX: Use attribute to fix warning.
2022-09-20 21:39:09 +02:00
1f61f0c3de
FIX: Caculate buffer end pointer after initing all attributes
2022-09-20 21:35:44 +02:00
f1766c4bd5
FIX: Fix head overflow in MD5-parser.
2022-09-20 21:03:58 +02:00
b3c7bdbdd6
Add check for wall switch from cmake
2022-09-17 18:16:42 +02:00
e4c77aa4fa
Fix: Use ASCII treeview in assimp-cmd.
2022-09-16 21:55:14 +02:00
b2ea018fd5
Use user-define element destructor.
2022-09-11 17:04:58 +02:00
7b874983d0
Merge branch 'master' into SmallAllocationFixInFBXLoader
2022-09-08 20:15:52 +02:00
4c9d270a5e
-Vertex export fix
2022-09-07 23:10:31 +02:00
d15b4ad7ef
add missing light data to assbin import/export
2022-09-05 16:09:24 +02:00
411171fa45
Apply some more modernize-use-emplace
2022-09-02 11:20:02 -04:00
e3b01e10db
apply fixes to more headers
2022-09-01 12:28:45 -04:00
4c6652f5b0
Add a handful of missing fixes
2022-09-01 11:37:53 -04:00
f527e56f22
Merge branch 'master' into explicitly-default-dtors
2022-08-30 22:21:06 +02:00
02e6c425f9
Fix ordering of initalizer list
2022-08-27 15:20:53 +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
6fa21dcc6e
Explicitly default all empty dtors
2022-08-25 11:32:59 -04:00
2b30b7e062
Merge branch 'master' into skylion007/modernize-use-emplace
2022-08-24 11:48:30 +02:00
659195d852
Fix the fixme
...
- Based on the implementation in top of the last one I guess I know how to fix that.
- Replacing push_back by emplace_back
2022-08-24 11:17:10 +02:00
0d8723a3eb
Add FIXME comment
2022-08-24 10:43:40 +03:00
654ae3af4e
Fix out of bounds access in X3D loader
2022-08-24 10:42:01 +03:00
25add7baa2
Merge branch 'master' into skylion007/modernize-use-emplace
2022-08-23 15:14:48 -04:00
87f601531c
Merge branch 'master' into master
2022-08-23 21:14:45 +02:00
b176061c41
Remove extra space in emplace insertions
2022-08-23 11:46:30 -04:00
27edb43600
Apply modernize-use-emplace clang-tidy rule
2022-08-23 11:41:49 -04:00
f890bc791f
Fix out of bounds write
2022-08-23 14:38:27 +03:00
68bc6a06b9
Use unique_ptr for aaiBones instead of explicit delete[]
2022-08-23 14:17:56 +03:00
03397d42e2
Use unique_ptr for aaiFaces instead of explicit delete[]
2022-08-23 14:15:06 +03:00
795c0abcc8
Apply modernize-loop-convert to the simplified loop
2022-08-23 14:10:23 +03:00
1ca44acebc
Simplify a for loop
2022-08-23 14:10:23 +03:00
712671e81a
Apply modernize-loop-convert again
2022-08-23 14:10:20 +03:00
5f28c51c03
Apply clang-tidy modernize-loop-convert transformation
2022-08-23 13:59:42 +03:00
2013ae114a
[WIP] Use ai_Real to write correct accuracy
...
- closes https://github.com/assimp/assimp/issues/4676
2022-08-18 17:41:07 +02:00
4c143eb581
Merge branch 'master' into master
2022-08-17 12:01:44 +03:00
1c59de42fc
Make some blender fields warn if missing instead of error
2022-08-17 11:42:32 +03:00
d2dc0401c3
Use weak pointer for ModifierData prev to avoid memory leak
2022-08-17 11:42:32 +03:00
30555282fe
Use weak pointer for ElemBase last to avoid memory leak
2022-08-17 11:42:32 +03:00
56b6446913
Use weak pointer for MirrorModifierData mirror_ob to avoid memory leak
2022-08-17 11:42:32 +03:00
90d1464405
Remove set but unused variables
2022-08-17 11:42:32 +03:00
2e64880abf
Inherit SubsurfModifierData and MirrorModifierData from SharedModifierData
...
This makes the cast in BlenderModifierShowcase::ApplyModifiers work
correctly and not invoke UB.
2022-08-17 11:42:32 +03:00
e43e3e11b9
Move SharedModifierData definition to BlenderScene.h
2022-08-17 11:42:32 +03:00
2c1943cd10
Improve BlenderDNA error message
2022-08-17 11:42:32 +03:00
89c4640744
Merge branch 'master' into master
2022-08-16 20:53:45 +02:00
d469c7b161
Remove exception on glTF 2.0 loading
2022-08-16 15:52:43 +03:00
baf14f6c16
Merge branch 'master' into master
2022-08-12 14:09:04 +02:00
76daadb95d
Merge branch 'master' into gltf2_metadata_export
2022-08-10 23:06:41 +02:00
4b85eb59c2
Fixes Heap-buffer-overflow READ in Assimp::ASE::Parser::ParseLV1SoftSkinBlock
2022-08-10 15:30:07 +01:00
253f8bfa62
Use unqualified uint32_t everywhere in FBXBinaryTokenizer
...
The use of qualified std::uint32_t requires including <cstdint> instead
of <stdint.h> on some implementations, and that breaks the build of Qt 6
on GCC 13. Just use the unqualified name everywhere.
2022-08-09 01:54:31 +03:00
5084a4d155
Use [[fallthrough]]; to mark whished fallthroughs
...
- closes https://github.com/assimp/assimp/issues/4654
2022-08-05 20:49:37 +02:00
abfe8ad413
Added suggested changes and fixed automated check errors
2022-08-01 14:39:10 +02:00
f20071d740
Merge remote-tracking branch 'origin/gltf2_metadata_export' into gltf2_metadata_export
2022-08-01 14:12:33 +02:00
da58fbe8fb
Got rid of gltf2::ExtrasValue and used gltf2::CustomExtension instead
2022-08-01 14:12:27 +02:00
cb4d0ab7aa
Added missing member copy in gltf2::ExtrasValue ctor.
2022-08-01 14:12:27 +02:00
233198baef
Fixed extras presence check in gltf2 import.
2022-08-01 14:12:27 +02:00
99c3104588
Rewrote gltf2 node extras import and added node extras export.
...
No support for AI_AIVECTOR3D metadata type. No support for json arrays of metadata, just json objects.
2022-08-01 14:12:27 +02:00
eac0876c9b
Refactoring: Use correct prefix for attributes in ObjImport.
2022-07-31 20:54:58 +02:00
dddfb74902
Fix another mem-leak
2022-07-31 13:37:42 +02:00
c349035cd1
Fix face memleak.
2022-07-31 12:10:43 +02:00
85f86ec076
Revert using face as pod type
2022-07-30 21:52:33 +02:00
0513eff44f
Merge branch 'master' into kimkulling/waveform_obj_optimizations
2022-07-30 13:15:42 +02:00
f6bcb160d0
Improvements of obj-parsers.
2022-07-30 12:58:09 +02:00
340d800739
Merge branch 'master' into master
2022-07-29 20:42:56 +02:00
4f6640278a
Merge branch 'master' into fix/collada_parser_sid
2022-07-29 19:17:43 +02:00
b0210cb3cf
Merge branch 'master' into patch-1
2022-07-29 17:48:14 +02:00
2b804c638f
Merge branch 'master' into gltf2_metadata_export
2022-07-25 21:48:46 +02:00
7c75a4c59b
Merge branch 'master' into master
2022-07-24 12:31:36 -07:00
73542f3830
Merge branch 'master' into patch-2
2022-07-24 12:11:18 +02:00
bdee65e577
Got rid of gltf2::ExtrasValue and used gltf2::CustomExtension instead
2022-07-22 01:33:05 +02:00
517fd3c76c
Added missing member copy in gltf2::ExtrasValue ctor.
2022-07-22 01:07:42 +02:00
5a2b811ba3
Fixed extras presence check in gltf2 import.
2022-07-22 01:04:05 +02:00
417481d17f
Rewrote gltf2 node extras import and added node extras export.
...
No support for AI_AIVECTOR3D metadata type. No support for json arrays of metadata, just json objects.
2022-07-22 00:44:51 +02:00
f07bc2c5b9
Merge branch 'master' into patch-3
2022-07-18 15:19:27 +02:00
05ececc387
Merge branch 'master' into patch-4
2022-07-18 14:06:29 +02:00
9ddc3a64d7
Fixes Crash in Assimp::ObjFileMtlImporter::getFloatValue
2022-07-16 13:55:08 +01:00
772cfdc757
Fixes Heap-buffer-overflow in Assimp::ObjFileParser::getFace
2022-07-16 13:50:54 +01:00
94c0e9d890
Fixes Heap-buffer-overflow in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch
2022-07-16 13:48:39 +01:00
a4274930e4
Fixes Heap-use-after-free in Assimp::DXFImporter::ExpandBlockReferences
2022-07-16 13:46:50 +01:00
0c07ea7c71
Fixes Heap-buffer-overflow in SuperFastHash
2022-07-16 13:44:46 +01:00
684909a691
Fix comments on PR
...
1) Use default instead of empty destructor
2) Remove debug code
2022-07-09 17:23:40 +02:00
3e424f8119
Merge branch 'assimp:master' into master
2022-07-09 17:17:01 +02:00
6ad8ea395a
Merge branch 'master' into fix_stl_for_over_4GB
2022-07-09 09:58:10 +02:00
e63426b89c
Fix collada parser fails on Mixamo exports
2022-07-08 23:42:41 +02:00
3890b5dff5
Add missing = operator
...
implicit assignment operator is depricated, these classes were missing
explicit definitions of this operator.
It is causing warnings, specifically -Werror=deprecated-copy
2022-07-08 18:16:02 +02:00
c3a89fd2d0
Fix non virtual destructor use
2022-07-08 18:16:02 +02:00
ae276987a0
Remove unnecessary const qualifiers
...
These changes are part of enable -Wall, this specific changes are for
-Werror=ignored-qualifiers
2022-07-08 18:16:02 +02:00
a10abe0283
Add fallthrough comment to switch case
...
This allows gcc to identify intentional fallthroughs, which are part all
-Wall. Specifically -Werror=implicit-fallthrough
2022-07-08 18:16:02 +02:00
c23146bb20
Use size_t for the file size in cpp file
...
This pointer juggling in combination with STL files >4GB caused some nasty illegal memory access bugs here. So let's fix it.
2022-07-08 10:26:03 +02:00
c5dfcac08a
Update D3MFOpcPackage.cpp
2022-07-08 10:25:40 +02:00
24d110199a
Use size_t for file size instead of unsigned int
...
This is one step to help us open files with more then 4 GB size.
2022-07-08 10:19:50 +02:00
e254f80a3a
Fix memory leak in D3MFOpcPackage
...
- closes https://github.com/assimp/assimp/issues/4628
2022-07-08 10:17:11 +02:00
e59b8fb448
Fix typo
2022-07-08 09:50:04 +02:00
70b2db19a8
Remove assertion test
...
- Code cleanup
- closes https://github.com/assimp/assimp/issues/4626
2022-07-08 09:47:33 +02:00
e9b08f35b2
Merge branch 'master' into master
2022-07-07 13:21:08 +02:00
77a2cdee76
Fix texture fetch for embedded textures in 3mf-files.
2022-07-06 20:59:42 +02:00
eeae6eac26
Update Q3DLoader.cpp
2022-07-05 23:01:18 +02:00
2d994e1a28
Fix possible bad_alloc exception for invalid file
...
- Fuzzer finding
- closes https://github.com/assimp/assimp/issues/3417
2022-07-05 22:50:54 +02:00
90b75cd6e7
Merge branch 'master' into fix/collada_empty_animation_name
2022-07-05 20:39:19 +02:00
5bce9e8ce5
Update MDLMaterialLoader.cpp
2022-07-05 20:09:16 +02:00
a6b1a35748
Try to fix issue 4238
...
- Fix possible nullptr dereferencing.
- closes https://github.com/assimp/assimp/issues/4238
2022-07-05 20:05:10 +02:00
6d26e91fc1
Merge branch 'master' into fix/collada_empty_animation_name
2022-07-05 09:28:39 +02:00
636d8bffe5
Merge branch 'master' into kimkulling/fix_memleak_in_xmlparser
2022-07-02 21:32:24 +02:00
9063216893
Fix a memory leak
2022-07-02 21:21:31 +02:00
0924c4710b
Fix nested animation name being lost in Collada
...
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-06-29 11:09:54 +08:00
d3c8201614
Fix token match string checks.
2022-06-28 20:31:03 +02:00
b392ff5ad1
Merge branch 'master' into otore19/sandbox
2022-06-21 21:34:50 +03:00
4f06c41802
Fix: Collada header updated
2022-06-21 21:08:11 +03:00
fff74a4ac0
Merge branch 'master' into patch-2
2022-06-21 13:39:23 +02:00
c2060a1f7e
Deletion: Removed unnessary header
2022-06-20 23:48:00 +03:00
1b53f41787
Feature: Utilizes removeEmptyBones flag for Collada
2022-06-20 23:46:29 +03:00
2486a681c1
Remove unused variable.
2022-06-20 21:07:34 +02:00
487a9aca2f
Add support for GCC v12
2022-06-16 19:23:55 -04:00
079b7deb33
Merge branch 'master' of https://github.com/assimp/assimp into fix/collada_parser_sid
2022-06-13 10:20:46 +08:00
5adea2dbcf
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-11 21:40:44 +02:00
aaa19903c6
Fix merge conflicts
2022-06-11 18:50:18 +02:00
02b0c89fa4
Fix usage of validation
2022-06-08 00:10:13 +02:00
4fb5cf4ba6
Fix possible nullptr exception
...
- closes https://github.com/assimp/assimp/issues/4418
2022-06-07 23:33:56 +02:00
aca02190a7
Merge branch 'master' into fix_FBXConverter_double_precision
2022-06-06 10:01:13 -04:00
39a4627519
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-02 21:47:29 +02:00
96d2052ed0
Merge branch 'master' into fix_fbx
2022-06-02 02:31:32 +09:00
03532eaec3
Merge branch 'master' into msvcfix
2022-06-01 17:11:06 +02:00
681eb3e91e
Fix Import a specific FBX model
2022-06-01 17:41:27 +09:00
e5cd85ac0c
Update M3DWrapper.h
2022-05-31 19:16:46 +02:00
472e15c405
Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467
2022-05-31 17:47:43 +02:00
f612865f22
fix msvc warnings-as-errors
2022-05-29 01:35:48 +02:00
26233f1b77
Fixed FBXConverter build error (warning as error) when ASSIMP_DOUBLE_PRECISION is defined
2022-05-26 15:06:23 -04:00
ddc63119b5
Using hex instead of decimal
2022-05-26 10:11:30 +02:00
7ce447294f
I ran into an error while processing colored binary stl. Just a type but
...
better be fixed.
2022-05-24 19:47:24 +02:00
6b0a7a21a4
Store SID in SID field
...
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-05-23 14:24:56 +08:00
ed3e218550
Bugfix: fix not initialized member attributes
2022-05-21 19:08:43 +02:00
002d6dc016
Inifinite loop on bad import files
...
I had an import file that caused an infinite loop. I don't exactly know how this algorithm works here but maybe we should change it more.
Probably calculate the amount of steps and chop linear.
2022-05-18 15:22:11 +02:00
0f780fe141
Merge branch 'master' into MMD_Fixes
2022-05-12 10:00:00 +02:00
787fcc160a
Clang-Tidy performance fixes
2022-05-11 14:03:45 -04: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
0afb594f40
Generate container for skeleton during FBX-Import
2022-04-28 21:19:10 +02:00
6cdd1d3cc6
Generate container for skeleton during FBX-Import
2022-04-28 21:12:26 +02:00
1ac9173e8c
Disable assertion tests floating point against inf for Intel oneAPI
...
- closes https://github.com/assimp/assimp/issues/4450
2022-04-28 10:08:01 +02:00
174b2fcf59
Fix invalid use of material reference.
2022-04-27 20:21:30 +02:00
37ec378b60
Fixx out-of-range access in ASE-Parser
...
- closes https://github.com/assimp/assimp/issues/4495
2022-04-27 19:52:23 +02:00
d14bff5a9f
Merge branch 'master' into master
2022-04-24 18:17:33 +02:00
f3c9c7b413
Merge branch 'master' into SmallAllocationFixInFBXLoader
2022-04-22 08:37:58 +02:00
a415f33fb5
merge failure, parts in this file were missing
2022-04-21 16:09:28 +02:00
d3646c3118
Proper destruction of individual objects
2022-04-20 16:11:09 +02:00
2b3c49cb93
All allocation changes
2022-04-20 12:33:39 +02:00
37be87b0bd
Some minor findings
2022-04-19 23:37:16 +02:00
8a1dc87b4c
remove absolute_transform in FBXConverter
2022-04-18 18:10:59 +03:00
e3def37f42
assing absolute_transform to matrix
2022-04-18 17:26:37 +03:00
863e3e0ccb
FbxConverter, bone mOffsetMatrix update
2022-04-18 16:02:17 +03:00
9ab6ebd363
Fix foreach
2022-04-18 04:11:06 +09:00
128242e371
Fix ogre xml serializer
2022-04-18 01:28:03 +09:00
feec92022f
Merge branch 'master' into MMD_Fixes
2022-04-13 21:07:58 +02:00
5ab1be8d04
Fixed deprecated class usage; removed unsupported C++17 feature
2022-04-13 11:38:57 +02:00
f26dc74f21
Fixed MMD Importer not loading files from buffer and enabled unit test
2022-04-13 02:51:12 +02:00
aa814a522d
Merge branch 'master' into obj-pbr-explicit
2022-04-12 11:12:58 +02:00
ae9f5b6fc5
Merge branch 'master' into user/jakras/bitangent-fuzzer-fix
2022-04-12 10:41:43 +02:00
6943e59886
Merge branch 'master' into obj-pbr-explicit
2022-04-08 14:36:57 +02:00
e5747dad9b
First concepts
2022-04-05 20:07:22 +02:00
97c7ab3c05
Move stb_image header into its own header file.
2022-04-05 19:53:41 +02:00
b8658cefe0
Link std_image statically.
2022-04-05 18:48:45 +02:00
88dadd6c40
Merge branch 'master' into patch-3
2022-04-02 11:22:33 +02:00
a050dee096
Fix compile error:When enable macro ASSIMP_DOUBLE_PRECISION
2022-03-31 16:08:39 +08:00
de6e90a657
Fix commit error
2022-03-31 15:36:57 +08:00
2152aae2a3
Fix compile error due to namespace conflicts in VC140.
2022-03-31 15:34:49 +08:00
cc515746f7
Fix v140 compile errror
2022-03-31 14:58:31 +08:00
8e075ce713
Update ObjFileParser.cpp
2022-03-31 14:53:33 +08:00
18c4ebaa13
Fix compile in VC140
2022-03-31 14:28:35 +08:00
4175198d04
Detect Roughness factor exported by Blender
...
Matches the logic used by Blender's own FBX exporter / importer.
2022-03-26 22:33:10 +01:00
537c46a42a
Prevent nullptr access to normals-array in bitangent computation
2022-03-23 15:45:09 +01:00
5ec7e57b99
Merge branch 'assimp:master' into master
2022-03-17 15:00:09 -04:00
68d33a6e13
Added support for more bone weights in GLTF2
...
The GLTF2 importer doesn't actually read beyond the first four bone weights (first attribute). This patch expands the parser to store as many bone weights as are available in the file.
2022-03-17 14:55:26 -04:00
765b38cf04
Update glTF2Asset.inl
...
Fixing mistakes in attribute names for GLTF. This causes attribute index to not be parsed out correctly (e.g. JOINTS_1) and fails the scene load.
2022-03-16 16:49:45 -04:00
c2b05acaa6
Fix stack-overflow in MDLLoader
...
- Use correct len to copy filename.
- Closes https://github.com/assimp/assimp/issues/4447
2022-03-16 13:59:21 +01:00
552f3a308d
Fix nullptr dereferencing
...
- Check if we have any texture coordinates before calculating them
- closes https://github.com/assimp/assimp/issues/4445
2022-03-16 10:08:20 +01:00
d594e6eea4
Merge branch 'master' into obj-pbr-explicit
2022-03-15 14:30:24 +01:00
68f3386c7b
Merge branch 'master' into metallic-roughness-split
2022-03-15 08:38:38 +01:00
72888c49f6
Merge branch 'master' into parse_obj_anisotropy
2022-03-15 08:13:35 +01:00
26bb601d8f
Fix includes
2022-03-12 08:03:27 +01:00
51e248909f
Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file.
2022-03-11 22:29:59 +01:00
26598dc6bd
Forget to save file.
2022-03-09 11:00:05 +01:00
76e10b96fc
Fix missing members and do some small refactorings.
2022-03-09 10:51:37 +01:00
ba379c20e1
Merge branch 'master' into fix/obj_with_bspline_crash
2022-03-06 17:39:57 +01:00
80a8807c47
Fix compiler warnings
2022-03-05 20:37:34 +01:00
d4527d4e87
Merge branch 'master' into master
2022-03-05 14:00:32 +01:00
cfe84b9260
Use generic METALNESS and DIFFUSE_ROUGHNESS texture types
2022-03-03 16:18:25 +01:00
52008ec989
Apply clang-format
2022-03-03 15:42:23 +01:00
9b227fc262
Fix getting anisotropy in obj
2022-03-03 01:01:34 +08:00
62930076af
Merge branch 'master' into fix/obj_with_bspline_crash
2022-02-26 04:03:59 +01:00
c73ff82fc4
FBXConvert::ConvertMeshMultiMaterial: allocate memory using variable count_vertices
2022-02-25 19:58:44 +08:00
72da1e6d7b
Merge branch 'master' into master
2022-02-23 21:20:39 +01:00
6f31254ae1
Ensure dictionary for LazyDics is created before adding content to it
2022-02-23 20:57:15 +01:00
4ddacdb5df
Expose the original OBJ illum model as a material property.
2022-02-22 17:55:41 -07:00
466b34cf53
Merge branch 'master' into kimkulling/fix_ordering_of_gltf2_issue4407
2022-02-22 21:09:11 +01:00
aa04ee89f1
Fix init order to fix build
2022-02-22 21:07:42 +01:00
a6808b868c
Small code cleanup
2022-02-22 21:07:23 +01:00
480d6fee2a
cleanup
2022-02-22 01:46:47 +01:00
62c9347985
fixed obj parsing with cstype
2022-02-22 01:32:41 +01:00
17123ed4a1
Add support for bump -bm (bump/normal multiplier)
2022-02-17 22:10:46 -07:00
9bf5d01469
Fix invalid initialization of constexpr.
2022-02-16 21:22:35 +01: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
067c5d9ec4
Refactoring: add usage of ai_epsilon to fbx.
2022-02-16 00:17:26 +01:00
Turo Lamminen
Kim Kulling
Johan Mattsson
Aaron Jacobs
Anton Vaneev
Matthias Möller
Robert Reif
PencilAmazing
krishty
Krishty
shimaowo
Martin Mory
Martin Mory
Andy Maloney
sashashura
Umesh Rajesh Ramchandani
Kim Kulling
Thomas Köppe
Adam Beili
naota29
Justice Colby
Adam
Jan Krassnigg
Aaron Gokaslan
Kim Kulling
Sergey
François Lozes
slinky55
slinky55
Florian Born
HiMemX
Gargaj
Aaron Gokaslan
vkaytsanov
vkaytsanov
Bengt Rosenberger
Aleks L
Ville Voutilainen
Bengt Rosenberger
Engin Manap
tanolino
Luca Della Vedova
Onur Berk Töre
kovacsv
PercentBoat4164
Matthew Clendening
nsg
Piroska Gabor
IOhannes m zmölnig
Mykhailo418
Ichiro
RedSkittleFox
xiaohunqupo
Filip Lundgren
Jan Krassnigg
Promit Roy
Promit Roy
Sergio Acereda
youkeyao
Jaroslav Pribyl
sola
Terence Russell