Commit Graph

9922 Commits (b00de10eb39a269b889936ef67dab1d12b053534)

Author SHA1 Message Date
Krishty b00de10eb3 Simplified importer search and fixed a few bugs
The search for a matching importer had a few issues, see #3791. There were two different mechanisms to determine whether an importer accepts a specific file extension:
1. `aiImporterDesc::mFileExtensions`, which was forwarded to the UI via `BaseImporter::GetExtensionList()`.
2. `BaseImporter::CanRead()` when called with `checkSig == false`, which determines whether to actually use that importer.
Both were redundant and got out of sync repeatedly. I removed 2. completely and replaced it with 1., thereby syncing UI/import and shortening all `BaseImporter::CanRead()` implementations.

Further bugfixes:
- fixed glTF2 importer throwing exceptions when checking whether it can load a file
- removed `BaseImporter::SimpleExtensionCheck()` because it is no longer used and had a bug with case sensitivity

Since the `checkSig` parameter in `BaseImporter::CanRead()` is now useless, it can be removed completely. I’m not sure if this would break ABI compatiblity, so I’ll submit it with a later pull request.
2021-04-24 00:17:50 +02:00
Krishty 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
Krishty 196deea7ce added missing file extensions to aiImporterDesc::mFileExtensions 2021-04-23 15:05:09 +02:00
Kim Kulling c8ad1cb078
Merge pull request #3763 from krishty/strip-useless-gltf-write
fixed glTF export stuff being pulled into the EXE even if building wi…
2021-04-22 21:34:24 +02:00
Kim Kulling 8881e65d62
Merge branch 'master' into strip-useless-gltf-write 2021-04-22 09:55:00 +02:00
Kim Kulling 6027c10969
Merge pull request #3776 from krishty/fix-import-export-confusion
fixed export exceptions on import
2021-04-20 20:39:00 +02:00
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
Kim Kulling 0af558a11c
Merge pull request #3774 from krishty/version-string-fix
Version string fix (if anyone cares)
2021-04-19 13:20:26 +02:00
Krishty 930cc25c0e fixed version string test 2021-04-19 09:51:44 +02:00
Krishty 3fead344ad updated version string (if anyone cares) 2021-04-19 07:37:12 +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 cd42b9954b
Merge pull request #3757 from mahiuchun/tr1
Flip the check on _MSC_VER for using TR1 containers.
2021-04-14 13:03:51 +02:00
Kim Kulling 21b56b0058
Merge branch 'master' into tr1 2021-04-14 12:46:59 +02:00
Kim Kulling c282b9a775
Merge pull request #3742 from Garux/patch-1
Fix MDC loader
2021-04-14 10:47:34 +02:00
Kim Kulling 0b61a8875a
Merge branch 'master' into patch-1 2021-04-14 10:22:42 +02:00
Kim Kulling bbfefd89d7
Merge pull request #3758 from assimp/kimkulling-update-assimp.net
Update repo for assimp-net
2021-04-14 09:37:20 +02:00
Kim Kulling bef2304c53
Update repo for assimp-net 2021-04-14 08:55:55 +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 182418e818
Merge pull request #3755 from assimp/kimkulling-issue3754
Not resize empty vectors.
2021-04-12 23:31:06 +02:00
Kim Kulling a6e4672df1
Fix a typo. 2021-04-12 23:19:00 +02:00
Kim Kulling d1eeb80e1a
Not resize empty vectors.
closes https://github.com/assimp/assimp/issues/3754
2021-04-12 21:05:46 +02:00
Kim Kulling c9ba616eb6
Merge pull request #3708 from urschanselmann/master
Fix import of FBX files with last UV duplicated (caused by bug in FBX SDK 2019.0+)
2021-04-12 11:50:12 +02:00
Kim Kulling 263d450300
Merge branch 'master' into master 2021-04-12 09:35:03 +02:00
Kim Kulling 67fa0a13bc
Merge pull request #3749 from pcwalton/ms3d-fixes
Fix incorrect indices in the MilkShape 3D loader
2021-04-11 20:37:31 +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
Kim Kulling 6eae925441
Merge pull request #3695 from AllegorithmicSAS/feature/gltf_fb_ngon_encoding
[gltf2-exporter] Adding FB_ngon_encoding support
2021-04-07 20:52:05 +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 d51fce9e70
Merge pull request #3748 from assimp/kimkulling-issue_3747
Fix direct leak
2021-04-05 21:37:48 +02:00
Kim Kulling 7fee914776
Fix direct leak
closes https://github.com/assimp/assimp/issues/3747
2021-04-05 21:24:54 +02:00
Kim Kulling 4eb69d1e54
Merge pull request #3746 from BaldricS/rename_PI_to_avoid_macro_convention
Renaming PI to aiPi.
2021-04-05 18:40:27 +02:00
Scott Baldric 31e8042071 Renaming PI to aiPi. 2021-04-05 09:59:22 -05: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 06a60c43cf
Merge pull request #3739 from assimp/kimkulling-patch-7
Update INSTALL
2021-04-04 20:46:43 +02:00
Kim Kulling 010c0853ea
Update INSTALL 2021-04-04 14:40:50 +02:00
Kim Kulling eb261c6581
Merge pull request #3718 from MalcolmTyrrell/MalcolmTyrrell/tangentCheck
Malcolm tyrrell/tangent check
2021-04-03 18:28:03 +02:00
Kim Kulling 22413d85ad
Merge branch 'master' into MalcolmTyrrell/tangentCheck 2021-04-03 17:42:44 +02:00
Kim Kulling cfad36d0f4
Merge pull request #3737 from assimp/615IO-ios-port-update
615 io ios port update
2021-04-03 17:41:07 +02:00
Kim Kulling 7d68eab4a7 Update license 2021-04-03 12:09:23 +02:00
Kim Kulling d677005487 Merge branch '615IO-ios-port-update' 2021-04-03 12:08:38 +02:00
Kim Kulling 0b628a0ebb Merge branch 'ios-port-update' of https://github.com/615IO/assimp into 615IO-ios-port-update 2021-04-03 12:04:03 +02:00
Kim Kulling 456af8c493
Merge pull request #3736 from assimp/issue_3678
Issue 3678
2021-04-03 11:23:17 +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