Krishty
758116b083
removed trailing spaces and tabs from source and text
...
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
2021-07-29 13:28:51 +02:00
Jason C
00b625a2ae
[amf] Fix crash when file could not be parsed.
...
Fix double free of mXmlParser (deleted but not reset in ParseFile, then deleted again in ~AMFImporter).
Should probably use a smart pointer instead, though.
---
This change was previously made in 785cca1bb4#3890 , but was lost in a merge.
2021-05-10 19:06:39 -04:00
Kim Kulling
cb7d3ac598
Merge branch 'master' into jc3-spam-killa
2021-05-10 22:21:13 +02:00
Jason C
f87b180147
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 17:02:04 -04:00
Kim Kulling
b30cbcf117
Merge branch 'master' into jc3-spam-killa
2021-05-09 21:47:17 +02:00
Jason C
785cca1bb4
[amf] Fix crash when file could not be parsed.
...
Fix double free of mXmlParser (deleted but not reset in ParseFile, then deleted again in ~AMFImporter).
Should probably use a smart pointer instead, though.
Partially addresses https://github.com/assimp/assimp/issues/3888 .
2021-05-05 17:13:10 -04:00
Jason C
a03dc4edaa
[amf] Fix minor typo in error message.
...
Added missing space to detail string on parse failure.
2021-05-04 21:56:49 -04:00
Jason C
2925592c64
[assimp] Make sure ctype calls use unsigned char.
...
Cast to unsigned char as required by C++ (see C++ **[cctype.cyn]** -> ISO C99 section 7.4, [see also](https://en.cppreference.com/w/cpp/string/byte/isspace )).
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:13 -04: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
Kim Kulling
da0543972b
Fix parsing for AMF-Files.
2021-04-03 10:25:03 +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
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01: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
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
kimkulling
6ec07e4dc7
XGL: next steps.
2020-09-10 17:31:30 +02:00
kimkulling
cca9eddb1c
Fix material-base AMF-unittest.
2020-09-10 13:56:04 +02:00
Kim Kulling
d854f3b842
AMF: fix adding for child-nodes.
2020-09-10 00:05:53 +02:00
Kim Kulling
0618db1f99
AMF: some smaller refactorings to improve readability.
2020-09-07 20:52:46 +02:00
Kim Kulling
689406fbda
Fix Colladat import.
2020-09-04 07:33:10 +02:00
Kim Kulling
075540e15a
AMF: fixes.
2020-09-02 22:37:57 +02:00
Kim Kulling
6d5c388780
Introduce node iterator.
2020-08-30 21:10:04 +02:00
Malcolm Tyrrell
0f6127e90e
No need to build strings.
2020-08-18 18:21:20 +01:00
Malcolm Tyrrell
b7c789da67
Stop concatenating std::strings. Use formatter.
2020-08-18 17:35:08 +01:00
Kim Kulling
21678df589
ogre + collada migration.
2020-07-10 22:25:38 +02:00
Kim Kulling
839986ca14
next step of AMF-Migration.
2020-07-04 09:04:06 +02:00
Kim Kulling
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
Kim Kulling
fb20e15163
start to migrate colladat and amf
2020-06-27 15:57:06 +02:00
Kim Kulling
6205af4efb
replace NULL and avoid ai_assert with more than 2 tests.
2020-06-23 21:05:42 +02:00
Kim Kulling
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
