01231d0e60
Add 2024 to copyright infos ( #5475 )
2024-02-23 22:30:05 +01:00
f59a5fab1a
More GLTF loading hardening ( #5415 )
...
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-04 21:23:31 +01:00
a72289b327
glTF KHR_materials_specular fixes
2023-12-11 11:09:18 +01:00
a0b3df6dbd
Fix target names not being imported on some gLTF2 models
2023-12-04 21:11:55 +01:00
37a1366fb7
Add missing rapidjson headers.
2023-07-21 11:33:06 +02:00
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
b7a8c4ba75
Update glTF2Asset.inl
2023-05-23 10:33:14 +02:00
e193220ad8
Merge branch 'master' into refactor/KHR_material_specular
2023-04-06 02:42:18 +02:00
8ac0af5c58
.
2023-03-26 17:13:16 +02:00
c9177b7811
Merge branch 'master' into refactor/KHR_material_specular
2023-03-24 21:47:19 +01:00
60cefdd549
Jan's fedback
2023-03-10 12:10:38 +01:00
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
3d3e856925
Trim Trailing Whitespace
2023-01-16 09:12:35 +01:00
54068637ee
Merge branch 'master' into refactor/KHR_material_specular
2022-11-29 17:35:52 +01:00
8fb7ba3444
Merge branch 'master' into modernize-smartptrs-literals
2022-11-29 09:58:17 +01:00
822b240694
Support both pbrSpecGlos and materials_specular
2022-11-08 23:09:50 +02:00
ccfb175460
Apply various clang-tidy checks for smartprs and modern C++ types
2022-11-08 11:03:55 -05:00
945d93b46a
fixed indentation
2022-11-04 09:37:28 -07:00
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
abfe8ad413
Added suggested changes and fixed automated check errors
2022-08-01 14:39:10 +02:00
da58fbe8fb
Got rid of gltf2::ExtrasValue and used gltf2::CustomExtension instead
2022-08-01 14:12:27 +02:00
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
de6e90a657
Fix commit error
2022-03-31 15:36:57 +08:00
2152aae2a3
Fix compile error due to namespace conflicts in VC140.
2022-03-31 15:34:49 +08:00
765b38cf04
Update glTF2Asset.inl
...
Fixing mistakes in attribute names for GLTF. This causes attribute index to not be parsed out correctly (e.g. JOINTS_1) and fails the scene load.
2022-03-16 16:49:45 -04:00
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
bbe12240ca
Move Base64 encode/decode functionality to the common folder.
2022-01-02 19:47:43 +01:00
0015823bef
Reject files with an invalid byteLength value
2021-11-26 13:01:15 +00:00
1a5d66714f
Prevent out-of-range memory writes by sparse accessors
...
This turned up during fuzz testing. Corrupted data would make assimp write to random memory locations, leading to subsequent crashes.
2021-11-25 11:20:26 +01:00
60bfde78eb
Fixed an incorrect indeiciesType in the glTF2 sparse accessor.
2021-11-21 23:23:22 +09:00
e2ccd17494
Fix typo
2021-11-12 11:20:22 +01:00
157e032bde
Fix small findings
...
- Merge anonymous functions into one block.
- Some reformattings
2021-11-12 11:08:19 +01:00
37c81e7a28
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-12 10:37:19 +01:00
aaae3e3a10
size_t is 32bit on some platforms
...
Also assert if size_t is smaller than uint32_t (probably not necessary)
Note: 32bit builds will crash OOM if a really large model is loaded, as cannot allocate that much in total, let alone contiguously.
2021-11-08 15:05:20 +00:00
9433fc526a
Apply clangformat
2021-11-08 14:42:21 +00:00
69cafe64b4
Cap glTFv1 & 2 json size to ~4GB
...
Ensures size_t cannot overflow
Limits the maximum contiguous memory allocation to something plausible.
2021-11-08 14:41:13 +00:00
8c0b869998
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-10-28 13:38:41 +02:00
ceddfe19d8
Add comment with link to schema repo.
2021-10-07 10:01:32 +01:00
a283a255a5
Allow schema checking of glTF2 file.
2021-10-07 10:01:32 +01:00
b01d008bc0
Revert "Removed KHR_materials_ior support."
...
This reverts commit 0738742611
2021-10-07 09:36:53 +01:00
0738742611
Removed KHR_materials_ior support.
2021-10-07 09:30:22 +01:00
addd541251
Added gltf2 KHR_materials_ior support.
2021-09-30 08:47:53 +01:00
200bf8df7a
Added gltf2 KHR_materials_volume import support.
2021-09-29 17:05:17 +01:00
0fef0e1101
Move duplicate code to glFT common header.
2021-09-14 20:45:36 +02:00
de2f5cf021
Crash fixes
2021-08-13 16:26:42 +01:00
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
30d342534a
Fix issues encountered during integration atempt
2021-07-16 14:29:28 -07:00
90c115cb3f
Merge branch 'master' into promit/gltf-extras
2021-07-02 00:38:00 -04:00
59ab791a47
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-29 20:24:23 +02:00
Kim Kulling
Florian Born
Alexey Medvedev
Futuremappermydud
Marco Feuerstein
Kim Kulling
Adam Beili
Florian Born
Krishty
Adam
Aaron Gokaslan
Bengt Rosenberger
xiaohunqupo
Promit Roy
Viktor Kovacs
Kim Kulling
Max Vollmer (Microsoft Havok)
Jan Krassnigg
ruyo
RichardTea
Malcolm Tyrrell
diharaw
Adrian Perez