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

140 Commits

Author SHA1 Message Date
Orleonn
ab28db52f0 Added missing scene extras properties for glTF2Importer (#6397) 2025-11-18 15:58:41 +01:00
Kim Kulling
19108dff6a Fix linkage (#6388) 
* Fix linkage when all importers aren't part of the build.
 2025-11-16 20:05:50 +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
Kim Kulling
45898eee55 Refactorings: glTF cleanups (#6028) 2025-03-05 21:37:47 +01:00
Kim Kulling
9bb6f2e1b8 Use correct data type for animation key (#5998) 2025-02-12 00:26:01 +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
David Campos Rodríguez
016be03c3d glTF importers: Avoid strncpy truncating away the ' \0' character (#5931) 
* Fixing building errors from job https://github.com/assimp/assimp/actions/runs/12403918024/job/34628244451?pr=5928

* Adding some asserts for future mantainability, although a bit paranoic maybe

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-12-23 16:55:17 +01:00
Kim Kulling
9f3a7e95ab Fix: Fix name collision (#5937) 
* Fix: Fix name collision

* Fix: Fix possible override

* Fix: Use reentrant providing time function

* Fix: Fix override

* Update AssbinFileWriter.cpp

Revert, not portable.

* Update AssxmlFileWriter.cpp

Revert asctime_r, not portable.
 2024-12-23 12:23:42 +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
Kim Kulling
a51500ba2b Draft: Update init of aiString (#5623) 
* Draft: Update init of aiString

- closes https://github.com/assimp/assimp/issues/5622

* Update types.h

* Fix typo

* Fix another typo

* Adapt usage of AI_MAXLEN

* Fix compare operator

* Add missing renames
 2024-06-17 13:12:54 +02:00
Julian Uy
b6d53a0047 glTF2Importer: Support .vrm extension (#5569) 
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
 2024-05-13 13:24:41 +02:00
Kim Kulling
01231d0e60 Add 2024 to copyright infos (#5475) 2024-02-23 22:30:05 +01:00
Alexey Medvedev
dc399f7343 glTF KHR_materials_specular fixes 2023-12-11 11:09:18 +01:00
Kim Kulling
8cf2d6e588 Refactoring: Some cleanups 2023-11-12 21:09:33 +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
Marco Feuerstein
2875de132f Fix compilation on windows. 2023-06-29 08:20:51 +02:00
Marco Feuerstein
17fac97b04 Fix magic token usage. 2023-06-29 08:20:51 +02:00
Marco Feuerstein
1c0f3c5f87 Fix string length calculation. 2023-06-29 08:20:50 +02:00
Marco Feuerstein
a2bdfdd05a Improve binary check for gltf and gltf2. 
By checking the magic token we don't depend on the extension any more
and follow the official way to detect a gltf file as binary, see also
https://github.com/KhronosGroup/glTF/blob/main/extensions/1.0/Khronos/KHR_binary_glTF/README.md#header
and https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#binary-header.
 2023-06-29 08:20:50 +02:00
Kim Kulling
1ab4161cd7 Update glTF2Importer.cpp 2023-06-08 20:55:48 +02:00
Kim Kulling
186d7fd606 Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization 2023-06-08 13:16:08 +02:00
Kim Kulling
466f6960ac Merge branch 'gltf2_metadata_export' of https://github.com/C-Tech-Development-Corp/assimp into C-Tech-Development-Corp-gltf2_metadata_export 2023-05-30 08:14:49 +02:00
Kim Kulling
17c1a9125f Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization 2023-05-24 23:36:59 +02:00
Florian Born
d825eb7cf0 Skinning weights i gltf were broken by PR#5003 (vertex remapping) 2023-05-08 20:04:38 +02:00
Adam Beili
e193220ad8 Merge branch 'master' into refactor/KHR_material_specular 2023-04-06 02:42:18 +02:00
Kim Kulling
89ccc89298 Merge branch 'master' into fix_pretransform_vertices_with_cameras 2023-04-04 17:21:05 +02:00
Suhajda Tamás
9915e875bf glTF2: Fix incorrect camera position 2023-04-03 23:35:04 +02:00
Adam Beili
83053f3d56 Made usePbrSpecGloss a exportproperty, fixed mat_specular to spec 2023-03-26 16:55:38 +02:00
Adam Beili
fa00571049 fixed compilation bug 2023-03-26 14:52:44 +02:00
Adam Beili
c9177b7811 Merge branch 'master' into refactor/KHR_material_specular 2023-03-24 21:47:19 +01:00
Florian Born
8176c6a0e4 Adjusting the unit tests to pass new gltf 2023-03-10 18:36:43 +01:00
Florian Born
60cefdd549 Jan's fedback 2023-03-10 12:10:38 +01:00
Florian Born
dfd70b5c10 GLTF Importer: Build a list of the actual vertices so it works well with shared attribute lists 2023-03-09 19:06:58 +01:00
Kim Kulling
f830d7998e Merge branch 'master' into clean-up-ctors-dtors 2023-01-23 21:21:34 +01:00
Kim Kulling
036f2b3771 Merge branch 'master' into remove-stray-semicolon 2023-01-23 20:06:43 +01:00
shimaowo
b298b79a46 add missing parens 2023-01-17 10:53:41 -08:00
Krishty
36305cf987 Tidy Up Constructors and Destructors 
This commit does not add or remove c’tors or d’tors, so it is *not* ABI-breaking.

If a c’tor/d’tor does nothing else than the default behavior, this commit replaces it with “= default”.

If an initializer list entry does nothing else than the default behavior, this commit removes it. First and foremost, remove default c’tor calls of base classes (always called by the compiler if no other base c’tor is explicitly called) and c’tor calls of members with complex types (e.g. “std::vector”).

In a few instances, user-defined copy c’tors / move c’tors / assignment operators / move assignment operators were replaced with “= default”, too. I only did this if I had a clear understanding of what’s going on.
 2023-01-16 21:47:11 +01:00
Krishty
43a062a5d7 Remove Stray Semicolon 2023-01-16 20:45:00 +01:00
shimaowo
39cbef1e21 Fix: fix incorrect math for calculating the horizontal FOV of a perspective camera in GLTF2 import #4435 2023-01-16 11:39:13 -08:00
Adam Beili
54068637ee Merge branch 'master' into refactor/KHR_material_specular 2022-11-29 17:35:52 +01:00
Adam
822b240694 Support both pbrSpecGlos and materials_specular 2022-11-08 23:09:50 +02:00
Adam Beili
945d93b46a fixed indentation 2022-11-04 09:37:28 -07:00
Adam
852ea8325c Added support for KHR_materials_emissive_strength 
according to spec https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_emissive_strength
 2022-11-03 23:11:21 +02:00
Aaron Gokaslan
e93fa6699a Manually fix up 100 more instances where it should be defaulted 2022-08-25 12:20:13 -04:00
Kim Kulling
89c4640744 Merge branch 'master' into master 2022-08-16 20:53:45 +02:00
Bengt Rosenberger
da58fbe8fb Got rid of gltf2::ExtrasValue and used gltf2::CustomExtension instead 2022-08-01 14:12:27 +02:00
Bengt Rosenberger
233198baef Fixed extras presence check in gltf2 import. 2022-08-01 14:12:27 +02:00
Bengt Rosenberger
99c3104588 Rewrote gltf2 node extras import and added node extras export. 
No support for AI_AIVECTOR3D metadata type. No support for json arrays of metadata, just json objects.
 2022-08-01 14:12:27 +02:00
Jan Krassnigg
537c46a42a Prevent nullptr access to normals-array in bitangent computation 2022-03-23 15:45:09 +01:00