Commit Graph

85 Commits

Author SHA1 Message Date
kkulling
f15dcfa981 - Fix model parsing 2021-05-05 13:10:52 +02:00
kkulling
cbce6d3dad Merge branch 'optimize_3mf_strings' of https://github.com/assimp/assimp into optimize_3mf_strings 2021-05-05 10:46:54 +02:00
Krishty
b79b84d34e Merge branch 'master' into new-file-detection 2021-05-05 00:09:42 +02:00
Kim Kulling
e85a69a960 Update D3MFImporter.cpp 2021-05-04 15:31:07 +02:00
kimkulling
7690f92c81 Fix version of strnlen 2021-05-04 14:48:39 +02:00
kimkulling
ee5170c18a - fix security issue 2021-05-04 14:40:25 +02:00
kimkulling
0e17939e8d Use const char* const 2021-05-04 12:09:38 +02:00
kkulling
55fd820ed7 use const chars 2021-05-04 10:57:30 +02:00
Kim Kulling
0b92abe9b4 Merge branch 'master' into empty-string-style 2021-04-30 00:54:57 +02:00
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
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
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
Kim Kulling
6c89631581 closes https://github.com/assimp/assimp/issues/3678: ensure lowercase 2021-03-09 21:08:28 +01: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
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
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
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
bf4ad2837f Remove dead code. 2020-09-28 15:20:59 +02:00
Kim Kulling
d6892b3f58 Merge branch 'master' into pugi_xml 2020-09-25 21:00:09 +02:00
Kim Kulling
34f343233e 3ml: fix xml parsing. 2020-09-02 21:49:20 +02:00
kkulling
87d2580aad fix 3mf rel-parsing 2020-09-02 17:45:37 +02:00
Kim Kulling
73fa2cbe88 Fix memory handling of xml-nodes in the parser. 2020-09-01 21:48:50 +02:00
kimkulling
e62b4e5cce next iteration. 2020-08-31 16:10:38 +02:00
kimkulling
0730eebe6f fix collada handling of xml nodes. 2020-08-28 16:17:56 +02:00
Malcolm Tyrrell
b7c789da67 Stop concatenating std::strings. Use formatter. 2020-08-18 17:35:08 +01:00
kimkulling
7e93ae4428 3MF: Migration. 2020-08-18 16:54:29 +02:00
Kim Kulling
6205af4efb replace NULL and avoid ai_assert with more than 2 tests. 2020-06-23 21:05:42 +02:00
Malcolm Tyrrell
87a7662bee More thinks using VERBOSE_DEBUG 2020-05-18 11:45:00 +01:00
Kim Kulling
f8e6512a63 Move format importer and exporter into its won folder. 2020-05-02 15:14:38 +02:00