Turo Lamminen
e8f0eb930d
Fix loading binary LWO files
2023-02-24 14:40:27 +02:00
Turo Lamminen
3bdc43a216
Add debug logging to LWO node graph generation
2023-02-24 14:40:27 +02:00
Turo Lamminen
657c1d8ad0
Use unique_ptr to store pivot nodes until moved to mapPivot
2023-02-24 14:40:23 +02:00
Turo Lamminen
3bdfecb0ed
Destroy mapPivot nodes as we go
2023-02-24 13:26:34 +02:00
Turo Lamminen
be28f0949b
Whitespace
2023-02-24 13:20:40 +02:00
Turo Lamminen
53c6cc0966
Add a scope so mapPivot is destroyed when no longer used
2023-02-24 13:19:38 +02:00
Turo Lamminen
92f7c50c91
Remove dead code
2023-02-24 13:18:04 +02:00
Turo Lamminen
28d4e394c0
Use std::unique_ptr a bit
2023-02-24 13:17:32 +02:00
Kim Kulling
eb73464055
Merge branch 'master' into fix-fbx-document-duplicate-id-leak
2023-02-23 10:39:52 +01:00
Kim Kulling
2c3d52a5a1
Merge branch 'master' into master
2023-02-23 10:15:07 +01:00
Kim Kulling
c8d50dc83f
Merge branch 'master' into patch-2
2023-02-22 21:33:20 +01:00
Johan Mattsson
fa4273ee1f
Fix index out of bounds
2023-02-20 19:56:57 +01:00
Johan Mattsson
f8132bf17c
Fix index out of bounds
2023-02-20 19:50:06 +01:00
Aaron Jacobs
53e5f19b14
Use C++ style casts
2023-02-17 11:20:00 -08:00
Aaron Jacobs
e4386d3013
Fix implicit conversion errors on macOS
2023-02-16 15:21:43 -08:00
Anton Vaneev
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
Kim Kulling
3585dd577d
Fix: Add default parameter to constructor/destructor.
2023-02-16 11:19:23 +01:00
Kim Kulling
7877dab43a
Fix: Fix typo
2023-02-16 10:59:36 +01:00
Kim Kulling
bc8a122d88
Review finding: Use constexpr instead of macro
2023-02-16 09:28:35 +01:00
Kim Kulling
b170370e5c
Fix: Fix memleak when exiting method by exception
2023-02-08 21:29:54 +01:00
sunjc
fb146b7d39
fix typo, use a macro to avoid magic numbers.
2023-02-08 10:13:48 +08:00
sunjc
647f1e47fa
fix regression in join vertices post process.
2023-02-07 20:05:39 +08:00
Kim Kulling
839cd35a54
Merge branch 'master' into master
2023-02-04 19:08:39 +01:00
Matthias Möller
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
Robert Reif
88ef9eecc1
ACLoader: add support for reading more than one texture per object
2023-02-03 20:29:56 -05:00
Turo Lamminen
8d405d60d9
Fix Terragen loader
...
Fixes e8d2b84017
2023-02-03 11:44:27 +02:00
PencilAmazing
feb3e9ff7a
Merge branch 'master' into PLYcomments#4866
2023-02-01 13:05:55 -05:00
Kim Kulling
5caae1a86d
Merge branch 'master' into JoinVerticesProcessUsedVerticesMask
2023-01-31 21:03:32 +01:00
Kim Kulling
d6b8d61066
Merge branch 'master' into JoinVerticesProcessUsedVerticesMask
2023-01-30 20:58:21 +01:00
krishty
df28e7830f
Merge branch 'master' into fix-build-without-armaturepopulate-post-process
2023-01-29 01:14:33 +01:00
PencilAmazing
6dc12f57a2
Merge branch 'master' into PLYcomments#4866
2023-01-23 21:50:26 -05:00
Kim Kulling
57054415cf
Merge branch 'master' into fixLHNormals
2023-01-24 00:04:49 +01:00
PencilAmazing
4d733d80f1
Merge branch 'master' into PLYcomments#4866
2023-01-23 15:56:04 -05:00
Kim Kulling
b31c04e37c
Merge branch 'master' into fix-msvc-emplace-warnings
2023-01-23 21:37:41 +01:00
Kim Kulling
f830d7998e
Merge branch 'master' into clean-up-ctors-dtors
2023-01-23 21:21:34 +01:00
PencilAmazing
cb8320945d
Fix issue #4866 by continuing to resetting read loop after hitting a comment
2023-01-23 14:18:50 -05:00
Kim Kulling
036f2b3771
Merge branch 'master' into remove-stray-semicolon
2023-01-23 20:06:43 +01:00
Kim Kulling
3e20502e0f
Merge branch 'master' into fix_gltf2_camera_fov
2023-01-23 19:14:42 +01:00
Kim Kulling
3bd2f788f6
Merge branch 'master' into replace-variables-with-literals
2023-01-23 18:55:20 +01:00
AdamCichocki
5ed09b7ab6
usedVertexIndicesMask is now based on vector<boo> instead of vector<uint>
2023-01-23 16:39:06 +01:00
AdamCichocki
72b178b9fc
Optimized usedVertexIndices by using bitmask instead of unordered_set
2023-01-23 14:51:02 +01:00
Kim Kulling
f2f967b8ba
Merge branch 'master' into remove-useless-virtual
2023-01-22 20:25:45 +01:00
Kim Kulling
f8bc8293ce
Update FBXMeshGeometry.h
2023-01-22 16:48:45 +01:00
Kim Kulling
303c30668f
Merge branch 'master' into trim-whitespace
2023-01-22 16:37:43 +01:00
Kim Kulling
5ed01bcfa3
Ensure initializer exists
...
- Fixing a Codaxy finding.
2023-01-20 20:00:36 +01:00
Kim Kulling
81cf1369db
Set correct number of bones in mesh instance
2023-01-20 19:20:06 +01:00
Kim Kulling
ab0a119626
Update LimitBoneWeightsProcess.cpp
...
- Removing empty bones only if AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES is enabled.
- closes https://github.com/assimp/assimp/issues/4840
2023-01-20 19:14:04 +01:00
lsnoel
8d1256f472
Comments about winding order fix for gen normals
2023-01-20 14:55:06 +00:00
Kim Kulling
d331a7e5d4
Merge branch 'master' into fix-build-without-armaturepopulate-post-process
2023-01-20 13:52:13 +01:00
lsnoel
eb5d3c51e8
Correctly consider aiProcess_FlipWindingOrder AND aiProcess_MakeLeftHanded when generating normals
2023-01-19 16:46:29 +00:00
Krishty
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
shimaowo
20acfeaf97
Merge branch 'master' into fix_gltf2_camera_fov
2023-01-17 14:39:54 -08:00
shimaowo
b298b79a46
add missing parens
2023-01-17 10:53:41 -08:00
Martin Mory
7f6e96747b
Merge branch 'master' into f-FixWhitespaceBetweenTagAndNum
2023-01-17 13:32:39 +01:00
Martin Mory
a89d5c7cea
Merge branch 'master' into f-FixWhitespaceBetweenTagAndNum
2023-01-17 12:10:46 +01:00
Kim Kulling
e9f95e5ab6
Merge branch 'master' into fix-build-with-m3d-import-only
2023-01-17 11:22:00 +01:00
Kim Kulling
19dec716d3
Merge branch 'master' into fixJoinVerticesProcess
2023-01-17 09:11:43 +01:00
Krishty
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
Krishty
43a062a5d7
Remove Stray Semicolon
2023-01-16 20:45:00 +01:00
shimaowo
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
Krishty
3d3e856925
Trim Trailing Whitespace
2023-01-16 09:12:35 +01:00
Krishty
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
Krishty
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
touched the corresponding preprocessor checks and introduced a bug:
```
#ifndef ASSIMP_BUILD_NO_M3D_IMPORTER
#if !(ASSIMP_BUILD_NO_EXPORT || ASSIMP_BUILD_NO_M3D_EXPORTER)
class M3DWrapper {
```
When compiling
- with M3D import enabled,
- but with either export generally disabled or M3D export disabled specifically,
These checks evaluate to the wrong result and skip the definition, leading to a build failure in dependent code.
```
#if 1 // import enabled
#if !(1 || 1) // export disabled and M3D export disabled
```
This commit fixes the check to compile the definition if neither import is disabled.
2023-01-16 08:29:49 +01:00
Krishty
bad76fd0f1
Replace Variables With Literals
2023-01-16 08:18:36 +01:00
Krishty
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
Martin Mory
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
Kim Kulling
2d37f49f51
Remove deprecated comment
...
- closes https://github.com/assimp/assimp/issues/4869
2023-01-15 19:12:24 +01:00
Daniel Rösner
74af523b3e
Generalize JoinVerticesProcess for multiple UV and color channels
2023-01-12 13:13:46 +01:00
Kim Kulling
b393132b58
Merge branch 'master' into spelling
2023-01-08 17:43:55 +01:00
Kim Kulling
96b071bdb1
Fix: Fix possible division by zero
...
- closes https://github.com/assimp/assimp/issues/4860
2023-01-04 09:19:37 +01:00
Andy Maloney
e893248e7c
Fix several spelling mistakes & a comment
2023-01-01 13:31:48 -05:00
Kim Kulling
a8e50be781
Refactoring: Move asserthandler header to include
2022-12-23 16:19:39 +01:00
Kim Kulling
376f66a06d
Merge branch 'master' into master
2022-12-16 10:11:56 +01:00
Kim Kulling
c3d15a3f51
Fix minor review findings.
2022-12-16 09:03:40 +01:00
Kim Kulling
c92b84e38d
Merge branch 'master' into patch-10
2022-12-16 09:00:41 +01:00
Kim Kulling
db8ff41679
Update MD5Parser.cpp
2022-12-15 14:06:57 +01:00
Kim Kulling
2612950b7b
Merge branch 'master' into patch-9
2022-12-15 14:05:35 +01:00
sashashura
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
Alex
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
Alex
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
Umesh Rajesh Ramchandani
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
Kim Kulling
fec39154ed
Merge branch 'master' into floatwarnings
2022-12-08 14:18:35 +01:00
Kim Kulling
769b47ed0e
Ensure face pointer is not nullptr
...
- closes https://github.com/assimp/assimp/issues/4831
2022-12-08 09:35:11 +01:00
Kim Kulling
3f66b92797
Merge branch 'master' into master
2022-12-06 20:34:51 +01:00
Kim Kulling
9d57ac9cc5
Fix:Add missing semicolon.
2022-12-05 13:15:42 +01:00
Kim Kulling
81f85a6f93
Avoid undefined-shift in Assimp::ASE::Parser::ParseLV4MeshFace.
2022-12-05 13:07:52 +01:00
Gargaj
9c839f2d9a
more fixes
2022-12-03 20:44:57 +01:00
Gargaj
07d4e83f43
fix warnings-as-errors for msvc x64
2022-12-03 20:27:00 +01:00
Kim Kulling
62486c6e7c
FIX: Fix possible division by zero
...
- closes https://github.com/assimp/assimp/issues/4819
2022-12-02 09:24:51 +01:00
Kim Kulling
d8b9e2b64b
Merge branch 'master' into master
2022-12-02 08:41:43 +01:00
Kim Kulling
f578b15759
Merge branch 'master' into explspec
2022-11-30 14:03:09 +01:00
Thomas Köppe
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
Adam Beili
54068637ee
Merge branch 'master' into refactor/KHR_material_specular
2022-11-29 17:35:52 +01:00
Kim Kulling
8fb7ba3444
Merge branch 'master' into modernize-smartptrs-literals
2022-11-29 09:58:17 +01:00
naota29
ab82428bb5
Merge branch 'master' into master
2022-11-22 07:15:38 -08:00
Kim Kulling
5689ac7869
Add overfolow check for invalid data.
...
- closes https://github.com/assimp/assimp/issues/3422
2022-11-22 10:50:52 +01:00
Justice Colby
371d5c78f4
Updated ConvertMaterials function to assign appopriate material index when using material references.
2022-11-21 15:49:48 -08:00
Kim Kulling
1d1cd93371
Merge branch 'master' into KHR_materials_emissive_strength
2022-11-21 20:55:13 +01:00
Adam Beili
5441f07d05
Merge branch 'master' into refactor/KHR_material_specular
2022-11-19 17:40:22 +02:00
Adam
1cd5841b2f
.
2022-11-18 17:24:37 +02:00
Jan Krassnigg
08f2f0f82f
Don't hide out-of-memory during FBX import
2022-11-18 13:50:33 +01:00
Adam Beili
ce7a52fd19
Merge branch 'master' into refactor/KHR_material_specular
2022-11-10 20:21:30 +02:00
Adam
822b240694
Support both pbrSpecGlos and materials_specular
2022-11-08 23:09:50 +02:00
Adam Beili
95d98ec98b
fixed indentation error
2022-11-08 20:55:20 +02:00
Adam Beili
49bc22ddb5
Merge branch 'master' into KHR_materials_emissive_strength
2022-11-08 20:51:20 +02:00
Aaron Gokaslan
3730b7414f
Use make_shared in IFCBoolean
2022-11-08 11:30:53 -05:00
Aaron Gokaslan
d635bc6914
Fix some indentation
2022-11-08 11:19:12 -05:00
Aaron Gokaslan
ccfb175460
Apply various clang-tidy checks for smartprs and modern C++ types
2022-11-08 11:03:55 -05:00
Aaron Gokaslan
97cb1c6b15
Fix perfect fowards
2022-11-07 11:01:16 -05:00
Aaron Gokaslan
5a0df03d2b
Fix another missing move in glTFCommon.h
2022-11-07 09:34:00 -05:00
Adam Beili
945d93b46a
fixed indentation
2022-11-04 09:37:28 -07:00
Adam
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
Aaron Gokaslan
899f8e1d17
Remove redundant ctor
2022-11-03 12:46:40 -04:00
Aaron Gokaslan
02378b5e70
Add one more missing move
2022-11-03 12:36:58 -04:00
Aaron Gokaslan
8da3d277c7
add missing std moves
2022-11-03 12:35:10 -04:00
Kim Kulling
99e515fbfd
Fix:Fix possible nullptr dereferencing + refactorings.
2022-10-29 17:08:26 +02:00
Sergey
ac87b9ce7e
fixed error with trailing zero symbol as placeholder character
2022-10-19 09:30:32 +03:00
Kim Kulling
35136bc90c
Merge branch 'master' into master
2022-10-18 19:25:14 +02:00
Kim Kulling
07aef23d24
Fix: Add missing ahndling for double export in json
2022-10-18 19:05:04 +02:00
François Lozes
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
slinky55
e0fb1674d1
Merge branch 'clang-fix' of github.com:slinky55/assimp into clang-fix
2022-09-30 22:04:11 -04:00
slinky55
38ccb7e6c9
Used sizeof for buffer sizes instead of hardcoding values
2022-09-30 22:03:59 -04:00
slinky55
5f28370f7f
Merge branch 'master' into clang-fix
2022-09-30 21:57:32 -04:00
slinky55
e2e45f7a14
Fixed issue with clang complaining about sprintf being depreciated
2022-09-30 00:34:33 -04:00
Kim Kulling
981677d4b9
Merge branch 'master' into MakeFBXParserResilientToMissingStreams
2022-09-30 00:13:45 +02:00
Povilas Kanapickas
f6a590065c
Prefix symbols from stb_image.h
...
This makes it possible to link assimp statically into an executable with
another static library that includes stb_image.h without hiding its
symbols.
2022-09-23 04:08:21 +03:00
Povilas Kanapickas
22494bde17
Don't include stm_image implementation if using stb library from Hunter
...
Hunter compiles its own stb library binaries. Currently a second copy is
compiled by defining STB_IMAGE_IMPLEMENTATION in Assimp.cpp. This may
cause hard to understand bugs if this compiled copy ever becomes
different from what Hunter supplies.
2022-09-23 04:08:20 +03:00
Florian Born
7eb9edf0b9
Make FBX parser resilient to missing data streams
2022-09-21 11:45:54 +02:00
Kim Kulling
6415c0bfc9
FIX: Use attribute to fix warning.
2022-09-20 21:39:09 +02:00
Kim Kulling
1f61f0c3de
FIX: Caculate buffer end pointer after initing all attributes
2022-09-20 21:35:44 +02:00
Kim Kulling
f1766c4bd5
FIX: Fix head overflow in MD5-parser.
2022-09-20 21:03:58 +02:00
Kim Kulling
b3c7bdbdd6
Add check for wall switch from cmake
2022-09-17 18:16:42 +02:00
Kim Kulling
e4c77aa4fa
Fix: Use ASCII treeview in assimp-cmd.
2022-09-16 21:55:14 +02:00
Kim Kulling
b2ea018fd5
Use user-define element destructor.
2022-09-11 17:04:58 +02:00
Aaron Gokaslan
20755f4200
Perfect forward val to utMaybe
2022-09-09 10:55:45 -04:00
Kim Kulling
7b874983d0
Merge branch 'master' into SmallAllocationFixInFBXLoader
2022-09-08 20:15:52 +02:00
Kim Kulling
ad1d0fcb45
Merge branch 'master' into kimkulling/cleanup_after_review
2022-09-08 19:09:49 +02:00
Kim Kulling
3af53a42aa
Fix typo
2022-09-08 19:06:05 +02:00
Kim Kulling
fff977c0b5
Fix review findings.
2022-09-08 18:54:08 +02:00
HiMemX
4c9d270a5e
-Vertex export fix
2022-09-07 23:10:31 +02:00
Kim Kulling
8895ecf243
Merge branch 'master' into kimkulling/cleanup_after_review
2022-09-07 21:26:54 +02:00
Kim Kulling
362ff08855
Add doc + small unittest
2022-09-07 21:25:46 +02:00
Gargaj
d15b4ad7ef
add missing light data to assbin import/export
2022-09-05 16:09:24 +02:00
Kim Kulling
2a667cc637
Merge branch 'master' into patch-1
2022-09-04 09:52:42 +02:00
Aaron Gokaslan
411171fa45
Apply some more modernize-use-emplace
2022-09-02 11:20:02 -04:00
Aaron Gokaslan
e3b01e10db
apply fixes to more headers
2022-09-01 12:28:45 -04:00
Aaron Gokaslan
4c6652f5b0
Add a handful of missing fixes
2022-09-01 11:37:53 -04:00
Gargaj
a22aa75bca
fix vertices being joined duplicating weights
...
This bug causes weights to duplicate, i.e. one bone will have several (equal) weights assigned to the same vertex - which then has the potential to cause even bigger problems when combined with `LimitBoneWeightsProcess`.
2022-08-31 22:27:34 +02:00
Kim Kulling
f527e56f22
Merge branch 'master' into explicitly-default-dtors
2022-08-30 22:21:06 +02:00
Kim Kulling
80ae9afe4e
Add missing documentation.
2022-08-30 21:55:52 +02:00
Kim Kulling
25d7510b8c
Merge branch 'master' into kimkulling/cleanup_after_review
2022-08-29 22:17:39 +02:00
Kim Kulling
e34becff62
Enable portable linkage to fix build
2022-08-29 11:43:32 +02:00
Kim Kulling
0571ee21fb
Introduce unittest for BaseProcess.
2022-08-28 20:58:52 +02:00
Kim Kulling
02e6c425f9
Fix ordering of initalizer list
2022-08-27 15:20:53 +02:00
Kim Kulling
e4c383324a
Use string for constexpr
2022-08-27 15:11:54 +02:00
Kim Kulling
14186bcd6b
Code cleanup and some new unittests for edgecases.
2022-08-27 14:07:45 +02:00
J.G.Adams
9cd723e282
Wrong object is created here!
...
If I'm not mistaken. Because this is originally push_back(aniMeshVertex) instead of push_back(v).
And the fact that aniMeshVertex is just getting created and destroyed for nothing.
It need to be replaced with this then? A Clang-tidy syntax to create the same aniMeshVertex.
I found this in pull request #4527 I think it may need to be reviewed too.
2022-08-26 19:12:11 -04:00
Aaron Gokaslan
e93fa6699a
Manually fix up 100 more instances where it should be defaulted
2022-08-25 12:20:13 -04:00
Aaron Gokaslan
6fa21dcc6e
Explicitly default all empty dtors
2022-08-25 11:32:59 -04:00
Kim Kulling
2b30b7e062
Merge branch 'master' into skylion007/modernize-use-emplace
2022-08-24 11:48:30 +02:00
Kim Kulling
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
Turo Lamminen
0d8723a3eb
Add FIXME comment
2022-08-24 10:43:40 +03:00
Turo Lamminen
654ae3af4e
Fix out of bounds access in X3D loader
2022-08-24 10:42:01 +03:00
Aaron Gokaslan
25add7baa2
Merge branch 'master' into skylion007/modernize-use-emplace
2022-08-23 15:14:48 -04:00
Kim Kulling
87f601531c
Merge branch 'master' into master
2022-08-23 21:14:45 +02:00
Aaron Gokaslan
b176061c41
Remove extra space in emplace insertions
2022-08-23 11:46:30 -04:00
Aaron Gokaslan
27edb43600
Apply modernize-use-emplace clang-tidy rule
2022-08-23 11:41:49 -04:00
Turo Lamminen
f890bc791f
Fix out of bounds write
2022-08-23 14:38:27 +03:00
Turo Lamminen
68bc6a06b9
Use unique_ptr for aaiBones instead of explicit delete[]
2022-08-23 14:17:56 +03:00
Turo Lamminen
03397d42e2
Use unique_ptr for aaiFaces instead of explicit delete[]
2022-08-23 14:15:06 +03:00
Turo Lamminen
795c0abcc8
Apply modernize-loop-convert to the simplified loop
2022-08-23 14:10:23 +03:00
Turo Lamminen
1ca44acebc
Simplify a for loop
2022-08-23 14:10:23 +03:00
Turo Lamminen
712671e81a
Apply modernize-loop-convert again
2022-08-23 14:10:20 +03:00
Turo Lamminen
5f28c51c03
Apply clang-tidy modernize-loop-convert transformation
2022-08-23 13:59:42 +03:00
Kim Kulling
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
vkaytsanov
4c143eb581
Merge branch 'master' into master
2022-08-17 12:01:44 +03:00
Turo Lamminen
1c59de42fc
Make some blender fields warn if missing instead of error
2022-08-17 11:42:32 +03:00
Turo Lamminen
d2dc0401c3
Use weak pointer for ModifierData prev to avoid memory leak
2022-08-17 11:42:32 +03:00
Turo Lamminen
30555282fe
Use weak pointer for ElemBase last to avoid memory leak
2022-08-17 11:42:32 +03:00
Turo Lamminen
56b6446913
Use weak pointer for MirrorModifierData mirror_ob to avoid memory leak
2022-08-17 11:42:32 +03:00
Turo Lamminen
90d1464405
Remove set but unused variables
2022-08-17 11:42:32 +03:00
Turo Lamminen
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
Turo Lamminen
e43e3e11b9
Move SharedModifierData definition to BlenderScene.h
2022-08-17 11:42:32 +03:00
Turo Lamminen
2c1943cd10
Improve BlenderDNA error message
2022-08-17 11:42:32 +03:00
Kim Kulling
89c4640744
Merge branch 'master' into master
2022-08-16 20:53:45 +02:00
vkaytsanov
d469c7b161
Remove exception on glTF 2.0 loading
2022-08-16 15:52:43 +03:00
Kim Kulling
baf14f6c16
Merge branch 'master' into master
2022-08-12 14:09:04 +02:00
Bengt Rosenberger
76daadb95d
Merge branch 'master' into gltf2_metadata_export
2022-08-10 23:06:41 +02:00
Aleks L
4b85eb59c2
Fixes Heap-buffer-overflow READ in Assimp::ASE::Parser::ParseLV1SoftSkinBlock
2022-08-10 15:30:07 +01:00
Ville Voutilainen
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
Kim Kulling
5084a4d155
Use [[fallthrough]]; to mark whished fallthroughs
...
- closes https://github.com/assimp/assimp/issues/4654
2022-08-05 20:49:37 +02:00
Bengt Rosenberger
abfe8ad413
Added suggested changes and fixed automated check errors
2022-08-01 14:39:10 +02:00
Bengt Rosenberger
f20071d740
Merge remote-tracking branch 'origin/gltf2_metadata_export' into gltf2_metadata_export
2022-08-01 14:12:33 +02:00
Bengt Rosenberger
da58fbe8fb
Got rid of gltf2::ExtrasValue and used gltf2::CustomExtension instead
2022-08-01 14:12:27 +02:00
Bengt Rosenberger
cb4d0ab7aa
Added missing member copy in gltf2::ExtrasValue ctor.
2022-08-01 14:12:27 +02:00
Bengt Rosenberger
233198baef
Fixed extras presence check in gltf2 import.
2022-08-01 14:12:27 +02:00
Bengt Rosenberger
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
Kim Kulling
eac0876c9b
Refactoring: Use correct prefix for attributes in ObjImport.
2022-07-31 20:54:58 +02:00
Kim Kulling
dddfb74902
Fix another mem-leak
2022-07-31 13:37:42 +02:00
Kim Kulling
c349035cd1
Fix face memleak.
2022-07-31 12:10:43 +02:00
Kim Kulling
85f86ec076
Revert using face as pod type
2022-07-30 21:52:33 +02:00
Kim Kulling
0513eff44f
Merge branch 'master' into kimkulling/waveform_obj_optimizations
2022-07-30 13:15:42 +02:00
Kim Kulling
f6bcb160d0
Improvements of obj-parsers.
2022-07-30 12:58:09 +02:00
Kim Kulling
340d800739
Merge branch 'master' into master
2022-07-29 20:42:56 +02:00
Kim Kulling
4f6640278a
Merge branch 'master' into fix/collada_parser_sid
2022-07-29 19:17:43 +02:00
Kim Kulling
b0210cb3cf
Merge branch 'master' into patch-1
2022-07-29 17:48:14 +02:00
Bengt Rosenberger
2b804c638f
Merge branch 'master' into gltf2_metadata_export
2022-07-25 21:48:46 +02:00
Engin Manap
7c75a4c59b
Merge branch 'master' into master
2022-07-24 12:31:36 -07:00
Kim Kulling
73542f3830
Merge branch 'master' into patch-2
2022-07-24 12:11:18 +02:00
Bengt Rosenberger
bdee65e577
Got rid of gltf2::ExtrasValue and used gltf2::CustomExtension instead
2022-07-22 01:33:05 +02:00
Bengt Rosenberger
517fd3c76c
Added missing member copy in gltf2::ExtrasValue ctor.
2022-07-22 01:07:42 +02:00
Bengt Rosenberger
5a2b811ba3
Fixed extras presence check in gltf2 import.
2022-07-22 01:04:05 +02:00
Bengt Rosenberger
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
Kim Kulling
f07bc2c5b9
Merge branch 'master' into patch-3
2022-07-18 15:19:27 +02:00
Kim Kulling
05ececc387
Merge branch 'master' into patch-4
2022-07-18 14:06:29 +02:00
sashashura
9ddc3a64d7
Fixes Crash in Assimp::ObjFileMtlImporter::getFloatValue
2022-07-16 13:55:08 +01:00
sashashura
772cfdc757
Fixes Heap-buffer-overflow in Assimp::ObjFileParser::getFace
2022-07-16 13:50:54 +01:00
sashashura
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
sashashura
a4274930e4
Fixes Heap-use-after-free in Assimp::DXFImporter::ExpandBlockReferences
2022-07-16 13:46:50 +01:00
sashashura
0c07ea7c71
Fixes Heap-buffer-overflow in SuperFastHash
2022-07-16 13:44:46 +01:00
Engin Manap
684909a691
Fix comments on PR
...
1) Use default instead of empty destructor
2) Remove debug code
2022-07-09 17:23:40 +02:00
Engin Manap
3e424f8119
Merge branch 'assimp:master' into master
2022-07-09 17:17:01 +02:00
Kim Kulling
6ad8ea395a
Merge branch 'master' into fix_stl_for_over_4GB
2022-07-09 09:58:10 +02:00
Engin Manap
e63426b89c
Fix collada parser fails on Mixamo exports
2022-07-08 23:42:41 +02:00
Engin Manap
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
Engin Manap
c3a89fd2d0
Fix non virtual destructor use
2022-07-08 18:16:02 +02:00
Engin Manap
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
Engin Manap
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
Robert Osfield
8e062792cd
Build fix for compiling against minizip.
2022-07-08 12:46:27 +01:00
tanolino
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
Kim Kulling
c5dfcac08a
Update D3MFOpcPackage.cpp
2022-07-08 10:25:40 +02:00
tanolino
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
Kim Kulling
e254f80a3a
Fix memory leak in D3MFOpcPackage
...
- closes https://github.com/assimp/assimp/issues/4628
2022-07-08 10:17:11 +02:00
Kim Kulling
e59b8fb448
Fix typo
2022-07-08 09:50:04 +02:00
Kim Kulling
70b2db19a8
Remove assertion test
...
- Code cleanup
- closes https://github.com/assimp/assimp/issues/4626
2022-07-08 09:47:33 +02:00
Kim Kulling
e9b08f35b2
Merge branch 'master' into master
2022-07-07 13:21:08 +02:00
Kim Kulling
77a2cdee76
Fix texture fetch for embedded textures in 3mf-files.
2022-07-06 20:59:42 +02:00
Kim Kulling
eeae6eac26
Update Q3DLoader.cpp
2022-07-05 23:01:18 +02:00
Kim Kulling
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
Kim Kulling
90b75cd6e7
Merge branch 'master' into fix/collada_empty_animation_name
2022-07-05 20:39:19 +02:00
Kim Kulling
5bce9e8ce5
Update MDLMaterialLoader.cpp
2022-07-05 20:09:16 +02:00
Kim Kulling
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
Kim Kulling
6d26e91fc1
Merge branch 'master' into fix/collada_empty_animation_name
2022-07-05 09:28:39 +02:00
Kim Kulling
636d8bffe5
Merge branch 'master' into kimkulling/fix_memleak_in_xmlparser
2022-07-02 21:32:24 +02:00
Kim Kulling
9063216893
Fix a memory leak
2022-07-02 21:21:31 +02:00
Kim Kulling
55625d1af5
Use mingw.include
2022-06-30 20:58:34 +02:00
Luca Della Vedova
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
kimmi
d3c8201614
Fix token match string checks.
2022-06-28 20:31:03 +02:00
Kim Kulling
5598356157
Merge branch 'master' into master
2022-06-24 09:56:09 +02:00
Kim Kulling
855537f232
Merge branch 'master' into master
2022-06-24 09:04:37 +02:00
Kim Kulling
be2e6a1b24
Merge branch 'master' into w32fix
2022-06-24 08:31:41 +02:00
Onur Berk Töre
b392ff5ad1
Merge branch 'master' into otore19/sandbox
2022-06-21 21:34:50 +03:00
Onur Berk Tore
4f06c41802
Fix: Collada header updated
2022-06-21 21:08:11 +03:00
Gargaj
bca5650578
fix windows 32 bit builds
2022-06-21 13:40:49 +02:00
Kim Kulling
fff74a4ac0
Merge branch 'master' into patch-2
2022-06-21 13:39:23 +02:00
Onur Berk Tore
c2060a1f7e
Deletion: Removed unnessary header
2022-06-20 23:48:00 +03:00
Onur Berk Tore
1b53f41787
Feature: Utilizes removeEmptyBones flag for Collada
2022-06-20 23:46:29 +03:00
kovacsv
2486a681c1
Remove unused variable.
2022-06-20 21:07:34 +02:00
PercentBoat4164
487a9aca2f
Add support for GCC v12
2022-06-16 19:23:55 -04:00
Luca Della Vedova
079b7deb33
Merge branch 'master' of https://github.com/assimp/assimp into fix/collada_parser_sid
2022-06-13 10:20:46 +08:00
hgdagon
ce8081bd0a
Merge branch 'master' into master
2022-06-13 00:15:31 +04:00
Kim Kulling
5adea2dbcf
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-11 21:40:44 +02:00
Kim Kulling
aaa19903c6
Fix merge conflicts
2022-06-11 18:50:18 +02:00
Kim Kulling
02b0c89fa4
Fix usage of validation
2022-06-08 00:10:13 +02:00
Kim Kulling
4fb5cf4ba6
Fix possible nullptr exception
...
- closes https://github.com/assimp/assimp/issues/4418
2022-06-07 23:33:56 +02:00
Kim Kulling
e7daa5759b
Merge branch 'master' into master
2022-06-07 22:01:00 +02:00
Matthew Clendening
aca02190a7
Merge branch 'master' into fix_FBXConverter_double_precision
2022-06-06 10:01:13 -04:00
Kim Kulling
680ea6b0e0
Merge branch 'master' into fix_fbx
2022-06-03 11:21:41 +02:00
Kim Kulling
39a4627519
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-02 21:47:29 +02:00
Kim Kulling
638fda66da
Merge branch 'master' into issue4516
2022-06-01 20:47:13 +02:00
nsg
96d2052ed0
Merge branch 'master' into fix_fbx
2022-06-02 02:31:32 +09:00
Kim Kulling
03532eaec3
Merge branch 'master' into msvcfix
2022-06-01 17:11:06 +02:00
Underdisc
17289985a4
Update comment
2022-06-01 12:45:40 +02:00
Underdisc
02e0d1d05c
Remove dllexport tags from static library builds.
2022-06-01 12:26:04 +02:00
nsg
681eb3e91e
Fix Import a specific FBX model
2022-06-01 17:41:27 +09:00
Kim Kulling
b7a70ac707
Add compiler switgxh for using static linkage for std_image
2022-05-31 23:24:31 +02:00
Kim Kulling
05867f4752
Merge branch 'kimkulling/link_stb_image_statically_issue_4467' of https://github.com/assimp/assimp into kimkulling/link_stb_image_statically_issue_4467
2022-05-31 20:08:39 +02:00
Kim Kulling
de4fe01c94
Fix clang build
2022-05-31 20:08:26 +02:00
Kim Kulling
e28becbaf5
Update Assimp.cpp
2022-05-31 19:17:08 +02:00
Kim Kulling
e5cd85ac0c
Update M3DWrapper.h
2022-05-31 19:16:46 +02:00
Kim Kulling
4b25eb6c4b
Update Assimp.cpp
2022-05-31 19:09:22 +02:00
Kim Kulling
c0e141a6a9
Update StbCommon.h
2022-05-31 19:08:46 +02:00
Kim Kulling
b00923ebcd
Update Assimp.cpp
2022-05-31 19:08:29 +02:00
Kim Kulling
4e22635406
Update PbrtExporter.cpp
2022-05-31 18:31:19 +02:00
Kim Kulling
472e15c405
Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467
2022-05-31 17:47:43 +02:00
Kim Kulling
234e55fbb1
Use size_t
2022-05-31 07:29:54 +02:00
Gargaj
f612865f22
fix msvc warnings-as-errors
2022-05-29 01:35:48 +02:00
Matthew Clendening
26233f1b77
Fixed FBXConverter build error (warning as error) when ASSIMP_DOUBLE_PRECISION is defined
2022-05-26 15:06:23 -04:00
Piroska Gabor
ddc63119b5
Using hex instead of decimal
2022-05-26 10:11:30 +02:00
hgdagon
efbcdccac9
Fix GNUC check on Windows (2nd attempt)
2022-05-25 09:18:42 -07:00
hgdagon
affa85a36b
Fix GNUC check on Windows
2022-05-25 07:59:01 -07:00
Piroska Gabor
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
Luca Della Vedova
6b0a7a21a4
Store SID in SID field
...
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-05-23 14:24:56 +08:00
Kim Kulling
ed3e218550
Bugfix: fix not initialized member attributes
2022-05-21 19:08:43 +02:00
tanolino
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
Kim Kulling
58af6ba9db
Fix compier warning
2022-05-14 09:59:07 +02:00
Kim Kulling
deb1698cbe
Fixed formattings.
2022-05-14 09:56:38 +02:00
motazmuhammad
78dbef8711
Merge branch 'master' into master
2022-05-13 20:15:55 +01:00
motazmuhammad
36d730fc4e
add more comments
2022-05-13 20:10:19 +01:00
motazmuhammad
5d8b1649a4
Revert "use unordered_set to accelerate the vertix merging"
...
This reverts commit 0ffb91fbf1
.
2022-05-13 19:59:16 +01:00
motazmuhammad
0ffb91fbf1
use unordered_set to accelerate the vertix merging
2022-05-13 18:14:49 +01:00
Kim Kulling
9e4fc9a40c
Merge branch 'master' into assimp_resource
2022-05-12 10:38:03 +02:00
Kim Kulling
0f780fe141
Merge branch 'master' into MMD_Fixes
2022-05-12 10:00:00 +02:00
Aaron Gokaslan
787fcc160a
Clang-Tidy performance fixes
2022-05-11 14:03:45 -04:00
hgdagon
85d47dc359
Merge branch 'master' into assimp_resource
2022-05-07 18:03:44 +04:00
hgdagon
f86700f6f4
Merge branch 'master' into assimp_resource
2022-05-04 02:12:08 +04:00
hgdagon
936cc791f2
Move `ASSIMP_WARNINGS_AS_ERRORS` check
2022-05-03 13:01:20 -07:00
hgdagon
e97e7574ae
Merge branch 'master' into assimp_warnings_as_errors
2022-05-03 23:24:52 +04:00
Kim Kulling
3dd2dbd916
Merge branch 'master' into master
2022-05-03 17:19:06 +02:00
IOhannes m zmölnig
1d3d5c4bb6
Rename TextureTypeToString() to aiTextureTypeToString()
...
Closes: https://github.com/assimp/assimp/issues/4493
2022-05-01 13:27:42 +02:00
Kim Kulling
d5c798f325
Fix leak
2022-04-30 21:02:48 +02:00
U-DESKTOP-0R560PH\George
a7e2b3ad30
Fixed library names for MinGW/MSYS2
2022-04-30 08:14:16 -07:00
U-DESKTOP-0R560PH\George
694dc8a0c3
Add an option to treat warnings as errors
2022-04-30 08:08:34 -07:00
U-DESKTOP-0R560PH\George
94ebe71969
Resource script updates
2022-04-30 08:01:15 -07:00
Kim Kulling
64a6968254
Add skeleton generation to aiScene
2022-04-28 21:43:02 +02:00
Kim Kulling
0afb594f40
Generate container for skeleton during FBX-Import
2022-04-28 21:19:10 +02:00
Kim Kulling
6cdd1d3cc6
Generate container for skeleton during FBX-Import
2022-04-28 21:12:26 +02:00
Kim Kulling
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
Kim Kulling
174b2fcf59
Fix invalid use of material reference.
2022-04-27 20:21:30 +02:00
Kim Kulling
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
Kim Kulling
cce62fded1
Merge branch 'master' into master
2022-04-27 08:45:16 +02:00
Kim Kulling
d14bff5a9f
Merge branch 'master' into master
2022-04-24 18:17:33 +02:00
Kim Kulling
f3c9c7b413
Merge branch 'master' into SmallAllocationFixInFBXLoader
2022-04-22 08:37:58 +02:00
Florian Born
a415f33fb5
merge failure, parts in this file were missing
2022-04-21 16:09:28 +02:00
Florian Born
7f0509ae87
Stack allocator is now inline
2022-04-21 11:33:04 +02:00
Florian Born
0355ae967f
compile fix on other platforms
2022-04-20 17:57:03 +02:00
Florian Born
320775b939
Compile fix
2022-04-20 16:39:36 +02:00
Florian Born
d3646c3118
Proper destruction of individual objects
2022-04-20 16:11:09 +02:00
Florian Born
2b3c49cb93
All allocation changes
2022-04-20 12:33:39 +02:00
Florian Born
1d6ed840fb
Replace single allocations in fbx loader by block allocation
2022-04-20 12:14:35 +02:00
Kim Kulling
37be87b0bd
Some minor findings
2022-04-19 23:37:16 +02:00
Kim Kulling
7f913c180b
Merge branch 'master' into master
2022-04-19 15:23:09 +02:00
Mykhailo418
8a1dc87b4c
remove absolute_transform in FBXConverter
2022-04-18 18:10:59 +03:00
Mykhailo418
e3def37f42
assing absolute_transform to matrix
2022-04-18 17:26:37 +03:00
Mykhailo418
863e3e0ccb
FbxConverter, bone mOffsetMatrix update
2022-04-18 16:02:17 +03:00
Ichiro
9ab6ebd363
Fix foreach
2022-04-18 04:11:06 +09:00
Ichiro
128242e371
Fix ogre xml serializer
2022-04-18 01:28:03 +09:00
RedSkittleFox
feec92022f
Merge branch 'master' into MMD_Fixes
2022-04-13 21:07:58 +02:00
RedSkittleFox
5ab1be8d04
Fixed deprecated class usage; removed unsupported C++17 feature
2022-04-13 11:38:57 +02:00
RedSkittleFox
f26dc74f21
Fixed MMD Importer not loading files from buffer and enabled unit test
2022-04-13 02:51:12 +02:00
Kim Kulling
aa814a522d
Merge branch 'master' into obj-pbr-explicit
2022-04-12 11:12:58 +02:00
Kim Kulling
ae9f5b6fc5
Merge branch 'master' into user/jakras/bitangent-fuzzer-fix
2022-04-12 10:41:43 +02:00
Kim Kulling
6943e59886
Merge branch 'master' into obj-pbr-explicit
2022-04-08 14:36:57 +02:00
hgdagon
518d50d2e6
Fixes for Windows/MSYS2
2022-04-07 03:07:57 -07:00
Kim Kulling
e5747dad9b
First concepts
2022-04-05 20:07:22 +02:00
Kim Kulling
5c438963c0
Disable correct compiler-warning: unused-function.
2022-04-05 19:59:36 +02:00
Kim Kulling
97c7ab3c05
Move stb_image header into its own header file.
2022-04-05 19:53:41 +02:00
Kim Kulling
fa5a8476ee
Fix gcc warning: unused function
2022-04-05 19:04:29 +02:00
Kim Kulling
b8658cefe0
Link std_image statically.
2022-04-05 18:48:45 +02:00
Kim Kulling
88dadd6c40
Merge branch 'master' into patch-3
2022-04-02 11:22:33 +02:00
xiaohunqupo
a050dee096
Fix compile error:When enable macro ASSIMP_DOUBLE_PRECISION
2022-03-31 16:08:39 +08:00
xiaohunqupo
de6e90a657
Fix commit error
2022-03-31 15:36:57 +08:00
xiaohunqupo
2152aae2a3
Fix compile error due to namespace conflicts in VC140.
2022-03-31 15:34:49 +08:00
xiaohunqupo
cc515746f7
Fix v140 compile errror
2022-03-31 14:58:31 +08:00
Danny许
8e075ce713
Update ObjFileParser.cpp
2022-03-31 14:53:33 +08:00
Danny许
18c4ebaa13
Fix compile in VC140
2022-03-31 14:28:35 +08:00
Filip Lundgren
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
Jan Krassnigg
537c46a42a
Prevent nullptr access to normals-array in bitangent computation
2022-03-23 15:45:09 +01:00
Promit Roy
5ec7e57b99
Merge branch 'assimp:master' into master
2022-03-17 15:00:09 -04:00
Promit Roy
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
Promit Roy
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
Kim Kulling
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
Kim Kulling
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
Kim Kulling
d594e6eea4
Merge branch 'master' into obj-pbr-explicit
2022-03-15 14:30:24 +01:00
Kim Kulling
0904490150
Merge branch 'master' into issue_4349
2022-03-15 14:11:57 +01:00
Kim Kulling
b1dc8cfe56
Merge branch 'master' into master
2022-03-15 11:58:45 +01:00
Kim Kulling
68f3386c7b
Merge branch 'master' into metallic-roughness-split
2022-03-15 08:38:38 +01:00
Kim Kulling
72888c49f6
Merge branch 'master' into parse_obj_anisotropy
2022-03-15 08:13:35 +01:00
jaefunk
4457d9300a
Merge branch 'master' into issue_4349
2022-03-14 15:41:20 +09:00
Sergio Acereda
729ab8ae33
Trying to fix reorder error
2022-03-12 08:15:11 +01:00
Sergio Acereda
26bb601d8f
Fix includes
2022-03-12 08:03:27 +01:00
Sergio Acereda
51e248909f
Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file.
2022-03-11 22:29:59 +01:00
jaefunk
e02d51ec24
add ifndef guard for resolve to fails to compile
2022-03-11 10:51:13 +09:00
Kim Kulling
47f004517f
Add missing cast.
2022-03-10 10:33:29 +01:00
Jonas Karlsson
c14eccefaf
Fix 'i >= 0' always true bug
...
If 'disk_filename' does not contain a dot (.) then 'i' would overflow.
Making 'i' an int makes sure the for loop works as intended.
2022-03-09 23:05:47 +01:00
Terence Russell
efe92e9ec1
Merge branch 'assimp:master' into master
2022-03-09 10:15:41 -07:00
kimkulling
26598dc6bd
Forget to save file.
2022-03-09 11:00:05 +01:00
kimkulling
76e10b96fc
Fix missing members and do some small refactorings.
2022-03-09 10:51:37 +01:00
Terence Russell
b35879989c
Added missing ObjMaterial.h to CMakeLists
2022-03-08 20:00:22 -07:00
Kim Kulling
ba379c20e1
Merge branch 'master' into fix/obj_with_bspline_crash
2022-03-06 17:39:57 +01:00
Kim Kulling
80a8807c47
Fix compiler warnings
2022-03-05 20:37:34 +01:00
Kim Kulling
d4527d4e87
Merge branch 'master' into master
2022-03-05 14:00:32 +01:00
Sergio Acereda
cfe84b9260
Use generic METALNESS and DIFFUSE_ROUGHNESS texture types
2022-03-03 16:18:25 +01:00
Sergio Acereda
52008ec989
Apply clang-format
2022-03-03 15:42:23 +01:00
youkeyao
9b227fc262
Fix getting anisotropy in obj
2022-03-03 01:01:34 +08:00
Jaroslav Pribyl
62930076af
Merge branch 'master' into fix/obj_with_bspline_crash
2022-02-26 04:03:59 +01:00
sola
c73ff82fc4
FBXConvert::ConvertMeshMultiMaterial: allocate memory using variable count_vertices
2022-02-25 19:58:44 +08:00
Kim Kulling
72da1e6d7b
Merge branch 'master' into master
2022-02-23 21:20:39 +01:00
Kim Kulling
6f31254ae1
Ensure dictionary for LazyDics is created before adding content to it
2022-02-23 20:57:15 +01:00
Terence Russell
4ddacdb5df
Expose the original OBJ illum model as a material property.
2022-02-22 17:55:41 -07:00
Kim Kulling
466b34cf53
Merge branch 'master' into kimkulling/fix_ordering_of_gltf2_issue4407
2022-02-22 21:09:11 +01:00
Kim Kulling
aa04ee89f1
Fix init order to fix build
2022-02-22 21:07:42 +01:00
Kim Kulling
a6808b868c
Small code cleanup
2022-02-22 21:07:23 +01:00
Jaroslav Přibyl
480d6fee2a
cleanup
2022-02-22 01:46:47 +01:00
Jaroslav Přibyl
62c9347985
fixed obj parsing with cstype
2022-02-22 01:32:41 +01:00
Kim Kulling
52b106bf7e
Merge branch 'master' into master
2022-02-20 19:04:32 +01:00
youkeyao
ad766cb738
update the calculation and orthogonalization for bitangent
2022-02-20 17:15:11 +08:00
Terence Russell
17123ed4a1
Add support for bump -bm (bump/normal multiplier)
2022-02-17 22:10:46 -07:00
Jean-Christophe Fillion-Robin
33a48c6ca6
cmake: Fix assimp target install rule fully specifying component
...
This commit ensures generated install rules for the assimp target are
all consistently associated with components named after LIBASSIMP_COMPONENT
or LIBASSIMP-DEV_COMPONENT CMake variables.
It streamlines the packaging of specific components of assimp in client
projects leveraging the CPACK_INSTALL_CMAKE_PROJECTS variable.
Failing to do so leads to "/path/to/assimp-build/code/cmake_install.cmake"
file having install rules associated with a component called "Unspecified".
See https://cmake.org/cmake/help/v3.10/command/install.html#installing-targets
and https://cmake.org/cmake/help/v3.22/module/CPack.html#variable:CPACK_INSTALL_CMAKE_PROJECTS
2022-02-17 05:47:34 -05:00
Kim Kulling
9bf5d01469
Fix invalid initialization of constexpr.
2022-02-16 21:22:35 +01:00