Commit Graph

668 Commits

Author SHA1 Message Date
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
contriteobserver
d7bf513250 renaming iterator to avoid any possibility of scop collisions 2021-01-26 01:36:12 -08:00
contriteobserver
69fc809307 size_t is not the same as unsigned int on some systems 2021-01-26 01:01:59 -08:00
contriteobserver
f92a34e0b7 Merge branch 'master' into ColladaSubmeshFix 2021-01-26 00:38:37 -08:00
Kim Kulling
243d017463 Add missing skip
- closes https://github.com/assimp/assimp/issues/3601
- Fix some format issues
2021-01-24 18:47:50 +01:00
Kim Kulling
a2b889ab09 Fix typo in collada parser
closes https://github.com/assimp/assimp/issues/3599
2021-01-24 18:21:46 +01:00
Ville Voutilainen
6ebae5e67c GCC 11 build fixes 2021-01-24 11:04:46 +02:00
contriteobserver
338abded12 ColladaLoader now assigns individual materials to submeshes as needed
Optional assignment of individual materials to submeshes, addresses #3606
2021-01-23 02:20:58 -08:00
thomasbiang
91dc904ed1 Merge branch 'master' into master 2021-01-22 13:25:31 -08:00
Kim Kulling
e792455d66 Remove redundant statement in if
- closes https://github.com/assimp/assimp/issues/3180
2021-01-22 14:22:34 +01:00
Kim Kulling
dc4514de82 Update COBLoader.cpp
Fix cppcheck finding
2021-01-22 13:23:39 +01:00
Kim Kulling
0dcd72d420 Update IFCOpenings.cpp 2021-01-22 13:18:43 +01:00
Kim Kulling
f44572157a Update 3DSLoader.cpp 2021-01-22 13:14:59 +01:00
Kim Kulling
f2d3f0dbe6 Merge branch 'master' into master 2021-01-22 12:35:44 +01: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
xiaohunqupo
8ba1d38dea Fix STL Expoter error. 2021-01-20 16:29:30 +08:00
Maki
6d13fd6aa2 Fix glTF vertex colors with types other than float 2021-01-15 02:56:45 +00:00
Kim Kulling
a9705e346a Merge branch 'master' into ihsinme-patch-210 2021-01-14 17:21:44 +01:00
Kim Kulling
87a6305cf0 Merge branch 'master' into gltf2_buffer_fixes 2021-01-12 18:32:17 +01:00
ihsinme
070072370d Update AMFImporter_Material.cpp 2021-01-12 15:43:40 +03:00
ihsinme
2e96366d04 Update AMFImporter_Geometry.cpp 2021-01-12 15:40:19 +03:00
kkulling
9174bca3f7 closes https://github.com/assimp/assimp/issues/3517: use const instead of constexpr 2021-01-12 10:01:53 +01: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
Kim Kulling
cf78781fa8 Merge branch 'master' into 3mf-improvements 2021-01-02 13:14:13 +01:00
Danny-Kint
07aace0fdd Merge branch 'master' into dev/gltf-KHR_materials 2020-12-31 07:08:31 +01:00
Kim Kulling
465220b26a Merge branch 'master' into 3mf-improvements 2020-12-30 18:12:26 +01:00
Kim Kulling
e0803b3ec2 Merge branch 'master' into fix-gltf-bin-from-memory 2020-12-30 11:17:31 +01:00
Danny-Kint
b8d947299a Merge branch 'master' into dev/gltf-KHR_materials 2020-12-29 17:09:15 +01:00
Jean-Louis
37df38f951 [3MF] Improves node naming 2020-12-29 15:46:28 +01:00
Jean-Louis
4025c57fd0 [3MF] Parse the transform of the components 2020-12-28 15:47:20 +01:00
Jean-Louis
eda967bd02 Parse the <build> node + refactoring 2020-12-28 12:31:54 +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
Jean-Louis
eed75aaf2c Remove debug print 2020-12-26 14:57:52 +01:00
Jean-Louis
0ec8d6e285 [3MF] Missing file in previous commit + parse object material in the importer 2020-12-26 14:04:45 +01:00
Jean-Louis
0952038461 Small refactoring on 3MF export 2020-12-26 03:02:18 +01:00
Jean-Louis
c10d592b79 Fix material parsing in the 3MF importer 2020-12-26 02:36:24 +01:00
Kim Kulling
77f9c2854a Merge branch 'master' into fbx_tokenizer_fix 2020-12-25 21:44:26 +01:00
Kim Kulling
3f5238d7c1 Merge branch 'master' into gltf2_fixes 2020-12-24 16:48:36 +01:00
Danny-Kint
dbffe25c9d Merge branch 'master' into dev/gltf-KHR_materials 2020-12-23 11:33:04 +01:00
Danny Kabrane
383c97e380 Add KHR_materials_transmission during export 2020-12-23 10:43:21 +01:00
Danny Kabrane
2b097c1e73 Add KHR_materials_transmission during import 2020-12-23 10:43:01 +01:00
Danny Kabrane
197bf1e617 Add KHR_materials_clearcoat during export 2020-12-23 09:56:15 +01:00
Danny Kabrane
f8c63d874b support KHR_materials_clearcoat during import 2020-12-23 08:12:09 +01:00
Kim Kulling
50f9fb28b6 Merge branch 'master' into fix-casting-mingw 2020-12-21 18:29:18 +01:00