Florian Born
f59a5fab1a
More GLTF loading hardening ( #5415 )
...
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-04 21:23:31 +01:00
Galen Xiao
b7b6601a75
feat:1.add 3mf vertex color read 2.fix 3mf read texture bug ( #5361 )
...
* feat:1.add 3mf vertex color read 2.fix 3mf read texture bug
* fix checks failed
* Trigger CI
---------
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-04 20:23:07 +01:00
Steve M
005399a671
Fix X importer breakage introduced in commit f844c33
( #5372 )
...
* Update XFileImporter.cpp
Comment out boneIdx conditional which caused massive breakage
* Update XFileImporter.cpp
Fix typo
* Update XFileImporter.cpp
Dummy whitespace change to attempt to re-trigger failing CI tests
---------
Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-04 10:38:07 +01:00
Kim Kulling
3990ec80a1
Kimkulling/fix bahavior of remove redundat mats issue 5438 ( #5451 )
...
* Fix crash in viewer
* Fix bevavior when material was not referenced
2024-02-01 21:27:04 +01:00
Kim Kulling
3476c79801
Static code analysis fixes ( #5447 )
...
* Static code analysis fixes
- Fix warning in LOW
* Fix possible out of bound access.
* Add default to class declaration
2024-01-31 09:30:54 +01:00
Kim Kulling
c08e3b4abb
Add bounds checks to the parsing utilities. ( #5421 )
...
* Add bounds checks to the parsing utilities.
* Fix merge conflicts in ACLoader.
* Fix loaders
* Fix unittest of AC-Loader.
* Remove dead code.
* Md5Parser fixes
* Fix md5-parsing
* Fix Merge conflict
* Fix merge conflicts.
* Md5: Fix warning: missing return statement.
2024-01-30 14:32:41 +01:00
tigertang
a02085ea98
Update StbCommon.h to stay up-to-date with stb_image.h.
...
This enables C++ API users to statically link Assimp into their projects along with stb_image.
2024-01-29 13:52:54 +01:00
Kim Kulling
a8d30f7e91
Update DXFLoader.cpp
...
revert it
2024-01-27 12:14:35 +01:00
Kim Kulling
c6fe03f7a5
Update DXFLoader.cpp
...
- Use constexpr instead of const.
2024-01-27 12:14:35 +01:00
seanth
8cde65bfe8
Updated AIC table
...
The previous table was in an incorrect order, leading to index references in DXF producing the wrong colours when converted.
Also added other entries to bring the total number of ACI colours up to the number that can be used in DXF files
2024-01-27 12:14:35 +01:00
seanth
240fa97fed
Update DXFLoader.cpp
...
Changed order of operations for insert positioning and scaling. Need to position the inserts before scaling it, otherwise the position ends up up being position*scale
2024-01-27 12:14:35 +01:00
seanth
727001b0ca
Update DXFLoader.cpp
...
Edited out line suspected to be causing changes in position when changes in scale are made to inserted BLOCKS
2024-01-27 12:14:35 +01:00
julianknodt
bdc08dd4a9
Encode full weight as double
2024-01-27 10:10:28 +01:00
Robert Reif
81c20a5c61
Improve acc file loading
...
Add warning and support for tolerating a common problem where objects have wrong kid count.
Add support for empty texture layers.
2024-01-09 21:13:13 +01:00
Andre Schulz
9d71a275c3
X3D: Don't convert IndexedLineSet polylines with > 2 indices to triangles/polygons
...
Currently, when the coordIndex attribute of an IndexedLineSet contains a
polyline with > 2 indices, X3DGeoHelper::coordIdx_str2faces_arr() will
incorrectly determine the primitive type to be aiPrimitiveType_TRIANGLE or
aiPrimitiveType_POLYGON instead of aiPrimitiveType_LINE.
To fix this, this commit adds functions to explicitly handle an IndexedLineSet.
Fixes #3101
2024-01-09 20:55:51 +01:00
copycd
b571501559
@ error
...
Cause a TypeError when arg is UNSET
2024-01-06 20:57:41 +01:00
tangxin
9776d47cca
fix: KHR_materials_pbrSpecularGlossiness/diffuseFactor convert to pbrMetallicRoughness/baseColorFactor
2024-01-05 21:49:21 +01:00
Kim Kulling
636fbd65b3
Refactorings: come code cleanups
2023-12-29 16:55:37 +01:00
Kim Kulling
263bebb5ba
Add a test before generating the txture folder
2023-12-29 16:55:37 +01:00
Kim Kulling
5d5496f1ad
Update MDLMaterialLoader.cpp
2023-12-22 13:23:08 +01:00
Kim Kulling
69dae9599a
Fix integer overflow
...
- closes https://github.com/assimp/assimp/issues/4930
2023-12-22 13:23:08 +01:00
Kim Kulling
9dddef9b9d
Update D3MFImporter.cpp
2023-12-22 10:49:54 +01:00
Kim Kulling
b9576e6992
Update D3MFImporter.cpp
2023-12-22 10:49:54 +01:00
Kim Kulling
274f64cbf1
Check validity of archive without parsing
...
- closes https://github.com/assimp/assimp/issues/5392
2023-12-22 10:49:54 +01:00
Kim Kulling
7b54b0f406
Fix leak
...
- closes https://github.com/assimp/assimp/issues/5390
2023-12-21 21:18:38 +01:00
Marka Ragnos
3ce8a58d41
Update DefaultIOSystem.cpp
...
Added missing whitespace
2023-12-20 20:55:04 +01:00
Alexander Wagner
d03ab3ef27
- fixed Exist function on Linux
2023-12-20 20:55:04 +01:00
Alexander Wagner
e86f1acb9b
- fixed q3bsp issue
2023-12-20 20:55:04 +01:00
Alexey Medvedev
762ad8e9b7
glTF KHR_materials_specular fixes
2023-12-11 11:09:18 +01:00
Alexey Medvedev
dc399f7343
glTF KHR_materials_specular fixes
2023-12-11 11:09:18 +01:00
Alexey Medvedev
a72289b327
glTF KHR_materials_specular fixes
2023-12-11 11:09:18 +01:00
Stephen Gold
213d73ebc6
correct grammar/typographic errors in comments (8 files)
2023-12-04 23:58:54 +01:00
Futuremappermydud
a0b3df6dbd
Fix target names not being imported on some gLTF2 models
2023-12-04 21:11:55 +01:00
Stephen Gold
769e82ce5e
FBXMeshGeometry: solve issue #5116 using patch provided by darktjm
2023-12-04 20:57:10 +01:00
Maksim Kostin
d311fa95c6
Fix double free in Video::~Video()
2023-12-01 11:14:22 +01:00
Maksim Kostin
f701d702e4
Fix buffer overflow in FBX::Util::DecodeBase64()
2023-11-29 11:12:39 +01:00
IOhannes m zmölnig
6f715edfa0
Drop disabled zlib.h inclusion stubs
2023-11-29 09:53:03 +01:00
IOhannes m zmölnig
bfdd154d14
Always include "zlib.h" (rather than .../contrib/zlib/zlib.h)
...
The path to the vendored zlib is set by the build-system,
so there's no need to add additional preprocessor magic
2023-11-29 09:53:03 +01:00
IOhannes m zmölnig
6f70e220e4
always include "utf8.h" (instead of contrib/.../utf8.h)
2023-11-29 09:53:03 +01:00
Kim Kulling
85f64c9131
Use correct time scaling
2023-11-28 21:10:18 +01:00
Kim Kulling
01f2549abe
Fix the build
2023-11-28 20:49:10 +01:00
Kim Kulling
384db8686e
Update FBXConverter.cpp
...
- Temporary fix bind pose storage in offset matrix
- Will close https://github.com/assimp/assimp/issues/5132
2023-11-28 20:49:10 +01:00
Kim Kulling
77a8f019e3
Fix: Check if index for mesh access is out of range
2023-11-22 10:14:26 +01:00
Alexandre Avenel
e4e2c63e0c
Fix heap-buffer overflow in PLY parser
2023-11-20 08:43:17 +01:00
Alexandre Avenel
aae93691b9
Fix container overflow in MMD parser
...
Using reserve, buffer size is not updated. Since data is directly inserted and not using push_pack,
this can lead to a container overflow.
2023-11-17 14:33:17 +01:00
Florian Born
6004290dde
Use the correct allocator for deleting objects in case of duplicate animation Ids
2023-11-16 10:02:16 +01:00
Wojciech Matyjewicz
069e19487c
Fix parsing <init_from> in <image>.
...
The regression was introduced in 21678df
.
2023-11-16 08:50:10 +01:00
Wojciech Matyjewicz
2235518b3c
Fix parsing <instance_image> in <sampler2D>.
...
The regression was introduced in 904f17f
.
Since all the cases are now fully handled at the child level,
visiting the whole subtree is changed into iteration over the children.
2023-11-16 08:50:10 +01:00
copycd
8648c2af45
fix mesh-name error.
2023-11-15 13:04:10 +01:00
Kim Kulling
f0e7448fdc
Remove double delete
2023-11-14 22:09:56 +01:00
julianknodt
9efbbe0a69
Read int from uvwsrc
...
Previously was reading a uint, which always failed. Since the output was never checked, this
seemed to work, and works fine for most models since they only use UV channel 0.
2023-11-14 16:31:56 +01:00
Kim Kulling
4535e37fc6
Fix namespaces.
2023-11-12 21:09:33 +01:00
Kim Kulling
8cf2d6e588
Refactoring: Some cleanups
2023-11-12 21:09:33 +01:00
Kim Kulling
aa3abb3c06
Fix warning: remove printf
2023-11-10 15:36:40 +01:00
Kim Kulling
0b0ec713f6
Fix empty mesh handling
2023-11-10 15:36:40 +01:00
julianknodt
28ab0a094a
Fix incorrect deg->radian conversion
...
It seems that rotation matrices later expect radians.
This conversion breaks it, and was validated on the conversion of
`cesium_man.glb` --> `cesium_man.fbx`
2023-11-07 20:06:16 +01:00
Tárcio Vinícius
46b19cc6a4
utf8 header not found
2023-11-06 16:09:53 +01:00
Martin Aumüller
a521b23ab5
link to external minizip with full path
...
This let's cmake create config files that allow linking to minizip even when
in an unrelated prefix. This can happen with package managers that install
every package into their own prefix, such as [Spack](https://spack.io ).
2023-11-06 09:55:25 +01:00
Kim Kulling
108e3192a2
Update FBXBinaryTokenizer.cpp
...
- closes https://github.com/assimp/assimp/issues/5072
2023-11-05 17:57:29 +01:00
Kim Kulling
f844c3397d
Fix add checks for indices
2023-11-03 12:40:08 +01:00
Pavel Lukandiy
a7cfa3264a
Fix: Implicit Conversion Error
2023-11-02 16:19:42 +01:00
Kim Kulling
25aee03f66
Fix: Add missing transformation for normalized normals.
2023-10-29 10:05:25 +01:00
Sébastien Loriot
c44e3427aa
use size in order to be compatible with float and double
2023-10-24 14:02:38 +01:00
julianknodt
1169d3bc8c
Fix spelling error
2023-10-24 09:34:36 +01:00
Kim Kulling
2a347014f3
Update ImproveCacheLocality.cpp
2023-10-08 18:35:08 +00:00
Kim Kulling
a531c72f7f
Update ImproveCacheLocality.cpp
...
- closes https://github.com/assimp/assimp/issues/5262
2023-10-08 18:35:08 +00:00
Kawashima Satoshi
666ecd3f1f
Bug Fix:
...
Failed to get floating values (e.g. opacity) from scene material when ASSIMP_DOUBLE_PRECISION is defined, so they are not reflected to output fbx file.
2023-10-08 15:21:26 +00:00
fvbj
8fcc65a8af
Extension of data export to GLB/GLTF format
...
Allows to export unlimited (more than 4) bones per vertex
Use JOINTS_1,2,.. and WEIGHTS_1,2,...
Added AI_CONFIG_EXPORT_GLTF_UNLIMITED_SKINNING_BONES_PER_VERTEX flag
2023-10-08 14:43:53 +00:00
Kim Kulling
5b8cfa920b
Replace an assert by a error log.
2023-10-02 11:31:18 +02:00
Kim Kulling
d7cde43367
Fix: Add check for invalid input argument
2023-10-02 10:41:50 +02:00
ockeymm
7b6bf139cf
include memory.h to fix compile error
2023-10-01 16:11:20 +02:00
ockeymm
b2bfe6d253
Use unique_ptr to release old vertices data.
2023-10-01 16:11:20 +02:00
ockeymm
7a4d8ec412
Reduce memory consumption in JoinVerticesProcess::ProcessMesh() significantly
2023-10-01 16:11:20 +02:00
Kim Kulling
e5e3e07b84
Fix copyrights.
2023-09-23 18:35:48 +02:00
Kim Kulling
59b1234496
Update GenVertexNormalsProcess.cpp ( #5228 )
...
- closes https://github.com/assimp/assimp/issues/5074
2023-09-14 00:37:13 +02:00
Kim Kulling
aa1996e143
Mosfet80 clipper update ( #5220 )
...
* remove deprecated sprinf
* Update clipper
Updated Clipper to V6.4.2
* Fix the build
* Fix the build
* Disable hunter build
* Fix: Fix hided var.
* Fix invalid use of hunter enabled macro.
* Fix misconfig for hunter
* Disable removing contrib folder
* Update BlenderTessellator.h
* Remove Hunter-based includes
* Refactorings
* Remove final
* Update IFCCurve.cpp
* Update IFCCurve.cpp
---------
Co-authored-by: andrea <realeandrea@yahoo.it>
Co-authored-by: Kim Kulling <kim.kullingk@draeger.com>
2023-09-09 19:29:15 +02:00
OGAWA KenIchi
8d8a0a5af7
DXF: Support negative index in VERTEX
2023-09-01 18:26:53 +09:00
Kim Kulling
e41fe74b2a
Merge branch 'master' into semi-desert-master
2023-08-30 21:17:25 +02:00
Kim Kulling
8c8f974ea3
Merge branch 'master' of https://github.com/semi-desert/assimp into semi-desert-master
2023-08-30 21:16:21 +02:00
Kim Kulling
e79d105957
Merge branch 'master' into vulcano/export_gltf2_with_roughness_texture
2023-08-29 15:13:43 +02:00
Kim Kulling
cc2c5d3ae3
Merge branch 'master' into collada-ignore-unit-size-property
2023-08-29 14:01:40 +02:00
Kim Kulling
60b6d80936
Merge branch 'master' into xin-issue_5211
2023-08-24 21:03:57 +02:00
AnyOldName3
e50233b2c1
Use correct PDB paths
...
The previously-specified paths were only correct for a static library
build.
I therefore fenced off that code to be specific to static library
builds.
For shared library builds, I added a generator-expression-based
alternative.
Annoyingly, this won't work with static library builds, so we don't get
the concise, reliable version in all circumstances.
I've avoided modifying any of the paths anything ends up at to avoid
breaking changes.
Resolves https://github.com/assimp/assimp/issues/4269
2023-08-23 17:19:01 +01:00
tangxin
4389c3d80c
The texture strength attribute in aiMaterial set when importing and exporting gltf files is inconsistent
2023-08-23 14:54:40 +08:00
zhucan
d07934bf25
adjust comment
2023-08-18 01:03:49 +08:00
zhucan
554fa8f5e2
code format
2023-08-18 01:03:49 +08:00
zhucan
2b4606c082
add fallback strategy for metallicRoughnessTexture
2023-08-18 01:03:49 +08:00
朱灿
3a03fe31b1
gltf2 export diffuse roughness
2023-08-18 01:03:49 +08:00
zhucan
32716002ac
Add DIFFUSE_ROUGHNESS_TEXTURE for gltf2 exporter
2023-08-18 01:03:49 +08:00
Alex
5c45cdc0ad
Fix Invalid-free in Assimp::FBX::Scope::Scope
2023-08-16 07:45:23 +00:00
Kim Kulling
d77903423f
Merge branch 'master' into floatwarn
2023-08-15 12:55:37 +02:00
Aaron
0bfc588c39
Update Triangulate Process [more another case]
2023-08-15 18:01:16 +08:00
Kim Kulling
e5d9339c21
Merge branch 'master' into 5513536726761472
2023-08-12 08:05:27 +02:00
Kim Kulling
1c5dc86afb
Merge branch 'master' into fix_magic
2023-08-12 07:39:40 +02:00
Martin Weber
d8a7399a04
Merge branch 'assimp:master' into collada-ignore-unit-size-property
2023-08-10 08:10:18 +02:00
Alex
b9460dd959
Fix UNKNOWN READ in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch
2023-08-08 16:01:00 +00:00
Gargaj
49ed0711d1
Fix another warning
2023-08-05 15:43:31 +02:00
Gargaj
8312b31d27
fix warning-as-error
2023-08-05 15:39:47 +02:00
Martin Weber
bb1873dd22
Collada: added import property to disable unit size scaling
2023-08-04 09:54:55 +02:00
Alex
f7e7f82b9d
Add const
2023-08-03 17:10:17 +00:00