523e6c9f73
Merge branch 'master' into gltf-camera-pos
2020-02-14 08:21:54 +01:00
18c01a023c
Use the translation matrix in gltf2 cameras for aiCamera.mPosition
2020-02-05 21:24:54 +00:00
194d31002d
Import/export of embedded texture names for the glTF/glTF2 format
2020-01-29 14:04:41 +01:00
4e7e47bd43
Updated copyright dates.
...
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".
Changed copyright end year to 2020 in LICENCE.rtf.
Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
2020-01-20 08:53:12 -05:00
9b8f2970c8
Update glTF2Importer.cpp
...
- fix compiler error: invalid == operator
- Fix compiler warning: conversion from double to ai_real
2020-01-07 21:22:41 +01:00
f04573984a
Update glTF2Importer.cpp
...
Remove dead code
2020-01-07 20:41:37 +01:00
9ef2d7fb7d
Merge branch 'master' into collada_modeller_metadata
2019-12-13 08:28:50 +01:00
b6553b8a78
Merge branch 'master' into fixTexcoord
2019-12-12 12:19:02 +00:00
b70c05b4e0
Fix texcoords.
2019-12-12 09:38:50 +00:00
986b67801d
Add Copyright common metadata to glTF importer/exporter
...
Technically this only exists in glTF v2 but may as well include in both
2019-12-09 14:30:12 +00:00
fabfcf3cb0
More checking
2019-12-05 12:33:00 +00:00
894b8e3519
Initial version
2019-12-05 12:32:22 +00:00
30851b796f
Update glTF2Importer.cpp
...
Make them const
2019-11-27 17:18:12 +01:00
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
7230f32c14
Fix issue with y UV translation. Fixes #2119 .
2019-11-25 20:58:21 +11:00
75204e20bd
fix invalid setup for texture enum.
2019-11-16 19:22:37 +01:00
17257cd2ae
just a try, i dunno have a clue ...
2019-11-16 15:51:26 +01:00
2eed8b1820
TextureTransform: set material transform only when the extension is provided.
2019-11-16 08:08:57 +01:00
a8182d86cb
fix initialization + some vs2019 compiler warnings.
2019-11-15 19:38:37 +01:00
17946e26ef
add missing setup of texture transform in aiMaterial.
2019-11-15 18:35:33 +01:00
9bc2648615
Merge branch 'master' into fix-gltf-importer-crash
2019-10-21 15:29:18 +01:00
5a1276032e
Add bound checks.
2019-10-08 12:51:08 +01:00
6550b1df61
Merge branch 'master' into gltf_mesh_morph_animations
2019-10-01 08:04:46 +01:00
7a8b7ba88d
aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0
2019-09-29 10:09:53 +01:00
2757297b4f
Merge branch 'master' into issue_2662
2019-09-26 09:55:16 +02:00
8ca39ade6a
Merge branch 'master' into gltf_mesh_morph_animations
2019-09-25 16:16:32 +01:00
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
12a101124a
Merge branch 'master' into issue_2668
2019-09-24 19:29:40 +02:00
b8e53c967f
Merge branch 'master' into issue_2668
2019-09-24 02:21:59 +01:00
17f55aa67e
Merge branch 'master' into issue_2662
2019-09-24 02:20:47 +01:00
3b2e0ebfc7
Merge branch 'master' into issue_2661
2019-09-23 16:59:28 +02:00
61fa619f92
Fix: Mismatched new/free in gltf2 importer ( fixes #2668 )
2019-09-22 10:24:30 +01:00
720ac4846b
Fix: memory leak in gltf2 importer ( fixes #2661 )
2019-09-22 10:12:19 +01:00
0e6478c0d4
Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports ( fixes #2662 )
2019-09-22 09:59:58 +01:00
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
79056da4be
closes https://github.com/assimp/assimp/issues/2613 : merge glTF2 patch.
2019-09-14 09:12:08 +02:00
a25a1f0772
fix the build.
2019-09-12 20:27:35 +02:00
f9c6fed190
Add a camera unittest.
2019-09-11 22:34:53 +02:00
7ff7a5d64e
glTF: Try to remove duplicate code.
2019-09-11 17:00:39 +02:00
b271091c64
fix division by zero
2019-09-05 11:44:02 +01:00
4029fe5e46
alloc-dealloc-mismatch
2019-09-05 11:44:02 +01:00
9adc4e87fa
alloc-dealloc-mismatch
2019-09-05 11:44:02 +01:00
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
fc065d8ab4
Merge branch 'master' into reorg
2019-06-11 20:59:46 +02:00
f76d77955d
Merge branch 'master' into reorg
2019-06-11 00:22:50 +02:00
2da3a38d60
Fix the compile pass, still unresolved symbols.
2019-06-10 23:26:00 +02:00
57c46db042
Reorg of code.
2019-06-06 14:45:43 +02:00
Kim Kulling
Luke Lau
Loïc
Marc-Antoine Lortie
Malcolm Tyrrell
Malcolm Tyrrell
RichardTea
Paul Arden
Kim Kulling
vcebollada
Theak
Alan
Mike Samsonov
petrmohelnik