Commit Graph

17 Commits (d14249e0eee2bc965516380cb312381d7f1dcaec)

Author SHA1 Message Date
bill.shan d2ed36756c fix bug:Using custom IO logic in Android platform, importing from 'assets' dir,there comes to be one more '/', which makes the '.bin' file loads failed. 2019-12-27 11:21:05 +08:00
Kim Kulling 903ce59ffe
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception 2019-12-02 19:07:44 +01: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
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
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 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 79056da4be closes https://github.com/assimp/assimp/issues/2613 : merge glTF2 patch. 2019-09-14 09:12:08 +02:00
kimkulling 7ff7a5d64e glTF: Try to remove duplicate code. 2019-09-11 17:00:39 +02:00
petrmohelnik 9330cca1cd glTF 2.0 Lights import
Importing of lights according to glTF 2.0 extension KHR_lights_punctual https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual

Since glTF lights are based on PBR they use different attenuation model than conventional lights supported by assimp. It is possible to use attenuation factors in assimp to describe inverse square law fallof. But the light structure does not provide means to save range property. Therefore I resorted to use of metadata. When range parameter is present, I put it into 'PBR_LightRange' metadata of light's node. Please, see comment in glTF2Importer file.
2019-08-03 20:51:00 +02:00
Kim Kulling f76d77955d Merge branch 'master' into reorg 2019-06-11 00:22:50 +02:00
Kim Kulling 57c46db042 Reorg of code. 2019-06-06 14:45:43 +02:00