6ad7505376
Merge branch 'master' into krishty-new-file-detection
2022-01-16 20:43:57 +01:00
05746acb07
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection
2022-01-16 20:41:24 +01:00
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
6b9732721a
Merge branch 'assimp:master' into common_base64
2022-01-10 21:15:31 +01:00
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
87e9dbac40
Fix bone fitted check in gltf2 exporter
2022-01-03 16:32:34 -07:00
bbe12240ca
Move Base64 encode/decode functionality to the common folder.
2022-01-02 19:47:43 +01:00
cb657e4c13
Use correct XmlParser-methods and add some missing casts
2021-12-13 18:06:23 +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
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
b9937994ca
Fix glTF2 skinning bone weight exporting issue
2021-11-13 12:07:29 +08:00
1407491a67
glTF2 exporter buffer overrun issue fix.
2021-11-13 11:52:49 +08: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
43b0ef181a
Merge branch 'master' into fix_gltf_warning_4126
2021-11-11 20:30:07 +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
791cb195be
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-10-20 21:14:43 +02:00
f3baab1153
Merge branch 'master' into master
2021-10-20 20:51:43 +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
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
d3276de47d
Added gltf2 KHR_materials_volume write support.
2021-09-30 08:10:02 +01:00
200bf8df7a
Added gltf2 KHR_materials_volume import support.
2021-09-29 17:05:17 +01:00
70dfdb8f9d
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-15 14:51:38 +02: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
3001d88172
Merge branch 'master' into x3d_pugi_migration
2021-09-07 15:04:08 +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
1ee2be8c5c
Merge branch 'master' into trim-trailing-whitespace
2021-07-31 18:01:48 +02:00
bb53961fa9
more range-based for
...
f6b4370f6a7c822f23bd
2021-07-29 14:57:25 +02: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
4e28a3072f
Merge branch 'master' into gltf_fixes
2021-07-23 20:37:25 +02:00
30d342534a
Fix issues encountered during integration atempt
2021-07-16 14:29:28 -07:00
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
90c115cb3f
Merge branch 'master' into promit/gltf-extras
2021-07-02 00:38:00 -04:00
240eb36980
Merge branch 'master' into master
2021-07-01 19:23:52 +02:00
59ab791a47
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-29 20:24:23 +02:00
7c822f23bd
Added support for custom properties ("extras") in glTF2
2021-06-27 00:53:40 -04:00
e3d54860ec
Merge branch 'master' into master
2021-06-25 18:50:33 -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
f435ce8c2c
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-24 11:54:56 -04:00
b38b65ff49
Add const
2021-06-24 17:03:00 +02:00
012ce30577
Merge branch 'master' into zero
2021-06-24 17:00:43 +02:00
d18d838812
Fix formatting
2021-06-24 16:18:11 +02:00
8e3a159141
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-23 10:10:28 -04:00
e736538df3
Merge branch 'master' into master
2021-06-23 13:45:23 +10:00
760953c834
Merge branch 'master' into clean_gltf_pbr_brdf
2021-06-22 20:10:03 +02:00
94c3abd841
Apply various performance fixes from clang-tidy
2021-06-22 12:27:15 -04:00
148b8c66a8
glTF2: zero out extra space created by padding.
...
This makes resulting GLB deterministic.
2021-06-15 15:18:20 -07:00
f412595887
Fix typo
...
Thank you clang!
2021-06-14 15:11:41 +01: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
a7a30baf27
Renamed local variable to avoid shadowing member variable.
2021-06-12 13:08:14 +10:00
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
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
6d413444b5
Merge branch 'master' of https://github.com/Evangel63/assimp
2021-06-12 11:46:20 +10:00
36c8cdf3de
Add scene metadata for glTF2 files as allowed by the glTF2 specification.
2021-06-12 11:44:28 +10:00
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
d33cf1dc0c
Merge branch 'master' into x3d_pugi_migration
2021-06-06 16:06:08 +02:00
70cc1630fa
Merge branch 'master' into fix-gcc4.9-compilation
2021-05-27 15:25:01 +02: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
b7b3c6db7e
Fixing GCC 4.9 compilation issues
2021-05-22 16:57:07 +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
350f2ea1d3
Fix build and merged master.
2021-05-06 21:36:25 +02:00
52228a93f8
Fix X3DGeohelper.
2021-05-06 21:07:38 +02:00
153b890b02
Prevent accessing nullpointers
2021-05-05 14:09:43 +01:00
b79b84d34e
Merge branch 'master' into new-file-detection
2021-05-05 00:09:42 +02:00
0b92abe9b4
Merge branch 'master' into empty-string-style
2021-04-30 00:54:57 +02:00
e1d6e1f377
Merge branch 'master' into ms-maxvollmer/importer_fixes
2021-04-26 14:53:32 +01:00
b00de10eb3
Simplified importer search and fixed a few bugs
...
The search for a matching importer had a few issues, see #3791 . There were two different mechanisms to determine whether an importer accepts a specific file extension:
1. `aiImporterDesc::mFileExtensions`, which was forwarded to the UI via `BaseImporter::GetExtensionList()`.
2. `BaseImporter::CanRead()` when called with `checkSig == false`, which determines whether to actually use that importer.
Both were redundant and got out of sync repeatedly. I removed 2. completely and replaced it with 1., thereby syncing UI/import and shortening all `BaseImporter::CanRead()` implementations.
Further bugfixes:
- fixed glTF2 importer throwing exceptions when checking whether it can load a file
- removed `BaseImporter::SimpleExtensionCheck()` because it is no longer used and had a bug with case sensitivity
Since the `checkSig` parameter in `BaseImporter::CanRead()` is now useless, it can be removed completely. I’m not sure if this would break ABI compatiblity, so I’ll submit it with a later pull request.
2021-04-24 00:17:50 +02: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
f761dc72f4
style fix - initializing and assigning empty std::string properly
...
std::string s(""); s = ""; calls the copy constructor, which in turn calls strlen(), … assigning a default-constructed string generates fewer instructions and is therefore preferred.
With C++11 uniform initialization, you’d simply write s = { } instead.
2021-04-16 23:43:56 +02: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
4aa52b3af8
Flip the check on _MSC_VER for using TR1 containers.
2021-04-13 11:15:52 -07:00
e66232d8c3
Merge branch 'master' into feature/gltf_fb_ngon_encoding
2021-04-07 13:54:31 +02:00
596001c89c
Refactoring the extension
2021-03-30 09:10:50 +02:00
8e589221d7
[gltf2-exporter] Adding FB_ngon_encoding support
2021-03-30 09:10:50 +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
5f652feb75
Merge branch 'master' into MalcolmTyrrell/gltfCrashes
2021-03-19 13:35:13 +01:00
3e99385f44
Fix a memory leak in glTF2.
...
The destructor of LazyDict uses `delete` but `delete` was not used for objects removed by LazyDict::Remove.
2021-03-17 15:12:54 -07:00
3503252e12
Strict check for accessor "count"
2021-03-16 11:47:19 +00:00
e4983aa16e
Fix code issue
2021-03-15 16:46:41 +00:00
57652a9084
Version is strictly a string
2021-03-15 16:27:50 +00:00
053c0f5e0a
Catch type errors in gltf and try to print out useful context.
2021-03-15 13:06:11 +00:00
806b12dc8b
Merge branch 'master' into issue_3678
2021-03-10 19:51:04 +01:00
6c89631581
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-09 21:08:28 +01:00
75210576cf
Merge branch 'master' into sparse_minmax
2021-03-01 21:34:24 +01: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
5429475339
Merge branch 'master' into sparse_minmax
2021-02-23 12:30:53 -08:00
247fd0ce17
Merge branch 'master' into FixAnimName
2021-02-22 20:38:16 +01:00
6094da3493
Update glTF2Asset.inl
2021-02-18 09:32:37 +01:00
d57b78bc98
Export the animation name to gltf2
2021-02-16 20:22:08 -08:00
888415246e
Merge branch 'master' into issue_2195_draco
2021-02-08 11:52:54 +01:00
9bab475302
export min max for sparse accessor
2021-02-03 15:05:58 -08:00
793bd44cee
fix issue: 3482: invalid gltf2 properties
2021-02-02 13:19:57 -08:00
5fbbba2fac
Merge branch 'master' into issue_2195_draco
2021-01-31 16:02:57 +01:00
48bcbbefdd
use nullptr and float constants
2021-01-27 10:56:57 +00:00
150514fc8b
Move draco warning suppression
...
Should be around the include for portability, not template instantiation
Fix clang pragma typos
2021-01-27 10:42:28 +00:00
6ec32b6b78
Apply clangformat
2021-01-27 09:55:03 +00:00
c6fd1ce996
glTF2 Minor cleanup
2021-01-27 09:42:49 +00:00
5b9d06c2fc
Disable draco clang/gcc warnings via pragma
...
draco templated functions also throw warnings
2021-01-27 09:19:35 +00:00
d79e0c0ba9
Avoid std::make_unique
...
Assimp is still C++11
2021-01-26 17:33:10 +00:00
c917e6513f
Merge branch 'master' into issue_2195_draco
2021-01-26 16:43:46 +00:00
f39ba8ddb2
Add compile error for bad error draco config
...
KHR_draco_mesh_compression requires
DRACO_MESH_COMPRESSION_SUPPORTED
2021-01-26 16:24:18 +00:00
dde7605158
Implement draco decoding
2021-01-26 16:08:12 +00:00
91dc904ed1
Merge branch 'master' into master
2021-01-22 13:25:31 -08:00
2bcf08370d
Merge branch 'master' into fix-gltf-vertex-colors
2021-01-21 11:54:02 +01:00
d7cf7847ba
Merge branch 'master' into master
2021-01-20 18:47:39 -08:00
01e61c8b9f
customized node transformation format
2021-01-20 18:42:56 -08:00
6d13fd6aa2
Fix glTF vertex colors with types other than float
2021-01-15 02:56:45 +00:00
d49aed4585
* Check that buffer view has buffer
...
* Handle integer overflow when calculating byte length
* Minor code cleanup for exception messages
2021-01-11 08:45:47 +00:00
07aace0fdd
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-31 07:08:31 +01:00
07b59f539d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-28 08:48:54 +01:00
ca653e0c6a
Fix glTF from memory loading .bin with a custom IOHandler
2020-12-28 07:18:50 +00:00
3f5238d7c1
Merge branch 'master' into gltf2_fixes
2020-12-24 16:48:36 +01:00
dbffe25c9d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-23 11:33:04 +01:00
383c97e380
Add KHR_materials_transmission during export
2020-12-23 10:43:21 +01:00
2b097c1e73
Add KHR_materials_transmission during import
2020-12-23 10:43:01 +01:00
197bf1e617
Add KHR_materials_clearcoat during export
2020-12-23 09:56:15 +01:00
f8c63d874b
support KHR_materials_clearcoat during import
2020-12-23 08:12:09 +01:00
aa9d6ce7b7
add support for khr_materials_sheen during export
2020-12-21 14:34:16 +01:00
Kim Kulling
Kim Kulling
Viktor Kovacs
Colin Reeder
Max Vollmer (Microsoft Havok)
Jan Krassnigg
ruyo
RichardTea
freizhang
Malcolm Tyrrell
diharaw
Marc
Artenuvielle
krishty
Krishty
Adrian Perez
Promit Roy
Jerome St-Louis
Aaron Gokaslan
Evangel63
Hill Ma
Jean-François Verdon
ywang
Krishty
Clement JACOB
thomasbiang
Minmin Gong
Maki
Max Vollmer
Danny-Kint
Danny-Kint
Danny Kabrane