eab1c9c3c0
add `AI_CONFIG_IMPORT_MD3_LOAD_SHADERS` bool option
...
the purpose is use of this loader with idtech3 FS
this requires full original material name, which euqals to Q3 shader path
result of deduction is not usable inside Q3 FS at all
option in general is "do not tinker with the path"
2021-05-01 08:14:44 +03:00
813b64ef52
corrected M3D_EXP_NOFACE test
2021-04-30 21:51:02 -07:00
e51bb1e77e
fixed signed/unsigned mismatch warning
2021-04-30 21:26:57 -07:00
694f4c2e34
Merge branch 'master' into M3DasciiByDefault
2021-04-30 21:12:48 -07:00
af0aca796e
now compiling M3D ASCII support by default
...
addresses issue #3777
2021-04-30 21:07:01 -07:00
55abc49d6d
improve md3::Q3 shader::cull keyword support
...
only use nonstandard winding order with `cull back`; might be excess too, since engine doesn't support this
2021-04-30 22:59:05 +03:00
0b7ebef497
fix path separator in md3 shader loading
2021-04-30 22:51:21 +03:00
2feda5b4b2
Merge branch 'master' into md2-mdc-const
2021-04-30 20:10:45 +02:00
149224091f
support missing closing brace in material list after Ascii Scene Exporter v2.51
2021-04-30 10:37:06 +03:00
57091d761e
Merge branch 'master' into md2-mdc-const
2021-04-30 00:56:50 +02:00
0b92abe9b4
Merge branch 'master' into empty-string-style
2021-04-30 00:54:57 +02:00
5298ed8f9e
Merge branch 'master' into fbxBlendshapes
2021-04-29 15:21:16 -07:00
73e05ab6d3
Merge branch 'master' into add-step-extension
2021-04-30 00:13:32 +02:00
edf12bd357
fix md2 orientation
2021-04-30 00:02:37 +03:00
666b5eff76
added .step extension to IFC loader
...
The extension .step is at least as common as .stp, so both should be supported.
2021-04-29 21:29:10 +02:00
4798ff3882
fix hl1 mdl orientation, tex coords, face windings order
2021-04-29 20:50:50 +03:00
db142da571
orient mdc correctly
2021-04-29 20:41:10 +03:00
9a0b703db1
Merge branch 'master' into ms-maxvollmer/importer_fixes
2021-04-28 20:25:10 +02:00
260cc6bd26
reverted regression in 3DS transformation (issue #3802 )
...
The regression was introduced to align 3DS export and import, but in fact it broke the transformation matrices on import. This commit reverts the relevant lines. Furthermore, matrix layout was double-checked with two other 3DS importers. Export was not considered.
2021-04-28 01:02:24 +02:00
3acd42c22e
Remove newline from name of Blender importer.
...
Addresses #3797 .
Re-submitting this as a quick fix to the immediate issue while I think about the website field.
2021-04-26 20:27:28 -04:00
64da2a4315
Merge remote-tracking branch 'upstream/master' into fbxBlendshapes
2021-04-26 13:51:22 -07:00
a5d0e99548
Fixed error in blendShapeChannel Weighting
2021-04-26 12:19:20 -07:00
e1d6e1f377
Merge branch 'master' into ms-maxvollmer/importer_fixes
2021-04-26 14:53:32 +01:00
e6a47d93c2
removed dead code from 0d29203e24
2021-04-24 13:29:15 +02:00
9dc66b0003
removed dead code
...
BaseImporter::GetExtensionList() is not a virtual function; overriding it is useless. This probably stemmed from a misunderstanding.
2021-04-23 15:15:21 +02:00
196deea7ce
added missing file extensions to aiImporterDesc::mFileExtensions
2021-04-23 15:05:09 +02:00
8881e65d62
Merge branch 'master' into strip-useless-gltf-write
2021-04-22 09:55:00 +02:00
746d5cf964
* Throw instead of assert on invalid file input
...
* Check JSON object type before accessing members
* Ensure samplers input and output references are set before accessing them
2021-04-21 16:17:03 +01:00
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
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
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
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
21b56b0058
Merge branch 'master' into tr1
2021-04-14 12:46:59 +02:00
0b61a8875a
Merge branch 'master' into patch-1
2021-04-14 10:22:42 +02:00
4aa52b3af8
Flip the check on _MSC_VER for using TR1 containers.
2021-04-13 11:15:52 -07:00
263d450300
Merge branch 'master' into master
2021-04-12 09:35:03 +02:00
a3ee377af7
Merge branch 'master' into ms3d-fixes
2021-04-11 19:12:06 +02:00
cf4ef04a80
Merge branch 'master' into master
2021-04-07 20:58:40 +02:00
e66232d8c3
Merge branch 'master' into feature/gltf_fb_ngon_encoding
2021-04-07 13:54:31 +02:00
a44ba41413
Fix incorrect indices in the MilkShape 3D loader
2021-04-05 19:14:48 -07:00
7fee914776
Fix direct leak
...
closes https://github.com/assimp/assimp/issues/3747
2021-04-05 21:24:54 +02:00
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
22413d85ad
Merge branch 'master' into MalcolmTyrrell/tangentCheck
2021-04-03 17:42:44 +02:00
80fc8538be
Update AMFImporter_Material.cpp
2021-04-03 10:29:16 +02:00
d62c89557b
Remove dead code
2021-04-03 10:28:19 +02:00
46e49d0b83
Update AMFImporter_Geometry.cpp
2021-04-03 10:27:54 +02:00
cdb6a62cdb
Merge branch 'master' into issue_3678
2021-04-03 10:27:07 +02:00
da0543972b
Fix parsing for AMF-Files.
2021-04-03 10:25:03 +02:00
89a8f87dae
AMF: Remove unused macros
2021-04-02 13:10:24 +02:00
596001c89c
Refactoring the extension
2021-03-30 09:10:50 +02:00
8e589221d7
[gltf2-exporter] Adding FB_ngon_encoding support
2021-03-30 09:10:50 +02:00
f61a41bdd9
Merge branch 'master' into fbxBlendshapes
2021-03-29 21:48:51 +02:00
09d3266250
Fixing 3DS import for CHUNK_TRMATRIX translation vector.
2021-03-29 15:31:08 +02:00
5755530bab
Merge branch 'master' into master
2021-03-28 17:40:17 +02:00
e5862c18be
Merge branch 'master' into fbxBlendshapes
2021-03-28 13:02:35 +02:00
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
3fd865b4bf
Added Blendshape Support to FBX Export
2021-03-24 18:10:03 -07:00
d94ddd32b1
Extra check. Better logging.
2021-03-24 11:04:39 +00:00
add165c4a1
Check target sizes to avoid reading beyond allocation
2021-03-24 10:55:40 +00:00
0a1efe5d58
Merge branch 'master' into master
2021-03-21 17:19:43 +01:00
86c05a1154
Merge branch 'master' into master
2021-03-19 18:15:15 +01:00
5f652feb75
Merge branch 'master' into MalcolmTyrrell/gltfCrashes
2021-03-19 13:35:13 +01:00
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
d9cd07f0d9
Merge branch 'master' of https://github.com/assimp/assimp
2021-03-17 18:26:11 +01:00
3503252e12
Strict check for accessor "count"
2021-03-16 11:47:19 +00:00
e4983aa16e
Fix code issue
2021-03-15 16:46:41 +00:00
57652a9084
Version is strictly a string
2021-03-15 16:27:50 +00:00
053c0f5e0a
Catch type errors in gltf and try to print out useful context.
2021-03-15 13:06:11 +00:00
84cd1d95c7
Merge branch 'master' into FixClangCL
2021-03-12 15:26:49 +01:00
c0c7e6a0de
trim uvIndices to fix import of Cheetah3D generated fbx files
2021-03-12 14:48:38 +01:00
cc7e229c3c
disable size check
2021-03-12 08:55:11 +01:00
51ad88afb6
Merge branch 'master' into master
2021-03-10 20:35:37 +01:00
806b12dc8b
Merge branch 'master' into issue_3678
2021-03-10 19:51:04 +01:00
732e9386aa
Merge branch 'master' into master
2021-03-10 11:49:13 +01:00
6c89631581
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-09 21:08:28 +01:00
c6c0f141f1
Fix compiling issues in clang-cl
2021-03-03 22:30:36 -08:00
ff769ecce2
Merge branch 'master' into sparse_minmax
2021-03-02 12:30:01 +01:00
75210576cf
Merge branch 'master' into sparse_minmax
2021-03-01 21:34:24 +01:00
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
c669c8f1eb
Merge branch 'master' into update_copyrights
2021-02-28 12:18:41 +01:00
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
5b78e3fb5d
Merge branch 'master' into user/mavollme/GLTF2_CheckNormalCount
2021-02-25 21:29:03 +01:00
eef03c1f17
Improved warnings
2021-02-24 14:28:18 +00:00
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
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
5429475339
Merge branch 'master' into sparse_minmax
2021-02-23 12:30:53 -08:00
72efb4354a
Merge branch 'master' of https://github.com/thomasbiang/assimp into sparse_minmax
2021-02-23 12:12:36 -08:00
247fd0ce17
Merge branch 'master' into FixAnimName
2021-02-22 20:38:16 +01:00
616d924d29
Merge branch 'master' into master
2021-02-20 19:35:31 +01:00
6094da3493
Update glTF2Asset.inl
2021-02-18 09:32:37 +01:00
d57b78bc98
Export the animation name to gltf2
2021-02-16 20:22:08 -08:00
f1d225c18d
Merge branch 'master' into issue_2195_draco
2021-02-15 18:05:22 +00:00
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
ba7f945f99
Eliminate MSVC warning C4819 caused by source files encoded in UTF-8 without BOM
2021-02-14 10:28:14 +08:00
426c1a340f
Merge branch 'master' into issue_2195_draco
2021-02-10 15:28:39 +01:00
2d4bc2d04e
Eliminate maybe-uninitialized warnings which are treated as errors when use -DCMAKE_BUILD_TYPE=Release
2021-02-09 14:10:44 +08:00
c9ca921d09
Merge branch 'master' into ColladaAnimationFix
2021-02-08 20:46:18 +01:00
888415246e
Merge branch 'master' into issue_2195_draco
2021-02-08 11:52:54 +01:00
8ae8b165ca
fix compile warning-turned-error on x86
2021-02-08 00:37:06 +01:00
cb15a0d8b0
Merge branch 'master' into ColladaAnimationFix
2021-02-07 17:45:10 +01:00
6c3593eda0
Merge branch 'master' into master
2021-02-06 09:54:51 +01:00
9bab475302
export min max for sparse accessor
2021-02-03 15:05:58 -08:00
bb21ec9423
trigger build
2021-02-03 21:17:57 +01:00
2391432523
fix overflow
2021-02-03 21:07:28 +01:00
e6b8ae44cb
Fix unittests: skip newline at begin of matrix token.
2021-02-03 20:54:48 +01:00
c43a1ed886
Fix Step Expoter Error.
...
Fix Step Expoter Error.
2021-02-03 16:26:02 +08:00
d08acb85e7
Merge branch 'master' into master
2021-02-02 14:48:41 -08:00
faf53b8e0f
Fix broken autocorrect fix
2021-02-02 23:33:02 +01:00
6ee1a32fb2
fix compile issue: replace std::make_unique
2021-02-02 22:54:20 +01:00
50fd5127ef
Some review findings.
2021-02-02 22:34:30 +01:00
793bd44cee
fix issue: 3482: invalid gltf2 properties
2021-02-02 13:19:57 -08:00
fa2354ebc3
Fix incorrect xml-parsing in collada importer.
2021-02-02 22:06:33 +01:00
65bc86e181
Merge branch 'master' into ColladaAnimationFix
2021-02-01 16:58:01 -08:00
5fbbba2fac
Merge branch 'master' into issue_2195_draco
2021-01-31 16:02:57 +01:00
f2543ee608
Merge branch 'master' into ColladaSubmeshFix
2021-01-29 22:11:07 +01:00
8d4b816dfe
Merge branch 'master' into master
2021-01-29 18:16:04 +01:00
e33b69a428
Collada importer now identifies animations
...
addresses issue #3584
2021-01-28 13:06:02 -08:00
706d636c63
Merge branch 'master' into master
2021-01-28 18:25:39 +01:00
48bcbbefdd
use nullptr and float constants
2021-01-27 10:56:57 +00:00
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
5e7281dac6
Merge branch 'master' into issue_2195_draco
2021-01-27 10:26:16 +00:00
6ec32b6b78
Apply clangformat
2021-01-27 09:55:03 +00:00
c6fd1ce996
glTF2 Minor cleanup
2021-01-27 09:42:49 +00:00
5b9d06c2fc
Disable draco clang/gcc warnings via pragma
...
draco templated functions also throw warnings
2021-01-27 09:19:35 +00:00
1e38f84c3a
fix typo
2021-01-27 09:40:19 +01:00
ac0f1f2cab
Update FBXMaterial.cpp
2021-01-27 09:37:35 +01:00
c02ad323a5
Fix VS compiler warning: convertig int to char
2021-01-27 09:22:59 +01:00
4ed9f3c2f4
Merge branch 'master' into master
2021-01-26 13:55:40 -08:00
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
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
Garux
contriteobserver
Kim Kulling
vfxgordon
Krishty
Jason C
Max Vollmer (Microsoft Havok)
Hill Ma
Clement JACOB
Patrick Walton
Kim Kulling
Bernold Kraft
urschanselmann
Malcolm Tyrrell
Urs Hanselmann
Minmin Gong
Turo Lamminen
thomasbiang
ywang
RichardTea
Guangmo Lin
Gargaj
xiaohunqupo
contriteobserver
Ville Voutilainen