Commit Graph

157 Commits

Author SHA1 Message Date
Kim Kulling
0b92abe9b4 Merge branch 'master' into empty-string-style 2021-04-30 00:54:57 +02:00
Max Vollmer (Microsoft Havok)
e1d6e1f377 Merge branch 'master' into ms-maxvollmer/importer_fixes 2021-04-26 14:53:32 +01:00
Max Vollmer (Microsoft Havok)
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
Krishty
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
Krishty
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
Hill Ma
4aa52b3af8 Flip the check on _MSC_VER for using TR1 containers. 2021-04-13 11:15:52 -07:00
Clement JACOB
e66232d8c3 Merge branch 'master' into feature/gltf_fb_ngon_encoding 2021-04-07 13:54:31 +02:00
Clement Jacob
596001c89c Refactoring the extension 2021-03-30 09:10:50 +02:00
Clement Jacob
8e589221d7 [gltf2-exporter] Adding FB_ngon_encoding support 2021-03-30 09:10:50 +02:00
Malcolm Tyrrell
d94ddd32b1 Extra check. Better logging. 2021-03-24 11:04:39 +00:00
Malcolm Tyrrell
add165c4a1 Check target sizes to avoid reading beyond allocation 2021-03-24 10:55:40 +00:00
Kim Kulling
5f652feb75 Merge branch 'master' into MalcolmTyrrell/gltfCrashes 2021-03-19 13:35:13 +01:00
Hill Ma
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
Malcolm Tyrrell
3503252e12 Strict check for accessor "count" 2021-03-16 11:47:19 +00:00
Malcolm Tyrrell
e4983aa16e Fix code issue 2021-03-15 16:46:41 +00:00
Malcolm Tyrrell
57652a9084 Version is strictly a string 2021-03-15 16:27:50 +00:00
Malcolm Tyrrell
053c0f5e0a Catch type errors in gltf and try to print out useful context. 2021-03-15 13:06:11 +00:00
Kim Kulling
806b12dc8b Merge branch 'master' into issue_3678 2021-03-10 19:51:04 +01:00
Kim Kulling
6c89631581 closes https://github.com/assimp/assimp/issues/3678: ensure lowercase 2021-03-09 21:08:28 +01:00
Kim Kulling
75210576cf Merge branch 'master' into sparse_minmax 2021-03-01 21:34:24 +01:00
Kim Kulling
c669c8f1eb Merge branch 'master' into update_copyrights 2021-02-28 12:18:41 +01:00
Kim Kulling
9e8dbd0ca5 Update copyrights to 2021. 2021-02-28 12:17:54 +01:00
Max Vollmer (Microsoft Havok)
eef03c1f17 Improved warnings 2021-02-24 14:28:18 +00:00
Max Vollmer (Microsoft Havok)
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
thomasbiang
5429475339 Merge branch 'master' into sparse_minmax 2021-02-23 12:30:53 -08:00
Kim Kulling
247fd0ce17 Merge branch 'master' into FixAnimName 2021-02-22 20:38:16 +01:00
Kim Kulling
6094da3493 Update glTF2Asset.inl 2021-02-18 09:32:37 +01:00
Minmin Gong
d57b78bc98 Export the animation name to gltf2 2021-02-16 20:22:08 -08:00
Kim Kulling
888415246e Merge branch 'master' into issue_2195_draco 2021-02-08 11:52:54 +01:00
ywang
9bab475302 export min max for sparse accessor 2021-02-03 15:05:58 -08:00
ywang
793bd44cee fix issue: 3482: invalid gltf2 properties 2021-02-02 13:19:57 -08:00
Kim Kulling
5fbbba2fac Merge branch 'master' into issue_2195_draco 2021-01-31 16:02:57 +01:00
RichardTea
48bcbbefdd use nullptr and float constants 2021-01-27 10:56:57 +00:00
RichardTea
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
RichardTea
6ec32b6b78 Apply clangformat 2021-01-27 09:55:03 +00:00
RichardTea
c6fd1ce996 glTF2 Minor cleanup 2021-01-27 09:42:49 +00:00
RichardTea
5b9d06c2fc Disable draco clang/gcc warnings via pragma
draco templated functions also throw warnings
2021-01-27 09:19:35 +00:00
RichardTea
d79e0c0ba9 Avoid std::make_unique
Assimp is still C++11
2021-01-26 17:33:10 +00:00
RichardTea
c917e6513f Merge branch 'master' into issue_2195_draco 2021-01-26 16:43:46 +00:00
RichardTea
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
RichardTea
dde7605158 Implement draco decoding 2021-01-26 16:08:12 +00:00
thomasbiang
91dc904ed1 Merge branch 'master' into master 2021-01-22 13:25:31 -08:00
Kim Kulling
2bcf08370d Merge branch 'master' into fix-gltf-vertex-colors 2021-01-21 11:54:02 +01:00
thomasbiang
d7cf7847ba Merge branch 'master' into master 2021-01-20 18:47:39 -08:00
ywang
01e61c8b9f customized node transformation format 2021-01-20 18:42:56 -08:00
Maki
6d13fd6aa2 Fix glTF vertex colors with types other than float 2021-01-15 02:56:45 +00:00
Max Vollmer
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
Danny-Kint
07aace0fdd Merge branch 'master' into dev/gltf-KHR_materials 2020-12-31 07:08:31 +01:00
Danny-Kint
07b59f539d Merge branch 'master' into dev/gltf-KHR_materials 2020-12-28 08:48:54 +01:00
Maki
ca653e0c6a Fix glTF from memory loading .bin with a custom IOHandler 2020-12-28 07:18:50 +00:00