Kim Kulling
873c6ffabe
Merge branch 'master' into fix-import-export-confusion
2021-04-19 21:08:52 +02:00
Krishty
55dd5faafb
fixed export exceptions on import
...
Ogre and 3MF imports threw DeadlyExportErrors under some circumstances. Bad for people who assumed that they only needed to catch DeadlyImportErrors. Changed them to DeadlyImportErrors.
2021-04-19 19:33:41 +02:00
Krishty
3fead344ad
updated version string (if anyone cares)
2021-04-19 07:37:12 +02:00
Krishty
a19299d501
moved MD2/MDC tables from BSS to const data
...
Visual C++ is unable to identify them as constant data during optimization, so explicitly declare them const.
2021-04-17 00:32:04 +02:00
Krishty
f761dc72f4
style fix - initializing and assigning empty std::string properly
...
std::string s(""); s = ""; calls the copy constructor, which in turn calls strlen(), … assigning a default-constructed string generates fewer instructions and is therefore preferred.
With C++11 uniform initialization, you’d simply write s = { } instead.
2021-04-16 23:43:56 +02:00
Krishty
6cbeca5518
fixed glTF export stuff being pulled into the EXE even if building with ASSIMP_BUILD_NO_EXPORT
...
“LazyDictBase::WriteObjects()” in the two glTF implementations is only used for export. Since it’s a virtual method, and many compilers have trouble removing unreferenced virtual methods, glTF export stuff is pulled into the binary even if compiling without exports.
This commit removes said virtual function if only compiling for import.
This removes 75 KiB of useless code when compiled with Visual Studio for x64.
2021-04-16 20:44:40 +02:00
Kim Kulling
21b56b0058
Merge branch 'master' into tr1
2021-04-14 12:46:59 +02:00
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
fc2c12ad6a
Fixing encoding when lines and points are encountered
2021-03-30 09:58:28 +02:00
Clement Jacob
fc0cf2ea8d
NGON encoding triangles only
2021-03-30 09:19:50 +02:00
Clement Jacob
2e90fed527
Refactoring and fixing remaining issues in triangulation process
2021-03-30 09:10:50 +02:00
Clement Jacob
596001c89c
Refactoring the extension
2021-03-30 09:10:50 +02:00
Clement Jacob
81019d5e58
Fixing quad encoding
2021-03-30 09:10:50 +02:00
Clement Jacob
6d1a0c6054
Adding quad proper handling
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
f5ed217409
Merge branch 'master' into msvc2019fix
2021-03-12 15:49:41 +01: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
Andy Shaw
2576c8c3a6
Compile fix for MSVC 2019
...
Small is seen as a type with some options so this fixes the errors starting with:
code\PostProcessing\ComputeUVMappingProcess.cpp(125): error C2632: 'int' followed by 'char' is illegal
2021-03-04 08:04:19 +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
Kim Kulling
aa6f983920
Remove buggy assert
...
- Remove assertion test for empty nodestacks when no meshes are in the node. Just return from the function.
- closes https://github.com/assimp/assimp/issues/3664
2021-02-25 14:01:18 +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
RichardTea
aa10b56bc2
Fix draco linking for Hunter/Normal
2021-02-01 14:29:24 +00: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
de827b2fec
Merge branch 'master' into develop
2021-01-29 21:46:42 +01:00
Kim Kulling
79eb9ecc86
Update all minimum cmake req to 3.10
2021-01-29 21:05:46 +01:00
Kim Kulling
db8e9eb556
Merge branch 'master' into develop
2021-01-29 19:20:38 +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
fe97ff6474
Draco platform libraries have different names
...
On Windows it's draco.dll/lib
On Linux/macOS draco_shared.dylib & draco_static.lib
2021-01-26 17:19:41 +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
RichardTea
3a7d0f5656
Add Draco to cmakelists
...
Initial pass. Not yet used.
Add Draco library to assimp build and link
2021-01-26 15:58:14 +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
Bart Sekura
5f50e42535
added missing return
2021-01-23 09:56:35 +09:00
Bart Sekura
f8c512acd7
changed morph anim error to warning when validating
2021-01-23 09:52:46 +09: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
thomasbiang
b3a35364ad
Merge branch 'master' into master
2021-01-21 13:38:21 -08: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
Kim Kulling
4e0c4d7bb7
Update PbrtExporter.h
2021-01-20 21:11:14 +01:00
Kim Kulling
11a17ebfe6
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-20 20:03:30 +01:00
xiaohunqupo
8ba1d38dea
Fix STL Expoter error.
2021-01-20 16:29:30 +08:00
Kim Kulling
f8dd3a9aa6
Update DefaultIOSystem.cpp
2021-01-20 08:05:43 +01:00
Kim Kulling
ed3e745752
Update DefaultIOSystem.cpp
2021-01-19 21:58:04 +01:00
Kim Kulling
f05a57560b
Remove buggy method.
2021-01-19 21:27:50 +01:00
Kim Kulling
22f632d8d0
Merge branch 'master' into kimkulling-oss_fuzz29168
2021-01-19 21:21:28 +01:00
Kim Kulling
5b325af79f
Fix typo.
2021-01-19 21:19:42 +01:00
Kim Kulling
5a6498af92
Fix nullptr access
2021-01-19 21:14:38 +01:00
Kim Kulling
4008862a35
Merge branch 'master' into ihsinme-patch-210
2021-01-19 21:05:43 +01:00