Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,684 Commits 19 Branches 43 Tags
1933313ec82fe5f5a2feca949bced04cf194dda6
Commit Graph

6817 Commits

Author SHA1 Message Date
Kim Kulling
1933313ec8 Unreal refactorings (#6182) 
* Unreal refactorings

---------

Co-authored-by: Kim Kulling <kim.kulling@draeger.com>
 2025-05-16 14:18:37 +02:00
Julian Knodt
2c77d2555b [#5983] Fix bugs introduced in fbx export (#6000) 
There were some typos and incorrect offsets in a previous PR. This fixes part of it, correctly exporting the UV.

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-05-16 10:22:01 +02:00
Martin Mirchev
ed89a02fff Fix out-of-bounds dereferencing (#6150) 
* Fix out-of-bounds dereferencing

* Fix: Add log error entry.

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-05-16 09:07:04 +02:00
Kim Kulling
9d9a80739d Fix: Fix leak when sortbyp failes with exception (#6166) 
Co-authored-by: Kim Kulling <kim.kulling@draeger.com>
 2025-05-14 11:43:12 +02:00
Xavier Bonaventura
64073458bd Fix warning abut inexistent warning (#6153) 
These warnings are not existing before Visual Studio 2015

Fixes #6151

Co-authored-by: Xavier Bonaventura <xavier.bonaventura@gmail.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-05-13 20:37:42 +02:00
copycd
536cd59807 + Only up to recognizing the KTX2 compressed image as a texture object is handled. (#6139) 2025-05-08 21:28:30 +02:00
Kim Kulling
327afe0183 Fix crashes (#6138) 2025-05-07 23:40:53 +02:00
Kim Kulling
2056679e98 Fix: Support uint16 indices in OpenGEX as well (#6137) 
Co-authored-by: Kim Kulling <kim.kulling@draeger.com>
 2025-05-07 10:15:54 +02:00
Qingyou Zhao
af352d6f7c Fix a bug where string erases throws out of range (#6135) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-05-06 23:33:28 +02:00
Kim Kulling
d1b73dffec Replace exception by error in log (#6133) 
* Replace exception by error in log

* Separate tests for new behaviour

---------

Co-authored-by: Kim Kulling <kim.kulling@draeger.com>
 2025-05-05 14:07:52 +02:00
Kim Kulling
0c02313893 Refactor (#6127) 
* Refactor 3DS

---------

Co-authored-by: Kim Kulling <kim.kulling@draeger.com>
 2025-05-03 11:46:10 +02:00
Matthias Möller
9182879e1f fix: possible Heap-based Buffer Overflow in ConvertToUTF8 function (#6122) 
* fix: possible Heap-based Buffer Overflow in ConvertToUTF8 function

* Update BaseImporter.cpp

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-05-03 10:40:59 +02:00
Kim Kulling
275eca9535 Bugfix: Handling no of texture coordinates correctly (#6124) 
- If the mesh supports more than 2 texture coordinates this was not handled correctly. Now the code will be able to deal with 2 or 3 coords and throws an exception if this value gets invalid.
- closes https://github.com/assimp/assimp/issues/3829
 2025-04-29 20:03:58 +02:00
yuri@FreeBSD
cb56793e16 fix: Fix build on armv6/armv7 (#6123) 2025-04-27 21:27:45 +02:00
sSsA01
ac5988422a Refactoring of PR #6092 (#6101) 
* Fix fbx export. Nodes "LayerElementNormal" and "LayerElementColor" should be written only when actual data are exported.

* Update FBXExporter.cpp

- Fix intentions
- use empty instead of size for checking data exists

* refactoring

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-04-16 09:52:13 +02:00
Kim Kulling
4ee7b9d98d Use unique pointer to fix possible leak (#6104) 2025-04-15 21:51:05 +02:00
sSsA01
e68ea14f56 Not to export empty "LayerElementNormal" or "LayerElementColor" nodes to fbx (#6092) 
* Fix fbx export. Nodes "LayerElementNormal" and "LayerElementColor" should be written only when actual data are exported.
 2025-04-14 15:20:31 +02:00
Kim Kulling
2f3e72413f Bugfix/ensure collada parsing works issue 1488 (#6087) 
* Add text to ensure that float parsing in colladata works right
 2025-04-10 15:30:12 +02:00
krishty
55e6359436 More constexpr (#6066) 
Co-authored-by: Krishty <krishty@krishty.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-03-27 15:08:21 +01:00
krishty
b57f7d367c Harmonize Importer #includes (#6065) 
* Harmonize Importer #includes

Some importers referred to their headers via `#include "AssetLib/[format]/[header.h"`, others via `#include "[header].h"`, others mixed both (e.g. IRR). This is a matter of taste, but it should at least be done the same way everywhere.

Most importers seem to prefer `#include "[header].h"`, so this commit enforces it.

Cross-referencing files from other importers is still done through `AssetLib/[format]`.

Assimp headers are not affected and I would advise against changing them, as this could lead to subtle collisions with user includes.

* went one too far

---------

Co-authored-by: Krishty <krishty@krishty.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-03-27 11:13:44 +01:00
krishty
88959b2be7 Fix Whitespace (#6063) 
* Fix Whitespace

No functional changes. This commit removes trailing spaces, undesired line breaks, and formatting screwups.

* Remove more useless line breaks in license (500 out of 630 license copies do NOT use double line breaks here)

---------

Co-authored-by: Krishty <krishty@krishty.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-03-26 00:12:55 +01:00
leliel
79cba055b9 feat: created the aiGetStringC_Str() function. (#6059) 
* feat: created the aiGetStringC_Str() function.

The C++ Interface's function C_Str() from the aiString struct was missing an equivalent function for the C Interface.

* changed the first parameter of the aiGetStringC_Str function to be const.

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-03-25 22:03:52 +01:00
krishty
ac0b19a771 Remove Redundant virtual (#6064) 
The `override` keyword only applies to virtual functions. Specifying `virtual` again is useless.

Co-authored-by: Krishty <krishty@krishty.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-03-25 21:00:43 +01:00
krishty
cbf279d522 Fix Cinema4D Import (#6062) 
#5623 broke the Cinema4D import by forgetting to rename a constant. This commit fixes the invalid name.

Co-authored-by: Krishty <krishty@krishty.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-03-24 21:32:10 +01:00
Zhang Yuntong
d307c9f1d7 NDO: Fix possible overflow access (#6055) 
* NDO: Fix possible overflow access
- closes https://issues.oss-fuzz.com/issues/372765427

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-03-24 21:21:32 +01:00
Steve M
5a1cc9ec60 Update tinyusdz git hash (fix USD animation) (#6034) 
* Update tinyusdz

* Improve reference screenshots

* Add .csm reference screenshot

* Bump version

---------

Co-authored-by: tellypresence <praktique-tellypresence@yahoo.com>
 2025-03-17 20:47:28 +01:00
Steve M
a93b9f8c80 [OpenGEX] disable partial implementation of light import (causes model load failure) (#6044) 
* Disable OpenGEX lights and cameras which are suspected of causing model load failure

* Revert changes to camera import

---------

Co-authored-by: tellypresence <praktique-tellypresence@yahoo.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-03-16 13:32:17 +01:00
Kim Kulling
2690e354da CMS: Fix possible overflow access (#6052) 
- closes https://github.com/assimp/assimp/issues/6010
 2025-03-13 21:10:49 +01:00
Kim Kulling
e8a6286542 ASE: Use correct vertex container (#6051) 
- closes https://github.com/assimp/assimp/issues/6024
 2025-03-13 16:23:36 +01:00
Kim Kulling
2194944a25 Potential fix for code scanning alert no. 63: Potential use after free (#6050) 
- Ensure that code scanner will identify pointer as already released.

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
 2025-03-13 11:26:18 +01:00
Kim Kulling
4b8f55cc00 Bugfix: Fix possible nullptr dereferencing (#6049) 
* Bugfix: Fix possible nullptr dereferencing
 2025-03-13 11:04:25 +01:00
Kim Kulling
bcf11c252a MDL: Fix overflow check (#6047) 2025-03-13 00:07:41 +01:00
Kim Kulling
7f2c9d7b88 MDL: Limit max texture sizes (#6046) 
- closes https://github.com/assimp/assimp/issues/6022
 2025-03-12 21:37:25 +01:00
Kim Kulling
7c705fde41 ASE: Fix possible out of bound access. (#6045) 2025-03-12 21:12:02 +01:00
Kim Kulling
c1eedbba8e Fix: Let OpenGEX accept color3 types (#6040) 
- will set alpha channel to 1.0f, if no alpha channel was found.
- closes https://github.com/assimp/assimp/issues/6039
 2025-03-12 11:05:37 +01:00
T.Yamada
f398a70163 Use std::copy to copy array and remove user destructor to make sure is_trivially_copyable in order to avoid -Wno-error=nontrivial-memcall (#6029) 
Use std::copy to copy array and remove user destructor to make sure is_trivially_copyable in order to avoid -Wno-error=nontrivial-memcall (#6029)
 2025-03-11 15:09:10 +01:00
UnionTech-Software
70459b4d1f Fix memory leak in OpenGEXImporter (#6036) 2025-03-10 16:24:26 +01:00
Kim Kulling
45898eee55 Refactorings: glTF cleanups (#6028) 2025-03-05 21:37:47 +01:00
Kim Kulling
f52fcb6052 Obj: remove smooth-normals postprocessing (#6031) 
- closes https://github.com/assimp/assimp/issues/5514
 2025-03-03 09:44:35 +01:00
Kim Kulling
2bce77f909 IFC: Remove redundand check (#6006) 
- closes https://github.com/assimp/assimp/issues/5798
 2025-02-22 21:34:51 +01:00
Kim Kulling
5d716b8fe0 Bugfix/fix mingw issue 5975 (#6005) 
* MDL: Ensure alignment of bool vector
 2025-02-20 21:20:11 +01:00
Stefan
7945359a5c Use ear-cutting library for triangulation (#5977) 
* Use ear-cutting library for triangulation

Fixes #3609
Fixes #3019
Fixes #1136

* Fix typo

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-02-13 11:24:59 +01:00
Kim Kulling
9bb6f2e1b8 Use correct data type for animation key (#5998) 2025-02-12 00:26:01 +01:00
mosfet80
d41511bf8a Update STEPFileReader.cpp (#5973) 
Clean code

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-02-03 11:27:31 +01:00
1323236654
bc47836a8f fix: reduce gltf2 export time (#5972) 
* fix: reduce gltf2 export time

* fix: use std::less<> in std::map

---------

Co-authored-by: huangxinchuang <huangxinchuang@pointcode.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-01-25 21:50:33 +01:00
Pichas
31f0dcb4d1 add EXCLUDE_FROM_ALL (#5959) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-01-22 16:28:43 +01:00
Lutz Hören
ba4455c9c0 Added GLTF Extension KHR_materials_anisotropy (#5950) 
* added gltf extension KHR_materials_anisotropy

* Update glTF2Importer.cpp

---------

Co-authored-by: lutz.hoeren <lutz.hoeren@redplant.de>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-01-21 00:02:46 +01:00
Kim Kulling
79d451bf4b Avoid exporting all primitives, which are not triangles. (#5964) 2025-01-17 19:28:12 +01:00
BurntRanch
2a0969d4d9 Add customExtension support to the scene (#5954) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-01-17 16:09:23 +01:00
David Campos Rodríguez
1e44036c36 Prefix MTL textures with the MTL directory path (#5928) 
* Prefix MTL textures with the MTL directory path.

Path to textures defined in MTL files are relative to the MTL
file rather than to the OBJ, so we need to prefix them with the
MTL file directory path.

* Adding test issue 2355

* Trying to fix for Windows when file has Linux path

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2025-01-15 10:03:32 +01:00