d79e0c0ba9
Avoid std::make_unique
...
Assimp is still C++11
2021-01-26 17:33:10 +00:00
c917e6513f
Merge branch 'master' into issue_2195_draco
2021-01-26 16:43:46 +00:00
f39ba8ddb2
Add compile error for bad error draco config
...
KHR_draco_mesh_compression requires
DRACO_MESH_COMPRESSION_SUPPORTED
2021-01-26 16:24:18 +00:00
dde7605158
Implement draco decoding
2021-01-26 16:08:12 +00:00
d7bf513250
renaming iterator to avoid any possibility of scop collisions
2021-01-26 01:36:12 -08:00
69fc809307
size_t is not the same as unsigned int on some systems
2021-01-26 01:01:59 -08:00
f92a34e0b7
Merge branch 'master' into ColladaSubmeshFix
2021-01-26 00:38:37 -08:00
243d017463
Add missing skip
...
- closes https://github.com/assimp/assimp/issues/3601
- Fix some format issues
2021-01-24 18:47:50 +01:00
a2b889ab09
Fix typo in collada parser
...
closes https://github.com/assimp/assimp/issues/3599
2021-01-24 18:21:46 +01:00
6ebae5e67c
GCC 11 build fixes
2021-01-24 11:04:46 +02:00
338abded12
ColladaLoader now assigns individual materials to submeshes as needed
...
Optional assignment of individual materials to submeshes, addresses #3606
2021-01-23 02:20:58 -08:00
91dc904ed1
Merge branch 'master' into master
2021-01-22 13:25:31 -08:00
e792455d66
Remove redundant statement in if
...
- closes https://github.com/assimp/assimp/issues/3180
2021-01-22 14:22:34 +01:00
dc4514de82
Update COBLoader.cpp
...
Fix cppcheck finding
2021-01-22 13:23:39 +01:00
0dcd72d420
Update IFCOpenings.cpp
2021-01-22 13:18:43 +01:00
f44572157a
Update 3DSLoader.cpp
2021-01-22 13:14:59 +01:00
f2d3f0dbe6
Merge branch 'master' into master
2021-01-22 12:35:44 +01:00
2bcf08370d
Merge branch 'master' into fix-gltf-vertex-colors
2021-01-21 11:54:02 +01:00
d7cf7847ba
Merge branch 'master' into master
2021-01-20 18:47:39 -08:00
01e61c8b9f
customized node transformation format
2021-01-20 18:42:56 -08:00
8ba1d38dea
Fix STL Expoter error.
2021-01-20 16:29:30 +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
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
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
cf78781fa8
Merge branch 'master' into 3mf-improvements
2021-01-02 13:14:13 +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
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
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
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
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
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
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
471d2acc92
Improvements & style
2020-12-03 11:17:45 +00: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
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
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
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
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
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
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
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
8c135f779e
Merge branch 'master' into readFbxWeightsInConfig
2020-10-28 20:38:29 +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
4006bb71f4
Fixes for crashes in GLTF2 Importer
2020-10-23 12:01:43 +01: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
69143ed149
fix unittests.
2020-10-19 23:53:27 +02:00
080322b9e2
cleanup collada xml migration.
2020-10-19 19:06:11 +02:00
a2cd5619b4
Merge branch 'master' into readFbxWeightsInConfig
2020-10-19 10:16:02 +01:00
ad7f8910e9
Rollback the method to handle empty bones for GLTF2
...
A patch made the assimp to ignore empty bones.
However, some assets can have bones which don't have weights
but are connected to other bones.
2020-10-16 17:09:17 +02:00
9f880e2214
Fix glTF1 orthographic camera
2020-10-16 08:56:55 +02:00
0363c18f1f
Read weights
2020-10-15 10:07:24 +01:00
7660070aa4
Merge branch 'master' into master
2020-10-14 21:01:35 +02:00
857f62cde0
closes pParam.mReference = source;
2020-10-14 20:34:46 +02:00
6848a18999
Fix for issue #3445
...
Add const to avoid creating a temporary copy.
This should fix the cmake compilation error on XGLLoader.cpp shown in bug #3445
The fix is similar to commit bbe6f7f213
2020-10-13 21:56:43 +03:00
636f28965f
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-11 18:13:43 +02:00
eb9928e029
fix for fbx files using stringray materials;
2020-10-09 07:28:15 +01:00
20733537d7
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-08 09:54:04 +01:00
152343b186
Merge branch 'master' into master
2020-10-06 08:35:26 +05:30
4bdaf20b70
Add comment.
2020-10-05 14:23:42 +01:00
f2b3ec2e0c
strict-aliasing level 3 warnings fix
2020-10-05 15:29:09 +05:30
585fb89154
Make an assert a DeadlyImportError.
2020-10-02 15:25:16 +01:00
6b9c477763
The floar parsing routines are now DeadlyErrors.
2020-10-02 13:58:55 +01:00
c7f7ed8901
Update ColladaLoader.cpp
2020-09-30 20:51:54 +02:00
0191c661b5
fix division by zero.
2020-09-30 20:39:26 +02:00
177426185e
Fix invalid cast
2020-09-30 16:38:13 +02:00
50d21e08f3
fix memoy leak.
2020-09-30 12:05:32 +02:00
788099a223
Merge branch 'master' into pugi_xml
2020-09-29 21:29:37 +02:00
c591f7de2f
make xml parsing more verbose.
2020-09-29 21:01:10 +02:00
db49a541c3
remove unused attributes.
2020-09-28 20:35:30 +02:00
ef9a78b49d
remove unused attributes.
2020-09-28 20:34:44 +02:00
bf4ad2837f
Remove dead code.
2020-09-28 15:20:59 +02:00
c598a12340
Remove unused variable.
2020-09-28 09:15:56 +02:00
89ac168014
ogre: fix warning: not inited variable.
2020-09-27 21:23:55 +02:00
1c85676a9c
collada: fix warning: not inited variable.
2020-09-27 21:19:23 +02:00
052cc2e070
collada: fix warning: not inited variable.
2020-09-27 21:16:51 +02:00
5038f21d06
collada: fix warning: not inited variable.
2020-09-27 21:14:21 +02:00
202907d471
collada: fix warning: unused variable.
2020-09-27 21:11:42 +02:00
3f97a1df2c
collada: fix warning: unused variable.
2020-09-27 21:09:06 +02:00
bdd3c96eee
amf: fix warning: unused variable.
2020-09-27 21:06:14 +02:00
5877f81419
amf: fix warning: unused variable.
2020-09-27 21:03:59 +02:00
5230b91611
amf: fix warning: unused variable.
2020-09-27 21:01:48 +02:00
8143ea5aec
amf: fix warning: unused variable.
2020-09-27 20:58:08 +02:00
RichardTea
contriteobserver
Kim Kulling
Ville Voutilainen
thomasbiang
ywang
xiaohunqupo
Maki
ihsinme
kkulling
Max Vollmer
Danny-Kint
Jean-Louis
Danny-Kint
Danny Kabrane
Inho Lee
Biswapriyo Nath
Malcolm Tyrrell
FRICOTEAUX
Evangel
Neil Clifford
Jean-François Verdon
Kim Kulling
#Momo
Malcolm Tyrrell
Jukka Maatta
Sahin Serdar Kocdemir
Optimizer0
Isuru2000psn