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

98 Commits

Author SHA1 Message Date
Kim Kulling
01231d0e60 Add 2024 to copyright infos (#5475) 2024-02-23 22:30:05 +01:00
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
Alexey Medvedev
a72289b327 glTF KHR_materials_specular fixes 2023-12-11 11:09:18 +01: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
e947471549 Merge branch 'master' into refactor/KHR_material_specular 2023-05-22 09:49:01 +02:00
Kim Kulling
71366fff8e Merge branch 'master' into msvc-clang-inconsistent-missing-destructor-override 2023-04-26 09:31:55 +02:00
Adam Beili
e193220ad8 Merge branch 'master' into refactor/KHR_material_specular 2023-04-06 02:42:18 +02:00
Jackie9527
7df4efea44 Fix warning related to inconsistent-missing-destructor-override. 
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
 2023-04-01 21:49:38 +08:00
Adam Beili
c9177b7811 Merge branch 'master' into refactor/KHR_material_specular 2023-03-24 21:47:19 +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
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
3d3e856925 Trim Trailing Whitespace 2023-01-16 09:12:35 +01:00
Adam Beili
54068637ee Merge branch 'master' into refactor/KHR_material_specular 2022-11-29 17:35:52 +01:00
Kim Kulling
8fb7ba3444 Merge branch 'master' into modernize-smartptrs-literals 2022-11-29 09:58:17 +01:00
Adam
822b240694 Support both pbrSpecGlos and materials_specular 2022-11-08 23:09:50 +02:00
Aaron Gokaslan
ccfb175460 Apply various clang-tidy checks for smartprs and modern C++ types 2022-11-08 11:03:55 -05: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
e3b01e10db apply fixes to more headers 2022-09-01 12:28:45 -04:00
Bengt Rosenberger
abfe8ad413 Added suggested changes and fixed automated check errors 2022-08-01 14:39:10 +02:00
Bengt Rosenberger
f20071d740 Merge remote-tracking branch 'origin/gltf2_metadata_export' into gltf2_metadata_export 2022-08-01 14:12:33 +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
cb4d0ab7aa Added missing member copy in gltf2::ExtrasValue ctor. 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
Bengt Rosenberger
bdee65e577 Got rid of gltf2::ExtrasValue and used gltf2::CustomExtension instead 2022-07-22 01:33:05 +02:00
Bengt Rosenberger
517fd3c76c Added missing member copy in gltf2::ExtrasValue ctor. 2022-07-22 01:07:42 +02:00
Bengt Rosenberger
417481d17f 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-07-22 00:44:51 +02:00
Engin Manap
3890b5dff5 Add missing = operator 
implicit assignment operator is depricated, these classes were missing
explicit definitions of this operator.
It is causing warnings, specifically  -Werror=deprecated-copy
 2022-07-08 18:16:02 +02:00
Kim Kulling
6f31254ae1 Ensure dictionary for LazyDics is created before adding content to it 2022-02-23 20:57:15 +01:00
Kim Kulling
466b34cf53 Merge branch 'master' into kimkulling/fix_ordering_of_gltf2_issue4407 2022-02-22 21:09:11 +01:00
Kim Kulling
aa04ee89f1 Fix init order to fix build 2022-02-22 21:07:42 +01:00
Kim Kulling
50c7301a38 Update copyrights 2022-01-10 21:13:43 +01:00
RichardTea
c24f99cd0e Redefine deprecated glTF-specific PBR material macros 
Intended to support Qt5 QtQuick3D until it is ported to generic PBR
macros.
 2021-11-16 11:42:59 +00:00
Kim Kulling
8c0b869998 Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport 2021-10-28 13:38:41 +02:00
Malcolm Tyrrell
a283a255a5 Allow schema checking of glTF2 file. 2021-10-07 10:01:32 +01:00
diharaw
b01d008bc0 Revert "Removed KHR_materials_ior support." 
This reverts commit 0738742611.
 2021-10-07 09:36:53 +01:00
diharaw
0738742611 Removed KHR_materials_ior support. 2021-10-07 09:30:22 +01:00
diharaw
addd541251 Added gltf2 KHR_materials_ior support. 2021-09-30 08:47:53 +01:00
diharaw
200bf8df7a Added gltf2 KHR_materials_volume import support. 2021-09-29 17:05:17 +01:00
Kim Kulling
0fef0e1101 Move duplicate code to glFT common header. 2021-09-14 20:45:36 +02:00
Krishty
758116b083 removed trailing spaces and tabs from source and text 
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
 2021-07-29 13:28:51 +02:00
Promit Roy
90c115cb3f Merge branch 'master' into promit/gltf-extras 2021-07-02 00:38:00 -04:00
Promit Roy
7c822f23bd Added support for custom properties ("extras") in glTF2 2021-06-27 00:53:40 -04:00
Aaron Gokaslan
f435ce8c2c Merge branch 'master' into clang-tidy-perf-fixes 2021-06-24 11:54:56 -04:00
Kim Kulling
d18d838812 Fix formatting 2021-06-24 16:18:11 +02:00
Aaron Gokaslan
94c3abd841 Apply various performance fixes from clang-tidy 2021-06-22 12:27:15 -04:00
Evangel
3de20af3cc Renamed glTF2::Object::extensions to customExtensions to avoid shadowing in other subclasses. 2021-06-12 13:16:53 +10:00
Evangel
7f0efa0866 Added ReadExtensions to glTF2::Object, so all objects now have their extensions read. 
Importer is the only place that needs to be modified to make them available on the Assimp side now.
 2021-06-12 12:50:44 +10:00
Evangel
5be2330fbb Added CustomExtension to glTF2::Object so that all subclasses have it instead of doing it piecemeal. 2021-06-12 12:20:40 +10:00