v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,312 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

77 Commits (edfaaed56fb656a3923807cac1c875cc8ff2f4ba)

Author SHA1 Message Date
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
Mike Samsonov 4029fe5e46 alloc-dealloc-mismatch 2019-09-05 11:44:02 +01:00
Mike Samsonov 9adc4e87fa alloc-dealloc-mismatch 2019-09-05 11:44:02 +01: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 fc065d8ab4 Merge branch 'master' into reorg 2019-06-11 20:59:46 +02:00
Kim Kulling f76d77955d Merge branch 'master' into reorg 2019-06-11 00:22:50 +02:00
Kim Kulling 2da3a38d60 Fix the compile pass, still unresolved symbols. 2019-06-10 23:26:00 +02:00
Kim Kulling 57c46db042 Reorg of code. 2019-06-06 14:45:43 +02:00