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
ihsinme
070072370d
Update AMFImporter_Material.cpp
2021-01-12 15:43:40 +03:00
ihsinme
2e96366d04
Update AMFImporter_Geometry.cpp
2021-01-12 15:40:19 +03:00
kkulling
9174bca3f7
closes https://github.com/assimp/assimp/issues/3517 : use const instead of constexpr
2021-01-12 10:01:53 +01:00
Max Vollmer
d49aed4585
* Check that buffer view has buffer
...
* Handle integer overflow when calculating byte length
* Minor code cleanup for exception messages
2021-01-11 08:45:47 +00:00
Kim Kulling
cf78781fa8
Merge branch 'master' into 3mf-improvements
2021-01-02 13:14:13 +01:00
Kim Kulling
3298082a96
Merge branch 'master' into update-unzip
2021-01-02 12:06:53 +01:00
Danny-Kint
07aace0fdd
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-31 07:08:31 +01:00
Kim Kulling
465220b26a
Merge branch 'master' into 3mf-improvements
2020-12-30 18:12:26 +01:00
Kim Kulling
e0803b3ec2
Merge branch 'master' into fix-gltf-bin-from-memory
2020-12-30 11:17:31 +01:00
Danny-Kint
b8d947299a
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-29 17:09:15 +01:00
Jean-Louis
37df38f951
[3MF] Improves node naming
2020-12-29 15:46:28 +01:00
Jean-Louis
4025c57fd0
[3MF] Parse the transform of the components
2020-12-28 15:47:20 +01:00
Jean-Louis
eda967bd02
Parse the <build> node + refactoring
2020-12-28 12:31:54 +01:00
Danny-Kint
07b59f539d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-28 08:48:54 +01:00
Maki
ca653e0c6a
Fix glTF from memory loading .bin with a custom IOHandler
2020-12-28 07:18:50 +00:00
Jean-Louis
eed75aaf2c
Remove debug print
2020-12-26 14:57:52 +01:00
Jean-Louis
0ec8d6e285
[3MF] Missing file in previous commit + parse object material in the importer
2020-12-26 14:04:45 +01:00
Jean-Louis
0952038461
Small refactoring on 3MF export
2020-12-26 03:02:18 +01:00
Jean-Louis
c10d592b79
Fix material parsing in the 3MF importer
2020-12-26 02:36:24 +01:00
Kim Kulling
77f9c2854a
Merge branch 'master' into fbx_tokenizer_fix
2020-12-25 21:44:26 +01:00
Kim Kulling
3f5238d7c1
Merge branch 'master' into gltf2_fixes
2020-12-24 16:48:36 +01:00
Jean-Louis
effe52368c
No need to allocate a full size buffer for small files
2020-12-24 12:18:07 +01:00
Jean-Louis
895137c7d7
Fix unzip max buffer length error
2020-12-24 11:39:59 +01:00
Jean-Louis
54be7ac582
Update unzip contrib
2020-12-24 01:53:40 +01:00
Danny-Kint
dbffe25c9d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-23 11:33:04 +01:00
Danny Kabrane
383c97e380
Add KHR_materials_transmission during export
2020-12-23 10:43:21 +01:00
Danny Kabrane
2b097c1e73
Add KHR_materials_transmission during import
2020-12-23 10:43:01 +01:00
Danny Kabrane
197bf1e617
Add KHR_materials_clearcoat during export
2020-12-23 09:56:15 +01:00
Danny Kabrane
f8c63d874b
support KHR_materials_clearcoat during import
2020-12-23 08:12:09 +01:00
Kim Kulling
b4b011e764
Merge branch 'master' into master
2020-12-22 11:11:45 +01:00
Kim Kulling
50f9fb28b6
Merge branch 'master' into fix-casting-mingw
2020-12-21 18:29:18 +01:00
Danny Kabrane
aa9d6ce7b7
add support for khr_materials_sheen during export
2020-12-21 14:34:16 +01:00
Danny Kabrane
0fdda99ea1
add underscore (MATERIAL_SHEEN instead of MATERIALSHEEN)
2020-12-21 14:33:35 +01:00
Danny Kabrane
63b0a97369
import KHR_materials_sheen
2020-12-20 07:59:12 +01:00
Kim Kulling
981923821a
Merge branch 'master' into gltf2-exporter-crash
2020-12-18 16:27:06 +01:00
Inho Lee
4e5b25cd81
Keep AnimMesh data during the SortByPTypeProcess
...
A Postprocessing step, SortByPTypeProcess, can rebuild Mesh data,
but it does not handle AnimMesh.
This patch helps to rebuild appropriate AnimMeshes for the Mesh.
2020-12-16 19:19:30 +01:00
Inho Lee
b8bf1eac04
FBXConverter : Fix timescales of FBX animations
...
FBX animations were recorded by framenumber, not by time.
This patch will change it as a base of milliseconds.
2020-12-16 15:02:46 +01:00
Max Vollmer
a15adc9fbc
Fixed copypaste error
2020-12-14 17:01:42 +00:00
Max Vollmer
9d3c0081eb
Throw if property length is out of bounds
2020-12-14 16:49:04 +00:00
Max Vollmer
1db51503d8
Throw instead of assert on invalid file input
2020-12-14 16:44:56 +00:00
Max Vollmer
5436e16802
* Fix memory leak in GLTF2 Importer that occurs when an exception gets thrown while constructing a scene
...
* Fix crash in GLTF2 Importer when a scene with dangling/uninitialized pointers gets deleted after an exception was thrown
* Fix crash in GLTF2 Importer when channel sampler is not set (negative index)
2020-12-14 16:37:02 +00:00
wasd845
4e9176d2cd
_dest may be destructed twice if _dest is not null in MergeScenes()
2020-12-14 19:16:29 +08:00
Jean-Louis Boudrand
922f874e78
Merge branch 'gltf2-exporter-crash' of https://github.com/JLouis-B/assimp into gltf2-exporter-crash
2020-12-13 17:03:09 +01:00
Jean-Louis Boudrand
d18fce3f06
Fix https://github.com/assimp/assimp/issues/3054
...
Corrected the animation of each bone of an animation were exported in different animations (+tabs fixes)
2020-12-13 17:02:50 +01:00
Jean-Louis Boudrand
33e7e2366c
Merge branch 'master' into gltf2-exporter-crash
2020-12-13 16:48:40 +01:00
Biswapriyo Nath
c65f2cb3fb
Remove extra semicolon while GCC being pedantic.
2020-12-13 00:12:44 +05:30
Biswapriyo Nath
e2af015a57
Common: Fix GCC error invalid conversion in MINGW.
2020-12-11 21:43:09 +05:30
Kim Kulling
7dd0596010
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-11 14:31:00 +01:00
