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
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
5d8e5fd130
Update XFileParser.cpp
...
Fix typo
2022-02-15 16:10:33 +01:00
7c13b16d30
Add missing flush modes supported by zlib
2022-02-14 20:51:06 +01:00
416f823866
Merge branch 'kimkulling/introduce_compression' of https://github.com/assimp/assimp into kimkulling/introduce_compression
2022-02-14 20:25:27 +01:00
c718500c55
Fix last review findings and finish windows bits
2022-02-14 20:25:18 +01:00
9a585d7b3c
Merge branch 'master' into kimkulling/introduce_compression
2022-02-13 19:58:22 +01:00
52b6c4f7c0
Fix broken importer and add some review findings2
2022-02-13 18:44:22 +01:00
3e09d462fa
Fix compression for fbx
2022-02-12 09:25:45 +01:00
23b43d1825
Fix X-Importer decompress algorithm
2022-02-08 21:43:14 +01:00
27bcddfb1a
Migrate more importers to compression class
2022-02-08 20:43:47 +01:00
ce61ea56a5
Merge branch 'master' into kimkulling/introduce_compression
2022-02-07 10:02:51 +01:00
9a15ca1007
LWO: validate enum value before parsing it
...
- Check for valid enum values
- closes https://github.com/assimp/assimp/issues/4236
2022-02-07 09:08:23 +01:00
eb5a7938e0
Remove dead code
2022-02-06 21:16:04 +01:00
9335cc30ab
INtroduce compression class to encapsulate compression via zlib
2022-02-06 20:42:58 +01:00
f217bd4b5f
Update HMPLoader.cpp
2022-01-26 19:42:09 +01:00
305d1f45aa
Add some constants and fix compile
2022-01-26 19:36:38 +01:00
50b00d33b5
HMP: Fix override during copying position data
...
- Fix override
- closes https://github.com/assimp/assimp/issues/4235
2022-01-26 19:22:52 +01:00
06fffb4f83
ASE: Fix warning unreachable code
2022-01-24 20:05:25 +01:00
3e6fc3a64b
Merge remote-tracking branch 'origin/master' into bensewell-fixifcopening4343
2022-01-20 09:43:45 +00:00
c1968823ad
ASE: Fix material parsing
...
- Fuzzer error found when material access get's an out-of-bound access.
- Break parsing when material index gets out of range.
- closes https://github.com/assimp/assimp/issues/4232
2022-01-20 10:25:52 +01:00
cbc4459dda
Fix compile error: missing var
2022-01-19 22:03:11 +01:00
43763f53d6
Fix compile error: missing var
2022-01-19 22:00:53 +01:00
15b08f643a
Fix warning: unused variable
2022-01-19 21:55:24 +01:00
17d5633a5b
Add missing SImpleExtensionCheck
2022-01-19 21:42:14 +01:00
4cb76e6a18
Update UnrealLoader.cpp
2022-01-18 22:29:55 +01:00
12b01dd575
Update SMDLoader.cpp
2022-01-18 22:28:54 +01:00
7b24437f06
Update SIBImporter.cpp
2022-01-18 22:27:19 +01:00
ec63fe74ee
Update RawLoader.cpp
2022-01-18 22:26:16 +01:00
088658b359
Update Q3BSPFileImporter.cpp
2022-01-18 22:25:43 +01:00
b4dee9220d
Update Q3BSPFileImporter.cpp
2022-01-18 22:25:22 +01:00
ffc13f18ba
NFF: reenable canRead
2022-01-18 22:24:11 +01:00
331cb5ac72
Update M3DImporter.cpp
2022-01-18 22:23:01 +01:00
c3b91dd766
C4D. Fix merge conflicts
2022-01-18 22:21:58 +01:00
ea5996307a
Update B3DImporter.cpp
2022-01-18 22:20:37 +01:00
efd1d36aa9
Merge branch 'master' into krishty-new-file-detection
2022-01-18 22:17:50 +01:00
959af1ac4d
Revert change
2022-01-18 21:37:49 +01:00
7350baea93
Revert change
2022-01-18 21:36:55 +01:00
cf47411742
Revert change
2022-01-18 21:36:02 +01:00
1e80630d5d
Revert change.
2022-01-18 21:35:09 +01:00
037732c429
Revert change
2022-01-18 21:34:18 +01:00
cff213d4dd
Revert change
2022-01-18 21:33:05 +01:00
9d0006fecb
Revert change
2022-01-18 21:32:06 +01:00
5af79cac1d
Fix unittests + small refactorings
2022-01-18 21:23:43 +01:00
59f28e168e
Merge branch 'master' into jere9309/read_collada_materials
2022-01-18 09:55:33 -08:00
6e50b04ae0
Merge branch 'master' into IQM
2022-01-17 18:33:37 +01:00
f16e4fadc7
Merge branch 'master' into patch-1
2022-01-17 18:18:16 +01:00
415b0e19d9
Changes for gcc compatibility
2022-01-17 16:39:50 +00:00
65f2353105
IFC Reading: Fix opening reading.
2022-01-17 15:49:11 +00:00
cbde086bfb
Merge branch 'krishty-new-file-detection' of https://github.com/assimp/assimp into krishty-new-file-detection
2022-01-16 20:58:07 +01:00
acd70b35a0
Fix merge issues
2022-01-16 20:57:56 +01:00
6ad7505376
Merge branch 'master' into krishty-new-file-detection
2022-01-16 20:43:57 +01:00
05746acb07
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection
2022-01-16 20:41:24 +01:00
5aac72791d
Merge branch 'master' into jere9309/read_collada_materials
2022-01-12 10:12:58 -08:00
e671d087e1
Collada: Read all instance_material child nodes
2022-01-12 09:52:12 -08:00
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
f8abb015de
Merge branch 'master' into patch-1
2022-01-11 09:55:19 +01:00
f63b10bf45
OpenGEX: Fix usage of texture specular token
2022-01-10 21:22:44 +01:00
6b9732721a
Merge branch 'assimp:master' into common_base64
2022-01-10 21:15:31 +01:00
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
8cb5ab69b0
Merge branch 'master' into fix-bone-fit-check
2022-01-08 11:35:59 +01:00
776130534b
Fix nullptr-dereferencing
...
- Fix a possible nullptr-exception.
2022-01-06 22:35:32 +01:00
b14b34d2b8
LWSLoader: Fix out of bounds iterator access
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38947
Fix #4222
2022-01-05 15:43:16 -05:00
089fc7311a
GCC might have an issue with value type Errors
2022-01-05 10:34:27 +01:00
04d2d13172
Locale independent meter scale
...
`XmlParser::getRealAttribute(...)` will call `strtod` (or `wcstod`) which are both locale dependent. So on a German locale system a scale of 0.01 meter will be parsed to 0. In order to avoid that I use the `fast_atoreal_move<ai_real>()` method.
2022-01-05 10:10:38 +01:00
87e9dbac40
Fix bone fitted check in gltf2 exporter
2022-01-03 16:32:34 -07:00
125acf9ec8
Merge remote-tracking branch 'origin/master' into common_base64
2022-01-02 19:47:57 +01:00
bbe12240ca
Move Base64 encode/decode functionality to the common folder.
2022-01-02 19:47:43 +01:00
ab19cff328
Merge branch 'master' into pbr-obj
2021-12-31 08:33:30 +01:00
a86ab45161
Merge branch 'master' into ps-devel-fix-namespace-001
2021-12-31 08:20:24 +01:00
a099fe7cd3
BlenderScene: use explicit namespace instead of using namespace
...
Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320):
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-12-30 18:01:54 +01:00
2da06dd41a
Merge branch 'master' into fix-fbx-metalness-import
2021-12-26 17:31:33 +03:00
d11d2fc60d
fix Inter-Quake Model (IQM) Importer MSVC warnings
2021-12-24 18:36:25 +03:00
db2500c393
MDL: Do not try to copy empty embedded texture
...
- When an embedded texture is empty, skip it instead of trying to copy it. This must fail.
- closes https://github.com/assimp/assimp/issues/4238
- Found from the Google fuzzer.
2021-12-23 12:28:43 +01:00
635153b3a4
LWS-Import: Avoid access to empty string token
...
- Fix invalid access to string pointer when string token is empty
- closes https://github.com/assimp/assimp/issues/4222
2021-12-22 21:08:28 +01:00
19371af6e6
Support PBR properties/maps in Obj importer
2021-12-20 13:43:46 -05:00
46f618a6ef
add Inter-Quake Model (IQM) Importer
2021-12-18 15:34:58 +03:00
d7bf8d6e07
Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define.
2021-12-18 14:50:22 +09:00
53968550e4
Merge branch 'master' into fix-fbx-metalness-import
2021-12-17 12:08:55 +03:00
1afe7e6255
fix fbx import metalness
...
Can't import metalness textures in fbx importer
2021-12-16 12:09:06 +03:00
26dc168449
Merge branch 'master' into bugfix/import-crashes
2021-12-15 07:54:48 +01:00
cb657e4c13
Use correct XmlParser-methods and add some missing casts
2021-12-13 18:06:23 +01:00
54e60b031e
Merge branch 'master' into master
2021-12-12 21:12:37 +01:00
33c6762272
Update HMPLoader.cpp
...
- Fix possible division by zero
- closes https://github.com/assimp/assimp/issues/4235
2021-12-10 14:32:45 +01:00
68682d75b5
Fix nullptr dereferencing from std::shared_ptr
...
- Finding from fuzzer
- closes https://github.com/assimp/assimp/issues/4237
2021-12-10 08:39:21 +01:00
c2297e9199
Revert "FBXConverter : Fix timescales of FBX animations"
...
The previous patch was made by misunderstanding about mTime.
It is not real time value, but time ticks.
This reverts commit b8bf1eac04
2021-12-09 10:57:39 +01:00
6e090c88b8
fix index variable for surfaces
...
Closes: https://github.com/assimp/assimp/issues/4209
2021-12-07 12:13:31 +01:00
0e2ac2a91c
X3D: simplistic attempt to avoid crashes due to nullptr access
...
Related: https://github.com/assimp/assimp/issues/4201
while the crashes go away, i'm not sure whether this is the correct fix.
also, afaict the X3D importer produces wrong results anyhow
2021-12-01 12:21:29 +01:00
c8cdf3009e
X3D: replace 'here' debugging printout by an assertion.
...
if mNodeElementCur is NULL, we get a crash anyhow...
2021-12-01 12:19:19 +01:00
23d7811276
X3D: consistent initialization with nullptr
2021-12-01 11:35:06 +01:00
836963428e
Fix file-extension check for X3D-files
...
using the pre-existing and well-tested GetExtension() (which happens
to also normalize the extension), rather than attempting our own
buggy one...
Closes: https://github.com/assimp/assimp/issues/4177
2021-12-01 11:17:42 +01:00
834ec20008
Merge branch 'master' into master
2021-11-30 23:44:42 +01:00
d6f3f292f2
Merge branch 'master' into ms-maxvollmer/crashfixes2
2021-11-30 23:17:59 +01:00
4a37aa2ef8
Interpolate euler rotations for quaternion animations
...
FBX uses euler rotation but assimp library's base type is
quaternion. When assimp convert FBX some animation information
can be lost.
This patch interpolates euler-angle rotations and insert
additional keyframes for the FBX format.
2021-11-30 12:49:59 +01:00
095bd67e10
Fix memory leaks in CollectionObject by making ob a weak pointer and removing prev pointer.
...
Something was cyclic in CollectionObject and we don't traverse backwards anyways
2021-11-26 22:09:06 -04:00
e831ecf3c2
Add a separate test case for Blender 276 and update Box.blend to be 293
2021-11-26 22:09:06 -04:00
44fa1ec6a7
Make Blender importer aware of collections, and use them when available. Also add the default startup file for Blender 2.93
2021-11-26 22:09:06 -04:00
0015823bef
Reject files with an invalid byteLength value
2021-11-26 13:01:15 +00:00
38382715f7
Ensure we don't access the vector with an out of bounds index
2021-11-26 13:01:00 +00:00
1a5d66714f
Prevent out-of-range memory writes by sparse accessors
...
This turned up during fuzz testing. Corrupted data would make assimp write to random memory locations, leading to subsequent crashes.
2021-11-25 11:20:26 +01:00
60bfde78eb
Fixed an incorrect indeiciesType in the glTF2 sparse accessor.
2021-11-21 23:23:22 +09:00
0d857bcf9f
Merge branch 'master' into deprecated_gltfpbr_macros
2021-11-20 12:35:56 +01:00
74b3be194d
Read the Value, not the Attribute
...
Correct some mistakes made when moving to pugixml from IrrXML
Fixes #4179
2021-11-17 17:10:10 +00:00
bab8b8dbab
apply clangformat
2021-11-17 17:08:19 +00:00
c24f99cd0e
Redefine deprecated glTF-specific PBR material macros
...
Intended to support Qt5 QtQuick3D until it is ported to generic PBR
macros.
2021-11-16 11:42:59 +00:00
b1c336799c
Merge branch 'master' into master
2021-11-13 09:16:27 +01:00
b9937994ca
Fix glTF2 skinning bone weight exporting issue
2021-11-13 12:07:29 +08:00
1407491a67
glTF2 exporter buffer overrun issue fix.
2021-11-13 11:52:49 +08:00
159fadebbf
Update M3DExporter.cpp
2021-11-12 17:53:46 +01:00
0beacc3854
Merge branch 'master' into kimkulling-diable_m3m_issue-4126
2021-11-12 16:02:51 +01:00
f03dcc27c0
Update M3DExporter.h
2021-11-12 15:39:21 +01:00
e2ccd17494
Fix typo
2021-11-12 11:20:22 +01:00
157e032bde
Fix small findings
...
- Merge anonymous functions into one block.
- Some reformattings
2021-11-12 11:08:19 +01:00
37c81e7a28
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-12 10:37:19 +01:00
ece61c6c68
Update M3DWrapper.cpp
2021-11-12 09:17:32 +01:00
608bccd9cf
Update M3DWrapper.h
2021-11-12 09:13:48 +01:00
13731b37c4
Merge branch 'master' into 3ds_export_4157
2021-11-12 07:06:52 +01:00
43b0ef181a
Merge branch 'master' into fix_gltf_warning_4126
2021-11-11 20:30:07 +01:00
7120504c46
Merge branch 'master' into fix_aiMesh_abi_4162
2021-11-11 20:02:46 +01:00
eafb79e7dc
Merge branch 'Artenuvielle-x3d_pugi_migration_artenuvielle' of https://github.com/assimp/assimp into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-11 19:06:33 +01:00
952f0a53c9
Try to fix a leak
2021-11-11 19:06:25 +01:00
9f28ef4c25
Merge branch 'master' into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-10 20:43:39 +01:00
a31c979abc
Use helloworld as X3D-Testcase
2021-11-10 20:40:05 +01:00
8ed18621db
Fixes
2021-11-10 20:37:27 +01:00
b8a10e62f9
Remove optimization fence
2021-11-09 13:08:13 -05:00
86a25b62e4
Better aiMesh ABI compatibility with 5.0.1, make smaller
...
Move new mTextureCoordsNames member to end of struct
Convert to pointer-to-array, saving ~8KB per aiMesh in almost all cases
Add C++ accessor functions for simpler usage
2021-11-09 13:03:06 +00:00
30143e9626
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-09 10:53:58 +01:00
aaae3e3a10
size_t is 32bit on some platforms
...
Also assert if size_t is smaller than uint32_t (probably not necessary)
Note: 32bit builds will crash OOM if a really large model is loaded, as cannot allocate that much in total, let alone contiguously.
2021-11-08 15:05:20 +00:00
9433fc526a
Apply clangformat
2021-11-08 14:42:21 +00:00
69cafe64b4
Cap glTFv1 & 2 json size to ~4GB
...
Ensures size_t cannot overflow
Limits the maximum contiguous memory allocation to something plausible.
2021-11-08 14:41:13 +00:00
ee19ce6021
3DS Export: Add support for aiShadingMode_PBR_BRDF
...
Export as Phong.
If no Diffuse texture, export the PBR base color instead,
2021-11-08 11:06:15 +00:00
5a3401b69f
Update D3MFOpcPackage.cpp
...
- Log an error in case of a nullptr-exception in reading out the 3MF-Archive
- closes https://github.com/assimp/assimp/issues/4153
2021-11-02 10:38:38 +01:00
sashashura
Engin Manap
Kim Kulling
tanolino
Kim Kulling
Luca Della Vedova
Onur Berk Töre
kovacsv
PercentBoat4164
Matthew Clendening
nsg
Gargaj
Piroska Gabor
Aaron Gokaslan
IOhannes m zmölnig
Mykhailo418
Ichiro
RedSkittleFox
xiaohunqupo
Filip Lundgren
Jan Krassnigg
Promit Roy
Promit Roy
Sergio Acereda
youkeyao
Jaroslav Pribyl
sola
Terence Russell
Ben Sewell
Jeremy Sigrist
Jeremy Sigrist
Alex Rebert
Colin Reeder
Peter Seiderer
Vyacheslav Vanin
Garux
Rene Sepulveda
sssaoi
Inho Lee
IOhannes m zmölnig
Pencil Amazing
Max Vollmer (Microsoft Havok)
ruyo
RichardTea
freizhang