Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,584 Commits 19 Branches 43 Tags
ca17cdc1f99af6ac03899c82bd7a6073a203fe74
Commit Graph
6744 Commits
Author SHA1 Message Date
Julian KnodtandKim Kulling ca17cdc1f9 Do not create GLTF Mesh if no faces (#5878) 
Previously GLTF meshes were created even if there were no faces, which lead to GLTFs which were not technically valid.

I believe this fixes the problem I was encountering, but I've not been able to test it because of some Mac compile errors. Will test on a windows machine at some point.

Fixes #5868

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-12-01 21:21:08 +01:00
StefanandKim Kulling 739ebfd207 Synchronize DefaultLogger (#5898) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-12-01 20:35:24 +01:00
Gene WaltersKazuki Ykazu0617Kim KullingKim Kulling
 		2493deff37 USD Keyframe Animations (#5856) 
USD Keyframe Animations

Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
Co-authored-by: Kazuki Y <6259214+kazu0617@users.noreply.github.com>
Co-authored-by: kazu0617 <kazu0617@protonmail.com>
Co-authored-by: Kim Kulling <kim.kulling@googlemail.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-11-28 21:29:58 +01:00
Julian KnodtJulian KnodtKim Kulling
 		12f3309996 Simplify JoinVerticesProcess (#5895) 
Previously JoinVertices had a lot of extra complexity, simplify it greatly.

Co-authored-by: Julian Knodt <julianknodt@Julians-Air-2.attlocal.net>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-11-27 22:53:27 +01:00
Kim Kulling 5f100a0984 Obj: fix nullptr access. (#5894) 2024-11-25 19:58:58 +01:00
Kim Kulling 6fad13c82b Cleanup: Delete code/.editorconfig (#5889) 2024-11-22 11:38:51 +01:00
Julian KnodtandKim Kulling 48bd7c3e22 Check that mMaterials not null before access (#5874) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-11-20 23:26:07 +01:00
Kim Kulling 41cc2f66a4 Remove strcpy. (#5802) 
* Remove strcpy.

* Sonarcube: Add more strcpy replacements

* BlenderLoader: Replace strncpy by memcpy
 2024-11-18 16:54:58 +01:00
David Campos RodríguezandKim Kulling e7a6d33365 Try to resolve image paths by replacing backslashes or forward slashes in EmbedTexturesProcess (#5844) 
* Try to resolve image paths by replacing backslashes.

* Some changes suggested by CI

* Removed usage of <filesystem>.

* Removing usage of C++20/C++23 features

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-11-14 21:10:03 +01:00
Kim Kulling 9723b3554b Obj: Fix Sonarcube findings (#5873) 
* Obj: Fix Sonarcube findings
 2024-11-11 13:06:51 +01:00
Marco Feuerstein 6520354a58 Fix use of uninitialized value. (#5867) 
If the stat command fails, statbuf is uninitialized.
 2024-11-06 10:54:14 +01:00
Tobias Rittig, Ph.D.andKim Kulling e06b80f6b0 +Add vertex duplication during face normal generation (#5805) 
* +Add vertex duplication during face normal generation
`aiProcess_GenNormals` PostProcess now duplicates vertices if they are referenced by more than one polygon which results in the correct faceted appearance.

* Update GenFaceNormalsProcess.cpp

- Fix old spellings
- Use static_cast instead of c-style casts

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-11-02 09:03:59 +01:00
Steve MandSteve M 401279e2f9 Update tinyusdz (#5849) 
* Update tinyusdz to latest git commit

* Update patch file

* Bump to latest tinyusdz version

* Remove unused var (fix broken build for clients treating warnings-as-errors)

---------

Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
 2024-11-01 11:33:50 +01:00
Gene Walters 7634cf84ca USD Skinned Mesh (#5812) 
USD: Skinned Mesh support
 2024-10-31 21:48:28 +01:00
Michael SchmittMichael SchmittKim Kulling
 		e699d23559 Store current exception when caught in ASSIMP_CATCH_GLOBAL_EXCEPTIONS (#5810) 
In all other instances where we set mErrorString inside a catch block
we also set mException. I think that this was an oversight.

Co-authored-by: Michael Schmitt <michael.schmitt@visometry.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-10-29 10:59:37 +01:00
Steve MandSteve M f6c62605c7 Simplify re-enabling M3D build support (#5835) 
* Use CMake options to control M3D source compilation

* Revert .cpp file changes (better to treat them as external 3rd party code)

* Improve documentation

---------

Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
 2024-10-23 19:46:23 +02:00
Qingyou ZhaoandKim Kulling a383cb1ff7 Fix a bug in the assbin loader that reads uninitialized memory (#5801) 
* Fix a bug in the assbin loader that reads uninitialized memory

* Address review comment

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-10-18 20:41:47 +02:00
chefrolle695 4b9ac76815 Fixed bug in DefaultLogger::set: (#5826) 
assigning s_pNullLogger to the parameter "logger" is definitely wrong.
However, custom logger previously set from user must not be deleted.
The user itself must handle allocation / deallocation.
 2024-10-17 21:14:14 +02:00
Steve MandSteve M 2591d0e490 Fix broken normals: restore lines removed in commit cb22d53 of 4 May 2023 (#5824) 
Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
 2024-10-15 23:42:07 +02:00
Steve MandSteve M ce0a50ec21 Fix FBX animation bug introduced with 24 Mar 2020 commit 14b8d12 (revert conditional to prior state) (#5815) 
Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
 2024-10-14 11:24:27 +02:00
Pichas 811bf2df15 Fix issue 5767: Can't load USD from memory (#5818) 
* initial commit

* fix element size
 2024-10-13 21:11:45 +02:00
Steve MandSteve M cb4e663138 Restore 4x4 matrix functionn param and assignment prior to change in commit 168ae22 of 27 Oct 2019 (#5813) 
Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
 2024-10-12 12:49:10 +02:00
Kim Kulling ecdf8d24b8 SplitLargeMeshes: Fix crash (#5799) 
- Fix nullptr access when rootnode of the scene is a nullptr. This can happen even if the scene stores any kind of meshes. closes https://github.com/assimp/assimp/issues/5791
 2024-10-07 10:30:45 +02:00
Julian KnodtandKim Kulling 17399d198f FBX Blendshapes: Do not require normals (#5776) 
Some blendshapes don't have normal transformations, but Assimp currently requires that normals
be present. This removes that, and won't populate the normal field.

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-09-24 08:07:18 +02:00
Kim Kulling f63625256c Update CMakeLists.txt (#5782) 
- Disable function without a prototype for clang
 2024-09-17 09:41:37 +02:00
PichasandKim Kulling f4c7606faf fix no_valid_proc (#5774) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-09-16 09:17:22 +02:00
Lux f81ea6986c Restored absolute transform calculation due to https://github.com/assimp/assimp/pull/5349 which requires this now. (#5751) 2024-09-11 10:11:15 +02:00
dataislandandKim Kulling ab12e8d8ba Fix stack overflow (#5764) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-09-10 23:15:31 +02:00
dataislandandKim Kulling 3bd98611d7 Fix buffer overflow in MD3Loader (#5763) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-09-10 22:10:36 +02:00
dataislandandKim Kulling d468e633b1 Fix invalid access (#5765) 
* Fix invalid access

* Update SortByPTypeProcess.cpp

Some smaller refactorings.

* Update SortByPTypeProcess.cpp

Small refactorings.

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-09-10 09:12:01 +02:00
Kim Kulling 4024726eca Fix leak (#5762) 
* Fix leak

* Update utLogger.cpp
 2024-09-07 21:02:34 +02:00
Kim KullingandKim Kulling cd0ef869e3 Kimkulling/mark blender versions as not supported (#5370) 
* Cleanup defs + add deprecated macro

* Remove empty line

* Remove dead code

---------

Co-authored-by: Kim Kulling <kim.kulling@draeger.com>
 2024-09-05 23:40:19 +02:00
RichardTeaandKim Kulling ed3fccd5db Add option to ignore FBX custom axes (#5754) 
AI_CONFIG_IMPORT_FBX_IGNORE_UP_DIRECTION
Default false

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-09-05 21:03:26 +02:00
Matthias MöllerandKim Kulling ff2dc2fb2e Prevents PLY from parsing duplicate properties (#5743) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-09-04 11:54:24 +02:00
Tobias Rittig, Ph.D. f69e55058d Allow usage of pugixml from a superproject (#5752) 
When using CMake subprojects with an existing build of pugixml
this prevents Assimp from using its own copy.
 2024-09-03 21:45:30 +02:00
RichardTea c1ffbfec06 Zero-length mChildren arrays should be nullptr (#5749) 
- Children: Don't allocate a zero-length array
- aiNode::mChildren should be left nullptr instead.
 2024-09-03 10:26:27 +02:00
Kim Kulling 1e09642382 Ply-Importer: Fix vulnerability (#5739) 2024-08-30 19:43:39 +02:00
FavandKim Kulling 5e912e68da Update glTF2AssetWriter.inl (#5647) 
The total length is incorrect when exporting gltf2

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-29 23:55:18 +02:00
HaixiandKim Kulling 389bdedda7 FBX: add metadata as properties (#5675) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-29 21:38:34 +02:00
Olivier ChafikandKim Kulling f39f53e860 Fix casting typo in D3MFExporter::writeBaseMaterials (color channels < 1.0f were zeroed out) (#5681) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-29 21:27:13 +02:00
OGAWA KenIchiandKim Kulling 11daaf79a5 Fix to judge 'multi-configuration' correctly (#5720) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-29 21:09:17 +02:00
Matthias MöllerandKim Kulling 3e7e4c8c52 Fix potential memory leak in SceneCombiner for LWS/IRR/MD3 loader (#5721) 
* fix potential memory leak in scenecombiner

* also cleansup srclist

* de-duplicates before deleting

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-29 11:21:59 +02:00
Vincent Fazio 4338817ca2 Fix copying private data when source pointer is NULL (#5733) 2024-08-29 00:13:40 +02:00
SanchikuuusandKim Kulling 12ed0286e4 Added more Maya materials (#5101) 
* Added more Maya materials

Added Maya materials to list and add setting texture properties for getting lost textures to mesh

* Update utMaterialSystem.cpp

Now new enumerators are handled by a case label in utMaterialSystem.cpp

* Update material.h

- Fix tests: use the correct max material parameter

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-24 11:29:47 +02:00
Kim KullingKazuki Ykazu0617Kim Kulling
 		bb9db8409f Sparky kitty studios master (#5727) 
* upload contains "windows" in GH Actions

* Update ccpp.yml

* Update ccpp.yml

* Update ccpp.yml

* Update ccpp.yml

* Update ccpp.yml

* Update ccpp.yml

* Update ccpp.yml

* buildする方についてwindows-msvcのついている方にした

この二つ、何の違いがあるかいまいち理解してない…
clでビルドするかhunterでビルドするかの違い？

* upload/release対象のartifactを修正

追加当時のIssueを参考に修正(当時はHunterなかったっぽい)
https://github.com/assimp/assimp/commit/a9a0c3093226a23eb7558539bc6ebe5bcb98442b

* fix ccpp.yml -- fix matrix.name check for artifact

* fix ccpp.yml - build both hunter or not

* Update ccpp.yml

* Update ccpp.yml

* Update ccpp.yml

* Update ccpp.yml

* Update ccpp.yml

* Update ccpp.yml

* Fix verbose string + refactorings

* Revert "Fix verbose string + refactorings"

This reverts commit 824db16a68.

* Fix verbose string + refactorings

---------

Co-authored-by: Kazuki Y <6259214+kazu0617@users.noreply.github.com>
Co-authored-by: kazu0617 <kazu0617@protonmail.com>
Co-authored-by: Kim Kulling <kim.kulling@draeger.com>
 2024-08-22 11:09:14 +02:00
saceredaandKim Kulling d83904e3ee Expose aiGetEmbeddedTexture to C-API (#5382) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-21 21:15:57 +02:00
Kim Kulling bc6710a116 Fix leak in loader (#5718) 
* Fix leak in loader

 Closes https://github.com/assimp/assimp/issues/5717

* Free generated mesh on importer destruction.
 2024-08-17 13:49:09 +02:00
Steve MandSteve M d95a5c60ef Revert variable name (fix broken build on android) (#5715) 
Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
 2024-08-14 12:13:49 +02:00
Matthias MöllerandKim Kulling 12cdbb712c Fixes possible out-of-bound read in findDegenerate (#5679) 
This is possible, if the option "aiProcess_ValidateDataStructure" is deactivated as postprocessing step, but the option "aiProcess_FindDegenerates" is activated and the mesh contains invalid data structures

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-13 16:24:43 +02:00
Måns AndersenandKim Kulling 9485d49e93 include Exceptional.h in 3DSExporter.cpp (#5707) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-13 11:17:45 +02:00