f3baab1153
Merge branch 'master' into master
2021-10-20 20:51:43 +02:00
0fb66f8437
Replaced AI_MATKEY_IOR with AI_MATKEY_REFRACTI.
2021-10-07 09:39:08 +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
656b0b25d8
Fix warning for array comparison
...
The code previously compared two float arrays with the != operator. This is deprecated in Visual Studio 2019 and results in a warning that leads to an error when compiling with warnings as errors. Small fix to make the build work.
2021-10-05 19:24:42 +02: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
18531e3677
Next iteration for c++11 features.
2021-09-13 22:38:20 +02:00
bf8e36ae28
Fixed typo
2021-09-02 10:07:28 +01:00
72ea80b41f
Revert last change (gltf2::Ref type is not a pointer and has a bool() operator)
2021-09-02 10:00:56 +01:00
d710d0700f
Make nullptr test more explicit.
2021-09-02 10:10:42 +02:00
4c86772091
Added another nullptr safety check
2021-09-02 08:27:03 +01:00
df739f00dd
Merge branch 'master' into issue_3398
2021-08-28 13:56:50 +02:00
c1e830cf3b
The GLTF2 specs aren't very specific about the restrictions of the number of keyframes in sampler input and output. It seems logical that they should be the same, but there is an official sample model from Khronos where output has more keyframes. I thus assume that the GLTF2 standard allows more keyframes in output, but not in input. Fixed the check accordingly.
2021-08-13 17:46:10 +01:00
de2f5cf021
Crash fixes
2021-08-13 16:26:42 +01:00
4b1ff645e3
closes https://github.com/assimp/assimp/issues/3398 : Add support for embedded textures
2021-08-12 21:13:07 +02:00
bb53961fa9
more range-based for
...
f6b4370f6a7c822f23bd
2021-07-29 14:57:25 +02:00
90c115cb3f
Merge branch 'master' into promit/gltf-extras
2021-07-02 00:38:00 -04:00
7c822f23bd
Added support for custom properties ("extras") in glTF2
2021-06-27 00:53:40 -04:00
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
e736538df3
Merge branch 'master' into master
2021-06-23 13:45:23 +10:00
985f3ee665
Fix glTFv2 texcoord/uv mapping
...
Use the standard property to indicate the UV map index
2021-06-14 15:11:41 +01:00
fb039bb9eb
Add glTFv2 Clearcoat import/export tests
...
Uses Clearcoat model from Khronos
2021-06-14 15:11:41 +01:00
4a66ec25d0
Standardise Clearcoat, Sheen and Transmission
...
Also cleanup glTFv2 defaults, don't import/export if disabled
2021-06-14 15:11:41 +01:00
4476352882
First pass at simplifying glTFv2 PBR
...
Removed 'core' set of GLTF-specific properties
2021-06-14 15:11:41 +01:00
3de20af3cc
Renamed glTF2::Object::extensions to customExtensions to avoid shadowing in other subclasses.
2021-06-12 13:16:53 +10:00
36c8cdf3de
Add scene metadata for glTF2 files as allowed by the glTF2 specification.
2021-06-12 11:44:28 +10:00
6b8a00dfa1
Merge branch 'master' into wangyi_basisu
2021-05-25 17:17:07 +02:00
b5e54e4d3b
Merge branch 'master' into wangyi_basisu
2021-05-25 16:17:29 +02:00
faeae27923
Merge branch 'master' into importer_fixes_followup
2021-05-25 16:15:09 +02:00
4ec01cfdcd
Improve use of logging
2021-05-13 12:05:31 +01:00
5cd3bdd5c2
No need to distinguish formatting log functions.
2021-05-13 10:25:27 +01:00
a19b708144
support both ktx and ktx2
2021-05-07 16:27:23 -07:00
2b9d88c943
support basis universal
2021-05-06 15:10:06 -07:00
153b890b02
Prevent accessing nullpointers
2021-05-05 14:09:43 +01:00
e1d6e1f377
Merge branch 'master' into ms-maxvollmer/importer_fixes
2021-04-26 14:53:32 +01:00
746d5cf964
* Throw instead of assert on invalid file input
...
* Check JSON object type before accessing members
* Ensure samplers input and output references are set before accessing them
2021-04-21 16:17:03 +01:00
6cbeca5518
fixed glTF export stuff being pulled into the EXE even if building with ASSIMP_BUILD_NO_EXPORT
...
“LazyDictBase::WriteObjects()” in the two glTF implementations is only used for export. Since it’s a virtual method, and many compilers have trouble removing unreferenced virtual methods, glTF export stuff is pulled into the binary even if compiling without exports.
This commit removes said virtual function if only compiling for import.
This removes 75 KiB of useless code when compiled with Visual Studio for x64.
2021-04-16 20:44:40 +02:00
d94ddd32b1
Extra check. Better logging.
2021-03-24 11:04:39 +00:00
add165c4a1
Check target sizes to avoid reading beyond allocation
2021-03-24 10:55:40 +00:00
c669c8f1eb
Merge branch 'master' into update_copyrights
2021-02-28 12:18:41 +01:00
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
eef03c1f17
Improved warnings
2021-02-24 14:28:18 +00:00
facb7da701
Check that normal count and tangent count matches vertex count. Ignore data and warn if counts don't match.
2021-02-24 14:19:29 +00:00
6d13fd6aa2
Fix glTF vertex colors with types other than float
2021-01-15 02:56:45 +00:00
07b59f539d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-28 08:48:54 +01:00
2b097c1e73
Add KHR_materials_transmission during import
2020-12-23 10:43:01 +01:00
f8c63d874b
support KHR_materials_clearcoat during import
2020-12-23 08:12:09 +01:00
0fdda99ea1
add underscore (MATERIAL_SHEEN instead of MATERIALSHEEN)
2020-12-21 14:33:35 +01:00
Kim Kulling
diharaw
Marc
Kim Kulling
Max Vollmer (Microsoft Havok)
Krishty
Promit Roy
Jerome St-Louis
Evangel63
RichardTea
Malcolm Tyrrell
ywang
Krishty
Maki
Danny-Kint
Danny Kabrane