Kim Kulling
0b61a8875a
Merge branch 'master' into patch-1
2021-04-14 10:22:42 +02:00
Hill Ma
4aa52b3af8
Flip the check on _MSC_VER for using TR1 containers.
2021-04-13 11:15:52 -07:00
Kim Kulling
263d450300
Merge branch 'master' into master
2021-04-12 09:35:03 +02:00
Kim Kulling
a3ee377af7
Merge branch 'master' into ms3d-fixes
2021-04-11 19:12:06 +02:00
Kim Kulling
cf4ef04a80
Merge branch 'master' into master
2021-04-07 20:58:40 +02:00
Clement JACOB
e66232d8c3
Merge branch 'master' into feature/gltf_fb_ngon_encoding
2021-04-07 13:54:31 +02:00
Patrick Walton
a44ba41413
Fix incorrect indices in the MilkShape 3D loader
2021-04-05 19:14:48 -07:00
Kim Kulling
7fee914776
Fix direct leak
...
closes https://github.com/assimp/assimp/issues/3747
2021-04-05 21:24:54 +02:00
Garux
437d7bf8b8
Fix MDC loader
...
placement new was clearing input buffer by constructor, which was nothing to do with adequate parsing
changes are not analyzed in depth, but at least test model and models of Wolf:ET are loading and not crashing
2021-04-05 16:39:41 +03:00
Kim Kulling
22413d85ad
Merge branch 'master' into MalcolmTyrrell/tangentCheck
2021-04-03 17:42:44 +02:00
Kim Kulling
80fc8538be
Update AMFImporter_Material.cpp
2021-04-03 10:29:16 +02:00
Kim Kulling
d62c89557b
Remove dead code
2021-04-03 10:28:19 +02:00
Kim Kulling
46e49d0b83
Update AMFImporter_Geometry.cpp
2021-04-03 10:27:54 +02:00
Kim Kulling
cdb6a62cdb
Merge branch 'master' into issue_3678
2021-04-03 10:27:07 +02:00
Kim Kulling
da0543972b
Fix parsing for AMF-Files.
2021-04-03 10:25:03 +02:00
Kim Kulling
89a8f87dae
AMF: Remove unused macros
2021-04-02 13:10:24 +02:00
Clement Jacob
596001c89c
Refactoring the extension
2021-03-30 09:10:50 +02:00
Clement Jacob
8e589221d7
[gltf2-exporter] Adding FB_ngon_encoding support
2021-03-30 09:10:50 +02:00
Kim Kulling
f61a41bdd9
Merge branch 'master' into fbxBlendshapes
2021-03-29 21:48:51 +02:00
Bernold Kraft
09d3266250
Fixing 3DS import for CHUNK_TRMATRIX translation vector.
2021-03-29 15:31:08 +02:00
urschanselmann
5755530bab
Merge branch 'master' into master
2021-03-28 17:40:17 +02:00
Kim Kulling
e5862c18be
Merge branch 'master' into fbxBlendshapes
2021-03-28 13:02:35 +02:00
Bernold Kraft
348c34811f
Fixing CHUNK_TRMATRIX translation sub chunk
...
and therefore omitting the transform aggregation in the CHUNK_VERTLIST.
2021-03-26 22:21:45 +01:00
Gordon Chapman
3fd865b4bf
Added Blendshape Support to FBX Export
2021-03-24 18:10:03 -07:00
Malcolm Tyrrell
d94ddd32b1
Extra check. Better logging.
2021-03-24 11:04:39 +00:00
Malcolm Tyrrell
add165c4a1
Check target sizes to avoid reading beyond allocation
2021-03-24 10:55:40 +00:00
urschanselmann
0a1efe5d58
Merge branch 'master' into master
2021-03-21 17:19:43 +01:00
urschanselmann
86c05a1154
Merge branch 'master' into master
2021-03-19 18:15:15 +01:00
Kim Kulling
5f652feb75
Merge branch 'master' into MalcolmTyrrell/gltfCrashes
2021-03-19 13:35:13 +01:00
Hill Ma
3e99385f44
Fix a memory leak in glTF2.
...
The destructor of LazyDict uses `delete` but `delete` was not used for objects removed by LazyDict::Remove.
2021-03-17 15:12:54 -07:00
Urs Hanselmann
d9cd07f0d9
Merge branch 'master' of https://github.com/assimp/assimp
2021-03-17 18:26:11 +01:00
Malcolm Tyrrell
3503252e12
Strict check for accessor "count"
2021-03-16 11:47:19 +00:00
Malcolm Tyrrell
e4983aa16e
Fix code issue
2021-03-15 16:46:41 +00:00
Malcolm Tyrrell
57652a9084
Version is strictly a string
2021-03-15 16:27:50 +00:00
Malcolm Tyrrell
053c0f5e0a
Catch type errors in gltf and try to print out useful context.
2021-03-15 13:06:11 +00:00
Kim Kulling
84cd1d95c7
Merge branch 'master' into FixClangCL
2021-03-12 15:26:49 +01:00
Urs Hanselmann
c0c7e6a0de
trim uvIndices to fix import of Cheetah3D generated fbx files
2021-03-12 14:48:38 +01:00
Urs Hanselmann
cc7e229c3c
disable size check
2021-03-12 08:55:11 +01:00
Kim Kulling
51ad88afb6
Merge branch 'master' into master
2021-03-10 20:35:37 +01:00
Kim Kulling
806b12dc8b
Merge branch 'master' into issue_3678
2021-03-10 19:51:04 +01:00
Kim Kulling
732e9386aa
Merge branch 'master' into master
2021-03-10 11:49:13 +01:00
Kim Kulling
6c89631581
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-09 21:08:28 +01:00
Minmin Gong
c6c0f141f1
Fix compiling issues in clang-cl
2021-03-03 22:30:36 -08:00
Kim Kulling
ff769ecce2
Merge branch 'master' into sparse_minmax
2021-03-02 12:30:01 +01:00
Kim Kulling
75210576cf
Merge branch 'master' into sparse_minmax
2021-03-01 21:34:24 +01:00
contriteobserver
111752cff0
workaround for ASSIMP_DOUBLE_PRECISION compile errors
...
changed float types to ai_real types as needed
addresses issue #3682
2021-02-28 14:45:39 -08:00
Kim Kulling
c669c8f1eb
Merge branch 'master' into update_copyrights
2021-02-28 12:18:41 +01:00
Kim Kulling
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
Kim Kulling
5b78e3fb5d
Merge branch 'master' into user/mavollme/GLTF2_CheckNormalCount
2021-02-25 21:29:03 +01:00
Max Vollmer (Microsoft Havok)
eef03c1f17
Improved warnings
2021-02-24 14:28:18 +00:00
Max Vollmer (Microsoft Havok)
facb7da701
Check that normal count and tangent count matches vertex count. Ignore data and warn if counts don't match.
2021-02-24 14:19:29 +00:00
Turo Lamminen
3e1c785d31
[3MF] Silence uninitialized variable warning
...
This is a false positive but the compiler can't see it
2021-02-24 10:59:59 +02:00
thomasbiang
5429475339
Merge branch 'master' into sparse_minmax
2021-02-23 12:30:53 -08:00
ywang
72efb4354a
Merge branch 'master' of https://github.com/thomasbiang/assimp into sparse_minmax
2021-02-23 12:12:36 -08:00
Kim Kulling
247fd0ce17
Merge branch 'master' into FixAnimName
2021-02-22 20:38:16 +01:00
Kim Kulling
616d924d29
Merge branch 'master' into master
2021-02-20 19:35:31 +01:00
Kim Kulling
6094da3493
Update glTF2Asset.inl
2021-02-18 09:32:37 +01:00
Minmin Gong
d57b78bc98
Export the animation name to gltf2
2021-02-16 20:22:08 -08:00
RichardTea
f1d225c18d
Merge branch 'master' into issue_2195_draco
2021-02-15 18:05:22 +00:00
Kim Kulling
047b45d172
Fix apha value
...
- The alpha value in materials using the Tr format must be inverted
- closes https://github.com/assimp/assimp/issues/3645
2021-02-15 11:51:20 +01:00
Guangmo Lin
ba7f945f99
Eliminate MSVC warning C4819 caused by source files encoded in UTF-8 without BOM
2021-02-14 10:28:14 +08:00
Kim Kulling
426c1a340f
Merge branch 'master' into issue_2195_draco
2021-02-10 15:28:39 +01:00
Guangmo Lin
2d4bc2d04e
Eliminate maybe-uninitialized warnings which are treated as errors when use -DCMAKE_BUILD_TYPE=Release
2021-02-09 14:10:44 +08:00
Kim Kulling
c9ca921d09
Merge branch 'master' into ColladaAnimationFix
2021-02-08 20:46:18 +01:00
Kim Kulling
888415246e
Merge branch 'master' into issue_2195_draco
2021-02-08 11:52:54 +01:00
Gargaj
8ae8b165ca
fix compile warning-turned-error on x86
2021-02-08 00:37:06 +01:00
Kim Kulling
cb15a0d8b0
Merge branch 'master' into ColladaAnimationFix
2021-02-07 17:45:10 +01:00
Kim Kulling
6c3593eda0
Merge branch 'master' into master
2021-02-06 09:54:51 +01:00
ywang
9bab475302
export min max for sparse accessor
2021-02-03 15:05:58 -08:00
Kim Kulling
bb21ec9423
trigger build
2021-02-03 21:17:57 +01:00
Kim Kulling
2391432523
fix overflow
2021-02-03 21:07:28 +01:00
Kim Kulling
e6b8ae44cb
Fix unittests: skip newline at begin of matrix token.
2021-02-03 20:54:48 +01:00
xiaohunqupo
c43a1ed886
Fix Step Expoter Error.
...
Fix Step Expoter Error.
2021-02-03 16:26:02 +08:00
thomasbiang
d08acb85e7
Merge branch 'master' into master
2021-02-02 14:48:41 -08:00
Kim Kulling
faf53b8e0f
Fix broken autocorrect fix
2021-02-02 23:33:02 +01:00
Kim Kulling
6ee1a32fb2
fix compile issue: replace std::make_unique
2021-02-02 22:54:20 +01:00
Kim Kulling
50fd5127ef
Some review findings.
2021-02-02 22:34:30 +01:00
ywang
793bd44cee
fix issue: 3482: invalid gltf2 properties
2021-02-02 13:19:57 -08:00
Kim Kulling
fa2354ebc3
Fix incorrect xml-parsing in collada importer.
2021-02-02 22:06:33 +01:00
contriteobserver
65bc86e181
Merge branch 'master' into ColladaAnimationFix
2021-02-01 16:58:01 -08:00
Kim Kulling
5fbbba2fac
Merge branch 'master' into issue_2195_draco
2021-01-31 16:02:57 +01:00
Kim Kulling
f2543ee608
Merge branch 'master' into ColladaSubmeshFix
2021-01-29 22:11:07 +01:00
Kim Kulling
8d4b816dfe
Merge branch 'master' into master
2021-01-29 18:16:04 +01:00
contriteobserver
e33b69a428
Collada importer now identifies animations
...
addresses issue #3584
2021-01-28 13:06:02 -08:00
Kim Kulling
706d636c63
Merge branch 'master' into master
2021-01-28 18:25:39 +01:00
RichardTea
48bcbbefdd
use nullptr and float constants
2021-01-27 10:56:57 +00:00
RichardTea
150514fc8b
Move draco warning suppression
...
Should be around the include for portability, not template instantiation
Fix clang pragma typos
2021-01-27 10:42:28 +00:00
RichardTea
5e7281dac6
Merge branch 'master' into issue_2195_draco
2021-01-27 10:26:16 +00:00
RichardTea
6ec32b6b78
Apply clangformat
2021-01-27 09:55:03 +00:00
RichardTea
c6fd1ce996
glTF2 Minor cleanup
2021-01-27 09:42:49 +00:00
RichardTea
5b9d06c2fc
Disable draco clang/gcc warnings via pragma
...
draco templated functions also throw warnings
2021-01-27 09:19:35 +00:00
Kim Kulling
1e38f84c3a
fix typo
2021-01-27 09:40:19 +01:00
Kim Kulling
ac0f1f2cab
Update FBXMaterial.cpp
2021-01-27 09:37:35 +01:00
Kim Kulling
c02ad323a5
Fix VS compiler warning: convertig int to char
2021-01-27 09:22:59 +01:00
thomasbiang
4ed9f3c2f4
Merge branch 'master' into master
2021-01-26 13:55:40 -08:00
Kim Kulling
4471c36c08
Fix compiler bug for VS2019
...
- Check https://developercommunity.visualstudio.com/content/problem/1223143/visual-studio-2019-c-program-crash-with-stdstring.html for more details
- closes https://github.com/assimp/assimp/issues/3572
2021-01-26 20:59:21 +01:00
RichardTea
d79e0c0ba9
Avoid std::make_unique
...
Assimp is still C++11
2021-01-26 17:33:10 +00:00
RichardTea
c917e6513f
Merge branch 'master' into issue_2195_draco
2021-01-26 16:43:46 +00:00
RichardTea
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
RichardTea
dde7605158
Implement draco decoding
2021-01-26 16:08:12 +00:00
contriteobserver
d7bf513250
renaming iterator to avoid any possibility of scop collisions
2021-01-26 01:36:12 -08:00
contriteobserver
69fc809307
size_t is not the same as unsigned int on some systems
2021-01-26 01:01:59 -08:00
contriteobserver
f92a34e0b7
Merge branch 'master' into ColladaSubmeshFix
2021-01-26 00:38:37 -08:00
Kim Kulling
243d017463
Add missing skip
...
- closes https://github.com/assimp/assimp/issues/3601
- Fix some format issues
2021-01-24 18:47:50 +01:00
Kim Kulling
a2b889ab09
Fix typo in collada parser
...
closes https://github.com/assimp/assimp/issues/3599
2021-01-24 18:21:46 +01:00
Ville Voutilainen
6ebae5e67c
GCC 11 build fixes
2021-01-24 11:04:46 +02:00
contriteobserver
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
thomasbiang
91dc904ed1
Merge branch 'master' into master
2021-01-22 13:25:31 -08:00
Kim Kulling
e792455d66
Remove redundant statement in if
...
- closes https://github.com/assimp/assimp/issues/3180
2021-01-22 14:22:34 +01:00
Kim Kulling
dc4514de82
Update COBLoader.cpp
...
Fix cppcheck finding
2021-01-22 13:23:39 +01:00
Kim Kulling
0dcd72d420
Update IFCOpenings.cpp
2021-01-22 13:18:43 +01:00
Kim Kulling
f44572157a
Update 3DSLoader.cpp
2021-01-22 13:14:59 +01:00
Kim Kulling
f2d3f0dbe6
Merge branch 'master' into master
2021-01-22 12:35:44 +01:00
Kim Kulling
2bcf08370d
Merge branch 'master' into fix-gltf-vertex-colors
2021-01-21 11:54:02 +01:00
thomasbiang
d7cf7847ba
Merge branch 'master' into master
2021-01-20 18:47:39 -08:00
ywang
01e61c8b9f
customized node transformation format
2021-01-20 18:42:56 -08:00
xiaohunqupo
8ba1d38dea
Fix STL Expoter error.
2021-01-20 16:29:30 +08:00
Maki
6d13fd6aa2
Fix glTF vertex colors with types other than float
2021-01-15 02:56:45 +00:00
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
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
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
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
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
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
Kim Kulling
7dd0596010
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-11 14:31:00 +01:00
Kim Kulling
a2adef8726
Merge branch 'master' into add-msvc-check
2020-12-11 14:11:10 +01:00
Jean-Louis Boudrand
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
Kim Kulling
816bbc852c
Merge branch 'master' into master
2020-12-08 19:54:04 +01:00
Kim Kulling
c0d7ea981a
Merge branch 'master' into gltf_fixes
2020-12-04 16:02:16 +01:00
Malcolm Tyrrell
471d2acc92
Improvements & style
2020-12-03 11:17:45 +00:00
Malcolm Tyrrell
19af3f0d31
Swap the meaning using the out_mat property.
2020-12-02 16:59:29 +00:00
Biswapriyo Nath
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
Malcolm Tyrrell
f7be3048de
New 3ds Max PBR Materials in FBX
2020-12-01 12:05:42 +00:00
FRICOTEAUX
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
Max Vollmer
53ff0702ce
Fixed check for base64 char values
2020-11-30 16:21:29 +00:00
Max Vollmer
7d72c78c8e
Some improvements
2020-11-30 15:20:51 +00:00
Max Vollmer
6ed1488e6e
* Improved error messages
...
* Throw instead of asserts on invalid file input
2020-11-30 15:04:06 +00:00
Kim Kulling
88be8ec698
Merge branch 'master' into fbxExceptionSafety
2020-11-27 21:49:58 +01:00
Malcolm Tyrrell
149b8d1fd1
Don't need operator< either.
2020-11-27 14:26:51 +00:00
Malcolm Tyrrell
14f79caf41
textures_converted keys can just be pointers
2020-11-26 16:29:37 +00:00
Kim Kulling
4590f06756
Merge branch 'master' into master
2020-11-25 16:57:49 +01:00
Kim Kulling
c059e58c5e
Merge branch 'master' into fbxparser-overead
2020-11-24 08:36:15 +01:00
Kim Kulling
fe78310486
Merge branch 'master' into fbxExceptionSafety
2020-11-23 10:08:23 +01:00
Evangel
98e42e22b8
Added check around setting pScene->mName from asset.scene.
2020-11-22 15:49:41 +10:00
Evangel
30584c1ec1
Replaced name with scene_name to avoid shadowing.
2020-11-22 15:36:08 +10:00
Evangel
67abcb10ba
Added mName to aiScene. Primarily to provide access to the "name" member of glTF2 scenes.
2020-11-22 15:33:31 +10:00
Malcolm Tyrrell
885a196c74
Unsigned
2020-11-19 16:30:44 +00:00
Neil Clifford
7b59cc297e
FBXParser.cpp - handle buffer over-read cases correctly
2020-11-19 12:20:06 +00:00
Kim Kulling
d10bf9a0d3
Merge branch 'master' into master
2020-11-18 21:30:58 +01:00
Inho Lee
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
Malcolm Tyrrell
c00153089a
Neater construction
2020-11-17 10:45:10 +00:00
Malcolm Tyrrell
213a9f9d55
First pass at PotentialNode
2020-11-17 10:39:03 +00:00
Kim Kulling
c4ba5eeeea
Merge branch 'master' into issue_3500
2020-11-16 21:52:14 +01:00
Malcolm Tyrrell
3221522f95
Prevent crash with malformed texture reference
2020-11-16 17:29:19 +00:00
Jean-François Verdon
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
Kim Kulling
647cef8a8b
Merge branch 'master' into nullBufferviewFix
2020-11-15 19:02:09 +01:00
Inho Lee
8845d7eed3
Prevent to generate redundant morph targets for glTF2
2020-11-11 20:49:22 +01:00
Kim Kulling
fa0951012f
closes https://github.com/assimp/assimp/issues/1044 : fix envelope handling in lightintensity.
2020-11-11 20:32:55 +01:00
Kim Kulling
a8381113eb
Update ObjFileMtlImporter.cpp
2020-11-10 10:23:28 +01:00
Kim Kulling
856d4c016e
closes https://github.com/assimp/assimp/issues/3448
...
Add transmission alpha value. if any.
2020-11-10 10:03:09 +01:00
Malcolm Tyrrell
0f246edb97
Prevent GetValue from corrupting memory
2020-11-06 13:43:16 +00:00
Malcolm Tyrrell
34e3e6293a
Style
2020-11-06 09:57:48 +00:00
Malcolm Tyrrell
0af05e7a60
Better message
2020-11-05 15:10:52 +00:00
Malcolm Tyrrell
01b2088dd3
A missing bufferview was causing a crash.
2020-11-05 15:02:41 +00:00
Kim Kulling
8c135f779e
Merge branch 'master' into readFbxWeightsInConfig
2020-10-28 20:38:29 +01:00
Kim Kulling
df768bdd99
Merge branch 'master' into patch-1
2020-10-27 16:20:33 +01:00
Kim Kulling
7e1a8f09c5
more openddl-fixes
2020-10-26 21:35:44 +01:00
Kim Kulling
aee2e9a87d
Merge branch 'master' into patch-1
2020-10-25 20:35:06 +01:00
Kim Kulling
57e691e28e
openddl: latest greatest.
2020-10-25 10:34:43 +01:00
Max Vollmer
4006bb71f4
Fixes for crashes in GLTF2 Importer
2020-10-23 12:01:43 +01:00
#Momo
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
#Momo
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
Kim Kulling
b842b4a3c1
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-21 20:02:48 +02:00
Kim Kulling
bbac168ced
Merge branch 'master' into collada_cleanup
2020-10-19 23:56:52 +02:00
Kim Kulling
69143ed149
fix unittests.
2020-10-19 23:53:27 +02:00
Kim Kulling
080322b9e2
cleanup collada xml migration.
2020-10-19 19:06:11 +02:00
Malcolm Tyrrell
a2cd5619b4
Merge branch 'master' into readFbxWeightsInConfig
2020-10-19 10:16:02 +01:00
Inho Lee
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
Inho Lee
9f880e2214
Fix glTF1 orthographic camera
2020-10-16 08:56:55 +02:00
Malcolm Tyrrell
0363c18f1f
Read weights
2020-10-15 10:07:24 +01:00
Kim Kulling
7660070aa4
Merge branch 'master' into master
2020-10-14 21:01:35 +02:00
Kim Kulling
857f62cde0
closes pParam.mReference = source;
2020-10-14 20:34:46 +02:00
Jukka Maatta
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
Kim Kulling
636f28965f
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-11 18:13:43 +02:00
Sahin Serdar Kocdemir
eb9928e029
fix for fbx files using stringray materials;
2020-10-09 07:28:15 +01:00
Malcolm Tyrrell
20733537d7
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-08 09:54:04 +01:00
Optimizer0
152343b186
Merge branch 'master' into master
2020-10-06 08:35:26 +05:30
Malcolm Tyrrell
4bdaf20b70
Add comment.
2020-10-05 14:23:42 +01:00
Isuru2000psn
f2b3ec2e0c
strict-aliasing level 3 warnings fix
2020-10-05 15:29:09 +05:30
Malcolm Tyrrell
585fb89154
Make an assert a DeadlyImportError.
2020-10-02 15:25:16 +01:00
Malcolm Tyrrell
6b9c477763
The floar parsing routines are now DeadlyErrors.
2020-10-02 13:58:55 +01:00
Kim Kulling
c7f7ed8901
Update ColladaLoader.cpp
2020-09-30 20:51:54 +02:00
Kim Kulling
0191c661b5
fix division by zero.
2020-09-30 20:39:26 +02:00
Kim Kulling
177426185e
Fix invalid cast
2020-09-30 16:38:13 +02:00
Kim Kulling
50d21e08f3
fix memoy leak.
2020-09-30 12:05:32 +02:00
Kim Kulling
788099a223
Merge branch 'master' into pugi_xml
2020-09-29 21:29:37 +02:00
Kim Kulling
c591f7de2f
make xml parsing more verbose.
2020-09-29 21:01:10 +02:00
Kim Kulling
db49a541c3
remove unused attributes.
2020-09-28 20:35:30 +02:00
Kim Kulling
ef9a78b49d
remove unused attributes.
2020-09-28 20:34:44 +02:00
Kim Kulling
bf4ad2837f
Remove dead code.
2020-09-28 15:20:59 +02:00
Kim Kulling
c598a12340
Remove unused variable.
2020-09-28 09:15:56 +02:00
Kim Kulling
89ac168014
ogre: fix warning: not inited variable.
2020-09-27 21:23:55 +02:00
Kim Kulling
1c85676a9c
collada: fix warning: not inited variable.
2020-09-27 21:19:23 +02:00
Kim Kulling
052cc2e070
collada: fix warning: not inited variable.
2020-09-27 21:16:51 +02:00
Kim Kulling
5038f21d06
collada: fix warning: not inited variable.
2020-09-27 21:14:21 +02:00
Kim Kulling
202907d471
collada: fix warning: unused variable.
2020-09-27 21:11:42 +02:00
Kim Kulling
3f97a1df2c
collada: fix warning: unused variable.
2020-09-27 21:09:06 +02:00
Kim Kulling
bdd3c96eee
amf: fix warning: unused variable.
2020-09-27 21:06:14 +02:00
Kim Kulling
5877f81419
amf: fix warning: unused variable.
2020-09-27 21:03:59 +02:00
Kim Kulling
5230b91611
amf: fix warning: unused variable.
2020-09-27 21:01:48 +02:00
Kim Kulling
8143ea5aec
amf: fix warning: unused variable.
2020-09-27 20:58:08 +02:00
Kim Kulling
9a19a4723b
amf: fix warning: unused variable.
2020-09-27 20:54:21 +02:00
Kim Kulling
5653a82a87
fix the unittests.
2020-09-27 20:20:44 +02:00
Kim Kulling
9234fee35e
Ogre: fix xml migration.
2020-09-27 09:36:38 +02:00
Sherief Farouk
a3c8cfc0ff
Fix for build break due to warnings-as-errors when not building M3D exporter.
2020-09-26 23:21:23 -07:00