11a17ebfe6
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-20 20:03:30 +01:00
8ba1d38dea
Fix STL Expoter error.
2021-01-20 16:29:30 +08:00
f8dd3a9aa6
Update DefaultIOSystem.cpp
2021-01-20 08:05:43 +01:00
ed3e745752
Update DefaultIOSystem.cpp
2021-01-19 21:58:04 +01:00
f05a57560b
Remove buggy method.
2021-01-19 21:27:50 +01:00
22f632d8d0
Merge branch 'master' into kimkulling-oss_fuzz29168
2021-01-19 21:21:28 +01:00
5b325af79f
Fix typo.
2021-01-19 21:19:42 +01:00
5a6498af92
Fix nullptr access
2021-01-19 21:14:38 +01:00
4008862a35
Merge branch 'master' into ihsinme-patch-210
2021-01-19 21:05:43 +01:00
8f5148f108
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-18 17:15:40 -08:00
0bc5cf9fd3
Fix build failure on Linux
2021-01-18 16:17:28 -06:00
5a7f212162
Merge branch 'master' into ihsinme-patch-210
2021-01-18 21:55:42 +01:00
f24c042925
Fix typo
2021-01-18 20:28:38 +01:00
0803e5e6f3
Fix nullptr dereference in scenepreprocessor
2021-01-18 20:25:33 +01:00
17c79bcb94
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-15 13:47:21 -08:00
6d13fd6aa2
Fix glTF vertex colors with types other than float
2021-01-15 02:56:45 +00:00
a9705e346a
Merge branch 'master' into ihsinme-patch-210
2021-01-14 17:21:44 +01:00
87a6305cf0
Merge branch 'master' into gltf2_buffer_fixes
2021-01-12 18:32:17 +01:00
ff8d50c8d0
Fix MSVC compiler warnings
2021-01-12 08:23:53 -08:00
09c5564d5b
More compiler warnings
2021-01-12 08:16:08 -08:00
1fd8646b7a
Fix compiler warnings
2021-01-12 08:03:16 -08:00
070072370d
Update AMFImporter_Material.cpp
2021-01-12 15:43:40 +03:00
2e96366d04
Update AMFImporter_Geometry.cpp
2021-01-12 15:40:19 +03:00
9174bca3f7
closes https://github.com/assimp/assimp/issues/3517 : use const instead of constexpr
2021-01-12 10:01:53 +01:00
1042845414
Merge branch 'master' of https://github.com/assimp/assimp into tdb/pbrt3_exporter
2021-01-11 19:57:10 -08:00
71cfd8e0cf
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-11 19:54:11 -08:00
2bc074e35a
Additional PBRT exporter cleanups
2021-01-11 19:42:23 -08:00
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
938537c884
Checkpoint improvements to pbrt exporter
2021-01-08 16:57:22 -08:00
cf78781fa8
Merge branch 'master' into 3mf-improvements
2021-01-02 13:14:13 +01:00
3298082a96
Merge branch 'master' into update-unzip
2021-01-02 12:06:53 +01:00
07aace0fdd
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-31 07:08:31 +01:00
465220b26a
Merge branch 'master' into 3mf-improvements
2020-12-30 18:12:26 +01:00
e0803b3ec2
Merge branch 'master' into fix-gltf-bin-from-memory
2020-12-30 11:17:31 +01:00
b8d947299a
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-29 17:09:15 +01:00
37df38f951
[3MF] Improves node naming
2020-12-29 15:46:28 +01:00
4025c57fd0
[3MF] Parse the transform of the components
2020-12-28 15:47:20 +01:00
eda967bd02
Parse the <build> node + refactoring
2020-12-28 12:31:54 +01:00
07b59f539d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-28 08:48:54 +01:00
ca653e0c6a
Fix glTF from memory loading .bin with a custom IOHandler
2020-12-28 07:18:50 +00:00
eed75aaf2c
Remove debug print
2020-12-26 14:57:52 +01:00
0ec8d6e285
[3MF] Missing file in previous commit + parse object material in the importer
2020-12-26 14:04:45 +01:00
0952038461
Small refactoring on 3MF export
2020-12-26 03:02:18 +01:00
c10d592b79
Fix material parsing in the 3MF importer
2020-12-26 02:36:24 +01:00
77f9c2854a
Merge branch 'master' into fbx_tokenizer_fix
2020-12-25 21:44:26 +01:00
3f5238d7c1
Merge branch 'master' into gltf2_fixes
2020-12-24 16:48:36 +01:00
effe52368c
No need to allocate a full size buffer for small files
2020-12-24 12:18:07 +01:00
895137c7d7
Fix unzip max buffer length error
2020-12-24 11:39:59 +01:00
54be7ac582
Update unzip contrib
2020-12-24 01:53:40 +01:00
dbffe25c9d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-23 11:33:04 +01:00
383c97e380
Add KHR_materials_transmission during export
2020-12-23 10:43:21 +01:00
2b097c1e73
Add KHR_materials_transmission during import
2020-12-23 10:43:01 +01:00
197bf1e617
Add KHR_materials_clearcoat during export
2020-12-23 09:56:15 +01:00
f8c63d874b
support KHR_materials_clearcoat during import
2020-12-23 08:12:09 +01:00
b4b011e764
Merge branch 'master' into master
2020-12-22 11:11:45 +01:00
50f9fb28b6
Merge branch 'master' into fix-casting-mingw
2020-12-21 18:29:18 +01:00
aa9d6ce7b7
add support for khr_materials_sheen during export
2020-12-21 14:34:16 +01:00
0fdda99ea1
add underscore (MATERIAL_SHEEN instead of MATERIALSHEEN)
2020-12-21 14:33:35 +01:00
63b0a97369
import KHR_materials_sheen
2020-12-20 07:59:12 +01:00
981923821a
Merge branch 'master' into gltf2-exporter-crash
2020-12-18 16:27:06 +01:00
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
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
a15adc9fbc
Fixed copypaste error
2020-12-14 17:01:42 +00:00
9d3c0081eb
Throw if property length is out of bounds
2020-12-14 16:49:04 +00:00
1db51503d8
Throw instead of assert on invalid file input
2020-12-14 16:44:56 +00:00
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
4e9176d2cd
_dest may be destructed twice if _dest is not null in MergeScenes()
2020-12-14 19:16:29 +08:00
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
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
33e7e2366c
Merge branch 'master' into gltf2-exporter-crash
2020-12-13 16:48:40 +01:00
c65f2cb3fb
Remove extra semicolon while GCC being pedantic.
2020-12-13 00:12:44 +05:30
e2af015a57
Common: Fix GCC error invalid conversion in MINGW.
2020-12-11 21:43:09 +05:30
7dd0596010
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-11 14:31:00 +01:00
a2adef8726
Merge branch 'master' into add-msvc-check
2020-12-11 14:11:10 +01:00
8701a86c9d
Fixed a crash of the Gltf 2 exporter in the case of an animation without a translation, rotation or scale animation key.
2020-12-10 23:47:54 +01:00
e4a1fb171e
Merge branch 'master' into master
2020-12-09 17:58:18 +01:00
6db5b7046f
Provide option for rapidjson no-member-iterator define
...
Originally added to fix warning on MSVC but breaks android build
2020-12-09 20:21:43 +09:00
816bbc852c
Merge branch 'master' into master
2020-12-08 19:54:04 +01:00
c0d7ea981a
Merge branch 'master' into gltf_fixes
2020-12-04 16:02:16 +01:00
eccdc6dc96
Merge branch 'master' into master
2020-12-04 15:30:56 +01:00
5020a0aa33
Merge branch 'master' into fbxExceptionSafety
2020-12-04 11:01:56 +01:00
e737adde50
Merge branch 'master' into gltf_fixes
2020-12-04 08:58:52 +00:00
f67a9f253f
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-03 22:20:01 +01:00
c7aeb882e6
Update ScenePreprocessor.cpp
2020-12-03 17:28:51 +01:00
471d2acc92
Improvements & style
2020-12-03 11:17:45 +00:00
c5f45e26bd
Merge branch 'master' into scenepreprocessor-memoryleak
2020-12-03 10:08:05 +01:00
19af3f0d31
Swap the meaning using the out_mat property.
2020-12-02 16:59:29 +00:00
8d8ba521e2
Check _MSC_VER for MSVC specific pragma directives.
...
This fixes build issues when compiled with compiles like Clang or GCC.
2020-12-02 02:05:14 +05:30
f7be3048de
New 3ds Max PBR Materials in FBX
2020-12-01 12:05:42 +00:00
b47c5c8c27
glTF2Exporter: fix crash when exporting a scene with several meshes per node (regression coming from commit e8d2b84 on 08/03/2020 "clean all warnings for vs-2019")
2020-11-30 20:11:41 +01:00
53ff0702ce
Fixed check for base64 char values
2020-11-30 16:21:29 +00:00
7d72c78c8e
Some improvements
2020-11-30 15:20:51 +00:00
6ed1488e6e
* Improved error messages
...
* Throw instead of asserts on invalid file input
2020-11-30 15:04:06 +00:00
4d4a3c42f6
Fix for 3489 | Preserve morph targets when splitting by bone count
2020-11-28 10:01:50 -08:00
88be8ec698
Merge branch 'master' into fbxExceptionSafety
2020-11-27 21:49:58 +01:00
149b8d1fd1
Don't need operator< either.
2020-11-27 14:26:51 +00:00
14f79caf41
textures_converted keys can just be pointers
2020-11-26 16:29:37 +00:00
ea60563822
Merge branch 'master' into scenepreprocessor-memoryleak
2020-11-26 08:57:57 +00:00
4590f06756
Merge branch 'master' into master
2020-11-25 16:57:49 +01:00
c059e58c5e
Merge branch 'master' into fbxparser-overead
2020-11-24 08:36:15 +01:00
fe78310486
Merge branch 'master' into fbxExceptionSafety
2020-11-23 10:08:23 +01:00
98e42e22b8
Added check around setting pScene->mName from asset.scene.
2020-11-22 15:49:41 +10:00
30584c1ec1
Replaced name with scene_name to avoid shadowing.
2020-11-22 15:36:08 +10:00
67abcb10ba
Added mName to aiScene. Primarily to provide access to the "name" member of glTF2 scenes.
2020-11-22 15:33:31 +10:00
885a196c74
Unsigned
2020-11-19 16:30:44 +00:00
8108338215
Merge branch 'master' into master
2020-11-19 16:34:15 +01:00
fc842a0f97
Sceneprecessor potential memory leak
2020-11-19 13:20:43 +00:00
7b59cc297e
FBXParser.cpp - handle buffer over-read cases correctly
2020-11-19 12:20:06 +00:00
d10bf9a0d3
Merge branch 'master' into master
2020-11-18 21:30:58 +01:00
e3083c21f0
glTF2: import correct animation values for CUBICSPLINE
...
CUBICSPLINE interpolation has tangent values with the animation data.
Current import don't care this interpolation type but it will help not
to fetch tangent values instead of animation data.
Note: Assimp cannot support interpolation types yet.
2020-11-17 17:21:07 +01:00
c00153089a
Neater construction
2020-11-17 10:45:10 +00:00
213a9f9d55
First pass at PotentialNode
2020-11-17 10:39:03 +00:00
c4573a6d5c
Merge branch 'master' into findDegeneratesOptimization
2020-11-17 09:44:13 +00:00
c4ba5eeeea
Merge branch 'master' into issue_3500
2020-11-16 21:52:14 +01:00
3221522f95
Prevent crash with malformed texture reference
2020-11-16 17:29:19 +00:00
d9b90f714a
Fix typo
2020-11-16 11:06:39 +00:00
3ce0958b98
Merge branch 'master' into findDegeneratesOptimization
2020-11-16 09:13:13 +00:00
09ca11d063
Fixing issue 3500, invalid outer cone angle readed from gltf2 file on machines which defines M_PI as a double value
2020-11-16 09:19:13 +01:00
647cef8a8b
Merge branch 'master' into nullBufferviewFix
2020-11-15 19:02:09 +01:00
0d5e5790cb
Fix findings.
2020-11-14 12:44:49 +01:00
db7e594221
Merge branch 'master' into findDegeneratesOptimization
2020-11-14 12:32:57 +01:00
8845d7eed3
Prevent to generate redundant morph targets for glTF2
2020-11-11 20:49:22 +01:00
fa0951012f
closes https://github.com/assimp/assimp/issues/1044 : fix envelope handling in lightintensity.
2020-11-11 20:32:55 +01:00
707ad68fba
Merge branch 'master' into findDegeneratesOptimization
2020-11-11 09:54:08 +01:00
ab34b25a03
Merge branch 'master' into kimkulling-patch-8
2020-11-10 15:32:04 +01:00
8c91d1a3cd
closes https://github.com/assimp/assimp/issues/3198 : make aiMaterial::GetName const.
2020-11-10 12:50:17 +01:00
a8381113eb
Update ObjFileMtlImporter.cpp
2020-11-10 10:23:28 +01:00
856d4c016e
closes https://github.com/assimp/assimp/issues/3448
...
Add transmission alpha value. if any.
2020-11-10 10:03:09 +01:00
0f246edb97
Prevent GetValue from corrupting memory
2020-11-06 13:43:16 +00:00
34e3e6293a
Style
2020-11-06 09:57:48 +00:00
0af05e7a60
Better message
2020-11-05 15:10:52 +00:00
01b2088dd3
A missing bufferview was causing a crash.
2020-11-05 15:02:41 +00:00
6873d79505
Delete AMFImporter_Postprocess.cpp
2020-11-03 13:00:28 +01:00
3deae8760c
Optimize FindDegenerates so it doesn't explode
2020-11-02 14:43:35 +00:00
206f28b8ad
Merge branch 'master' into fix/3365
2020-10-29 13:40:00 +01:00
72bc41b50f
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-28 22:00:08 +01:00
8c135f779e
Merge branch 'master' into readFbxWeightsInConfig
2020-10-28 20:38:29 +01:00
3fd95aff4e
Merge branch 'master' into fix/3365
2020-10-27 17:43:28 +01:00
df768bdd99
Merge branch 'master' into patch-1
2020-10-27 16:20:33 +01:00
7e1a8f09c5
more openddl-fixes
2020-10-26 21:35:44 +01:00
aee2e9a87d
Merge branch 'master' into patch-1
2020-10-25 20:35:06 +01:00
57e691e28e
openddl: latest greatest.
2020-10-25 10:34:43 +01:00
55feb0cb78
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-23 22:06:49 +02:00
4006bb71f4
Fixes for crashes in GLTF2 Importer
2020-10-23 12:01:43 +01:00
cea54d1ac5
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-23 14:06:25 +08:00
6ee5e248ee
Fix typo
2020-10-22 22:26:29 +02:00
b168d8f441
replaced data with taking address of first element
...
oops, seems like `data()` returns `char*` only since C++17. Replaced with taking address of first string element
2020-10-21 23:41:33 +03:00
7781fe5781
MSVC crash workaround
...
I do not know why, but the following line causes crash if assimp was compiled using MSVC with RelWithDebInfo configuration:
`std::transform(shading.begin(), shading.end(), shading.begin(), Assimp::ToLower<char>);`
replacing `shading.begin()` with `shading.data()` fixes this issue.
2020-10-21 23:21:50 +03:00
b842b4a3c1
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-21 20:02:48 +02:00
bbac168ced
Merge branch 'master' into collada_cleanup
2020-10-19 23:56:52 +02:00
Kim Kulling
xiaohunqupo
Matt Pharr
Dan Church
Maki
ihsinme
kkulling
Max Vollmer
Danny-Kint
Jean-Louis
Danny-Kint
Danny Kabrane
Inho Lee
wasd845
Biswapriyo Nath
tellypresence
Max Vollmer (Microsoft Havok)
Malcolm Tyrrell
FRICOTEAUX
Oleg Bogdanov
Neil Clifford
Evangel
Neil Clifford
Malcolm Tyrrell
Jean-François Verdon
Kim Kulling
John Mai
#Momo