Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,550 Commits 19 Branches 43 Tags
2591d0e4902c006dd8366f1d72bf44be1c40cac6
Commit Graph
6726 Commits
Author SHA1 Message Date
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
mkuritsuandKim Kulling d41b6b253d Added AND condition in poly2tri dll_symbol.h to only define macros fo… (#5693) 
* Added ADD condition in poly2tri dll_symbol.h to only define macros for dynamic library linking if assimp is ordered to build as DLL

* Reverted last commit to handle this issue in a better way.

* added P2T_STATIC_EXPORTS to compile definitions when building assimp as DLL

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-13 09:39:53 +02:00
KimbattandKim Kulling 48c3a0ec46 FBX exporter - handle multiple vertex color channels (#5695) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-08-07 22:43:02 +02:00
Kim Kulling a37d748c17 Update DefaultIOSystem.cpp (#5697) 
- closes https://github.com/assimp/assimp/issues/5678
 2024-08-02 18:28:29 +02:00
Kim Kulling e63d3ed8e7 Make coord transfor for hs1 files optional (#5687) 
* Make coord transfor for hs1 files optional

* Add config switch for HS1 transformation transformation
 2024-07-31 18:39:39 +02:00
Kim Kulling 104a70f845 Return false instead of crash (#5685) 
- Return false instead of crash
- closes https://github.com/assimp/assimp/issues/5684
 2024-07-23 16:32:11 +02:00
Florian BornandKim Kulling 76de7cedf4 A fuzzed stride could cause the max count to become negative and hence wrap around uint (#5414) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-07-23 16:17:54 +02:00
JensEhrhardt-eOPUS c55158cd82 CalcTangents: zero vector is invalid for tangent/bitangent (#5432) 
* CalcTangents: zero vector is invalid for tangent/bitangent
 2024-07-23 13:13:12 +02:00
Kim Kulling db19f62a0c Merge branch 'master' of https://github.com/assimp/assimp 2024-07-22 09:11:17 +02:00
Stoyan GaydarovandKim Kulling 5d5e0bad3c Fix a fuzz test heap buffer overflow in mdl material loader (#5658) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-07-19 21:48:10 +02:00
Kim Kulling 9cf03b4ddc Introduce interpolation mode to vectro and quaternion keys (#5674) 
* Introduce interpolation mode to vectro and quaternion keys

* Update USDLoader.cpp

Fix review finding

* Update USDLoader.h

Fix review finding,
 2024-07-18 23:54:31 +02:00
Kim Kulling da281b7f48 Introduce interpolation mode to vectro and quaternion keys 2024-07-17 15:49:17 +02:00
Kim Kulling 35e4f1bf64 Kimkulling/fix double precision tests (#5660) 
* Make color single precision

* Fix the unittests for double precision

* Fix merge issues

* Fix issues with Vertex + Color4

* Fix vertex operator, some tests are still red.
 2024-07-12 14:37:49 +02:00
Steve MandSteve M 0cb1693689 [USD] Integrate "tinyusdz" project (#5628) 
* Squash development commits for PR

* Fix failing build on armeabi-v7a via android NDK

* Update with blendshape support

* Migrate to auto-cloning and patching tinyusdz (instead of manually copying files)

* Update to latest rendermesh-refactor branch commit

* Remove tracked file

* Update to use recent commit to "dev" branch

"rendermesh-refactor" was merged to "dev" around 9 May 2024 but merge
was not obvious from commit messages

* Add UNUSED() macro

(cherry picked from commit d89fe8f034c353cc5cc5b3ac78cd8845e006de38)

* Update tinyusdz branch

* Prevent per-ABI (x86, x86_64 etc) clone on android

* Add verbose logging cmake option

* Fix macro and patch

* Address compiler warnings

* Address compiler warnings

* Address compiler warnings

* Attempt prevent re-clone/re-patch once downloaded by any ABI build

* Disable tinyusdz clone/build by default

assimp github PR auto-CI checks clone/build the tinyusdz code, and reject PR
due to compiler warnings in the 3rd party external tinyusdz project

---------

Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
 2024-07-12 13:25:35 +02:00
Stepan HrbekandKim Kulling 206839d4f2 Allow empty slots in mTextureCoords (#5636) 
* Allow empty slots in aiMesh::mTextureCoords.
1.Explicitly say in documentation that empty slots are allowed (it was unclear).
2.Change GetNumUVChannels() implementation to allow empty slots.
3.Revert fraction of 2da2835b29 where empty slots are detected and error logged.

* Fix #5632 by reverting fraction of d6aacefa1e where Collada texcoords are renumbered to avoid empty slots.

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-07-10 09:01:53 +02:00
Kim Kulling 193f2c5d87 Fix compile warning (#5657) 2024-07-08 17:09:17 +02:00
Kim Kulling bff00b15f1 Replace raw pointers by std::string (#5656) 
* Replace raw pointers by std::string
 2024-07-06 13:59:02 +02:00
Matthias Möller d5cb1fe01f Fix potential heapbuffer overflow in md5 parsing (#5652) 2024-07-06 08:27:05 +02:00
Kim Kulling ddb74c2bbd Fix out of bound access (#5651) 2024-07-03 21:37:24 +02:00