Commit Graph

5601 Commits

Author SHA1 Message Date
Kim Kulling
1e38f84c3a fix typo 2021-01-27 09:40:19 +01:00
Kim Kulling
ac0f1f2cab Update FBXMaterial.cpp 2021-01-27 09:37:35 +01:00
Kim Kulling
c02ad323a5 Fix VS compiler warning: convertig int to char 2021-01-27 09:22:59 +01:00
thomasbiang
4ed9f3c2f4 Merge branch 'master' into master 2021-01-26 13:55:40 -08:00
Kim Kulling
4471c36c08 Fix compiler bug for VS2019
- Check https://developercommunity.visualstudio.com/content/problem/1223143/visual-studio-2019-c-program-crash-with-stdstring.html for more details
- closes https://github.com/assimp/assimp/issues/3572
2021-01-26 20:59:21 +01:00
RichardTea
d79e0c0ba9 Avoid std::make_unique
Assimp is still C++11
2021-01-26 17:33:10 +00:00
RichardTea
fe97ff6474 Draco platform libraries have different names
On Windows it's draco.dll/lib
On Linux/macOS draco_shared.dylib & draco_static.lib
2021-01-26 17:19:41 +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
RichardTea
3a7d0f5656 Add Draco to cmakelists
Initial pass. Not yet used.
Add Draco library to assimp build and link
2021-01-26 15:58:14 +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
Bart Sekura
5f50e42535 added missing return 2021-01-23 09:56:35 +09:00
Bart Sekura
f8c512acd7 changed morph anim error to warning when validating 2021-01-23 09:52:46 +09: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
thomasbiang
b3a35364ad Merge branch 'master' into master 2021-01-21 13:38:21 -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
Kim Kulling
4e0c4d7bb7 Update PbrtExporter.h 2021-01-20 21:11:14 +01:00
Kim Kulling
11a17ebfe6 Merge branch 'master' into tdb/pbrt3_exporter 2021-01-20 20:03:30 +01:00
xiaohunqupo
8ba1d38dea Fix STL Expoter error. 2021-01-20 16:29:30 +08:00
Kim Kulling
f8dd3a9aa6 Update DefaultIOSystem.cpp 2021-01-20 08:05:43 +01:00
Kim Kulling
ed3e745752 Update DefaultIOSystem.cpp 2021-01-19 21:58:04 +01:00
Kim Kulling
f05a57560b Remove buggy method. 2021-01-19 21:27:50 +01:00
Kim Kulling
22f632d8d0 Merge branch 'master' into kimkulling-oss_fuzz29168 2021-01-19 21:21:28 +01:00
Kim Kulling
5b325af79f Fix typo. 2021-01-19 21:19:42 +01:00
Kim Kulling
5a6498af92 Fix nullptr access 2021-01-19 21:14:38 +01:00
Kim Kulling
4008862a35 Merge branch 'master' into ihsinme-patch-210 2021-01-19 21:05:43 +01:00
Matt Pharr
8f5148f108 Merge branch 'master' into tdb/pbrt3_exporter 2021-01-18 17:15:40 -08:00
Dan Church
0bc5cf9fd3 Fix build failure on Linux 2021-01-18 16:17:28 -06:00
Kim Kulling
5a7f212162 Merge branch 'master' into ihsinme-patch-210 2021-01-18 21:55:42 +01:00
Kim Kulling
f24c042925 Fix typo 2021-01-18 20:28:38 +01:00
Kim Kulling
0803e5e6f3 Fix nullptr dereference in scenepreprocessor 2021-01-18 20:25:33 +01:00
Matt Pharr
17c79bcb94 Merge branch 'master' into tdb/pbrt3_exporter 2021-01-15 13:47:21 -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
Matt Pharr
ff8d50c8d0 Fix MSVC compiler warnings 2021-01-12 08:23:53 -08:00