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

85 Commits

Author SHA1 Message Date
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
Adam Beili
b6ecba9114 fix 2023-03-26 17:03:46 +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
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
e93fa6699a Manually fix up 100 more instances where it should be defaulted 2022-08-25 12:20:13 -04:00
Bengt Rosenberger
abfe8ad413 Added suggested changes and fixed automated check errors 2022-08-01 14:39:10 +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
PercentBoat4164
487a9aca2f Add support for GCC v12 2022-06-16 19:23:55 -04:00
Kim Kulling
02b0c89fa4 Fix usage of validation 2022-06-08 00:10:13 +02:00
Kim Kulling
4fb5cf4ba6 Fix possible nullptr exception 
- closes https://github.com/assimp/assimp/issues/4418
 2022-06-07 23:33:56 +02: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
Colin Reeder
87e9dbac40 Fix bone fitted check in gltf2 exporter 2022-01-03 16:32:34 -07:00
Kim Kulling
cb657e4c13 Use correct XmlParser-methods and add some missing casts 2021-12-13 18:06:23 +01:00
freizhang
b9937994ca Fix glTF2 skinning bone weight exporting issue 2021-11-13 12:07:29 +08:00
freizhang
1407491a67 glTF2 exporter buffer overrun issue fix. 2021-11-13 11:52:49 +08:00
Kim Kulling
791cb195be Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-10-20 21:14:43 +02:00
diharaw
0fb66f8437 Replaced AI_MATKEY_IOR with AI_MATKEY_REFRACTI. 2021-10-07 09:39:08 +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
Artenuvielle
70dfdb8f9d Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-09-15 14:51:38 +02:00
Kim Kulling
0fef0e1101 Move duplicate code to glFT common header. 2021-09-14 20:45:36 +02:00
Kim Kulling
18531e3677 Next iteration for c++11 features. 2021-09-13 22:38:20 +02:00
René Martin
3001d88172 Merge branch 'master' into x3d_pugi_migration 2021-09-07 15:04:08 +02:00
RichardTea
632b2db97c Ensure glTFv2 scene name is unique 
Use the provided scene name if extant
Fixes issue #3978
 2021-07-14 13:39:41 +01:00
Kim Kulling
240eb36980 Merge branch 'master' into master 2021-07-01 19:23:52 +02:00
Jerome St-Louis
0e41efb050 glTF2: Improved support for AI_MATKEY_OPACITY 
- Exporter: Writing opacity to pbrMetallicRoughness.baseColorFactor[3] even when alphaMode is set
- Importer: Setting AI_MATKEY_OPACITY from pbrMetallicRoughness.baseColorFactor[3]
 2021-06-24 13:27:29 -04:00
Aaron Gokaslan
8e3a159141 Merge branch 'master' into clang-tidy-perf-fixes 2021-06-23 10:10:28 -04:00
Kim Kulling
760953c834 Merge branch 'master' into clean_gltf_pbr_brdf 2021-06-22 20:10:03 +02:00
Aaron Gokaslan
94c3abd841 Apply various performance fixes from clang-tidy 2021-06-22 12:27:15 -04:00
RichardTea
f412595887 Fix typo 
Thank you clang!
 2021-06-14 15:11:41 +01:00
RichardTea
985f3ee665 Fix glTFv2 texcoord/uv mapping 
Use the standard property to indicate the UV map index
 2021-06-14 15:11:41 +01:00
RichardTea
4a66ec25d0 Standardise Clearcoat, Sheen and Transmission 
Also cleanup glTFv2 defaults, don't import/export if disabled
 2021-06-14 15:11:41 +01:00
RichardTea
4476352882 First pass at simplifying glTFv2 PBR 
Removed 'core' set of GLTF-specific properties
 2021-06-14 15:11:41 +01:00
Hill Ma
ef739c1703 glTF2: Make handling of embedded textures safer. 
Previous code does not check whether the embedded texture exists.
 2021-06-08 12:53:18 -07:00
Kim Kulling
d33cf1dc0c Merge branch 'master' into x3d_pugi_migration 2021-06-06 16:06:08 +02:00
ywang
a19b708144 support both ktx and ktx2 2021-05-07 16:27:23 -07:00
ywang
2b9d88c943 support basis universal 2021-05-06 15:10:06 -07:00