Commit Graph

57 Commits (747e12465bf43f6d75a7b684b912f781ca7726cd)

Author SHA1 Message Date
Malcolm Tyrrell fabfcf3cb0 More checking 2019-12-05 12:33:00 +00:00
Malcolm Tyrrell 894b8e3519 Initial version 2019-12-05 12:32:22 +00:00
Gordon MacPherson bdb89413bc
Merge branch 'master' into fix_gltf_accessor_overflow 2019-12-03 22:20:19 +00:00
Kim Kulling 903ce59ffe
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception 2019-12-02 19:07:44 +01:00
Cory Fabre 7c0f84f484
Merge branch 'master' into fix_gltf_accessor_overflow 2019-12-01 19:31:44 -06:00
Kim Kulling 7967deb06a
Update glTF2Asset.inl
some minor review finding: use brackets and add a newline.
2019-12-01 12:34:45 +01:00
Gordon MacPherson ef4bf35f69
Merge branch 'master' into fix_gltf_accessor_overflow 2019-11-30 17:11:07 +00:00
Paul Arden 97b71dd03b Add reading of extensionsRequired and explicit check to throw an error if Draco compression is required. Fixes issue #2791. 2019-11-28 09:01:01 +10:00
Kim Kulling 30851b796f
Update glTF2Importer.cpp
Make them const
2019-11-27 17:18:12 +01:00
Paul Arden e4f1b8e609 Correctly change the coordinate system of the glTF UV transforms to match those used internally inside Assimp. This should now hopefully result in a complete implementation for issue #2119 2019-11-27 11:05:31 +11:00
Gordon MacPherson f52df5d242
Merge branch 'master' into fix_gltf_accessor_overflow 2019-11-26 18:42:07 +00:00
Paul Arden 7230f32c14 Fix issue with y UV translation. Fixes #2119. 2019-11-25 20:58:21 +11:00
Cory Fabre 136996e1f6 Use std::numeric_limits for double max 2019-11-22 10:56:31 -06:00
Cory Fabre 36ca37f9ac
Merge branch 'master' into fix_gltf_accessor_overflow 2019-11-22 00:14:11 -06:00
Cory Fabre 91e6d3abeb Fix glTF Accessor min and max values 2019-11-21 23:46:14 -06:00
Mike Samsonov 375ee17339 Merge branch 'fix_memory_leak_in_gltf2_on_exception' of https://github.com/muxanickms/assimp into fix_memory_leak_in_gltf2_on_exception 2019-11-19 17:44:05 +00:00
Mike Samsonov 91af4b7476 fix the crash 2019-11-19 17:43:31 +00:00
Kim Kulling 5985bdfebf
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception 2019-11-19 18:11:10 +01:00
Mike Samsonov 12f184867e Fix for memory leak in glTF2 Importer if an exception has been thrown 2019-11-19 17:05:24 +00:00
Kim Kulling 75204e20bd fix invalid setup for texture enum. 2019-11-16 19:22:37 +01:00
Kim Kulling 17257cd2ae just a try, i dunno have a clue ... 2019-11-16 15:51:26 +01:00
Kim Kulling 2eed8b1820 TextureTransform: set material transform only when the extension is provided. 2019-11-16 08:08:57 +01:00
Kim Kulling a8182d86cb fix initialization + some vs2019 compiler warnings. 2019-11-15 19:38:37 +01:00
Kim Kulling 17946e26ef add missing setup of texture transform in aiMaterial. 2019-11-15 18:35:33 +01:00
Kim Kulling 04db5cd5ea closes https://github.com/assimp/assimp/issues/2119: initial version. 2019-11-14 21:11:53 +01:00
Kim Kulling 18555abed0
Merge branch 'master' into migenius-fix-pbrsg 2019-10-28 20:08:47 +01:00
Kim Kulling 571d64e3c1
Merge branch 'master' into migenius-fix-doublefree 2019-10-28 07:51:19 +01:00
Paul Arden cbd4e8bc22 Fix inconsistent indentation in previous commit. 2019-10-25 12:19:28 +11:00
Paul Arden 822be33408 Move pbrSG glossinessFactor into the correct material extension object. Fixes issue #2724. 2019-10-25 12:17:43 +11:00
Malcolm Tyrrell 9bc2648615
Merge branch 'master' into fix-gltf-importer-crash 2019-10-21 15:29:18 +01:00
Paul Arden 9aa9238e7e Copy texture data before handing on to asset which then handles freeing of the memory. This prevents the memory being released twice which was throwing an error. Fixes issue #2714. 2019-10-18 14:40:41 +11:00
Malcolm Tyrrell 5a1276032e Add bound checks. 2019-10-08 12:51:08 +01:00
vcebollada 6550b1df61
Merge branch 'master' into gltf_mesh_morph_animations 2019-10-01 08:04:46 +01:00
Theak 7a8b7ba88d aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0 2019-09-29 10:09:53 +01:00
Kim Kulling 2757297b4f
Merge branch 'master' into issue_2662 2019-09-26 09:55:16 +02:00
vcebollada 8ca39ade6a
Merge branch 'master' into gltf_mesh_morph_animations 2019-09-25 16:16:32 +01:00
Victor Cebollada e0fee3d87b gltf2.0 importer - Support for mesh morph animations added.
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
2019-09-25 09:58:23 +01:00
Kim Kulling 12a101124a
Merge branch 'master' into issue_2668 2019-09-24 19:29:40 +02:00
Alan b8e53c967f
Merge branch 'master' into issue_2668 2019-09-24 02:21:59 +01:00
Alan 17f55aa67e
Merge branch 'master' into issue_2662 2019-09-24 02:20:47 +01:00
Kim Kulling 3b2e0ebfc7
Merge branch 'master' into issue_2661 2019-09-23 16:59:28 +02:00
Theak 61fa619f92 Fix: Mismatched new/free in gltf2 importer (fixes #2668) 2019-09-22 10:24:30 +01:00
Theak 720ac4846b Fix: memory leak in gltf2 importer (fixes #2661) 2019-09-22 10:12:19 +01:00
Theak 0e6478c0d4 Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports (fixes #2662) 2019-09-22 09:59:58 +01:00
Kim Kulling 69087abc56 Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor. 2019-09-21 16:36:22 +02:00
Kim Kulling 79056da4be closes https://github.com/assimp/assimp/issues/2613 : merge glTF2 patch. 2019-09-14 09:12:08 +02:00
Kim Kulling a25a1f0772 fix the build. 2019-09-12 20:27:35 +02:00
Kim Kulling f9c6fed190 Add a camera unittest. 2019-09-11 22:34:53 +02:00
kimkulling 7ff7a5d64e glTF: Try to remove duplicate code. 2019-09-11 17:00:39 +02:00
Mike Samsonov b271091c64 fix division by zero 2019-09-05 11:44:02 +01:00