Commit Graph

1094 Commits

Author SHA1 Message Date
Max Vollmer
615ffdf93f What: Throw instead of assert when input file is invalid.
Why: Assimp shouldn't crash on invalid files. Asserts are disabled on Release builds.
2020-09-10 10:47:58 +01: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
ef6b93a949 Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 2020-09-04 16:27:47 +02:00
Kim Kulling
689406fbda Fix Colladat import. 2020-09-04 07:33:10 +02:00
Rahul Sheth
78b30d1752 Merge branch 'master' into rbsheth_hunter_rapidjson 2020-09-03 09:51:32 -04:00
Kim Kulling
be5089ae40 Collada: correct parsing of float data in xml nodes. 2020-09-02 22:38:19 +02:00
Kim Kulling
075540e15a AMF: fixes. 2020-09-02 22:37:57 +02:00
Kim Kulling
0b8ed5c03a fix crash when x3d is empty 2020-09-02 21:49:40 +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
Gargaj
9053dfea05 add missing define to glTF importer 2020-09-02 16:28:12 +02:00
Kim Kulling
73fa2cbe88 Fix memory handling of xml-nodes in the parser. 2020-09-01 21:48:50 +02:00
Joshua Hyatt
638499a278 Replace unique_ptr and add custom deleter 2020-09-01 10:30:31 -06:00
Kim Kulling
3c2133a3b9 fix node collection for collada xml parsing 2020-09-01 07:51:17 +02:00
kimkulling
e62b4e5cce next iteration. 2020-08-31 16:10:38 +02:00
Kim Kulling
6d5c388780 Introduce node iterator. 2020-08-30 21:10:04 +02:00
Joshua Hyatt
dcf9a7b2d8 Conform variable names to code standards 2020-08-29 23:58:31 -06:00
Joshua Hyatt
953e976de6 Close stream when finished 2020-08-29 23:56:50 -06:00
Joshua Hyatt
cc2613f264 Replace unique_ptr with raw pointer 2020-08-29 23:06:33 -06:00
Joshua Hyatt
c769f8d4ad Replace unique_ptr with raw pointer to avoid destructing stream 2020-08-29 22:21:34 -06:00
kimkulling
30a4eae17f simplify some ttributes access in loaded xml. 2020-08-28 16:25:22 +02:00
kimkulling
0730eebe6f fix collada handling of xml nodes. 2020-08-28 16:17:56 +02:00
crocdialer
3c98197be0 set aiAnimation->mTicksPerSecond to 1000.0. this is analog to the behaviour of gltf2-importer 2020-08-28 16:09:15 +02:00
Kim Kulling
b7e9595e54 fix loop of xml-files. 2020-08-28 00:09:51 +02:00
Rahul Sheth
59c8b4ed84 Move RapidJSON definitions to CMake 2020-08-27 16:51:06 -04:00
kimkulling
582a8b1887 Fix xml-migration bild. 2020-08-27 17:05:09 +02:00
Kim Kulling
c359b973bb finish migration of collada. 2020-08-26 22:31:46 +02:00
Kim Kulling
904f17f29f next collada-iteration 2020-08-24 07:44:54 +02:00
Kim Kulling
7adfe1f2d8 Xml: introduce helper for attribute parsing. 2020-08-21 06:45:30 +02:00
Kim Kulling
cb631517a7 next iteration. 2020-08-19 22:44:13 +02:00
Malcolm Tyrrell
6c2ceb55f8 Simplify some FBX error code. 2020-08-19 17:20:57 +01:00
kimkulling
d393f677ce Collada: next methods migrated. 2020-08-19 17:10:30 +02:00
Kim Kulling
56381241c5 move hasAttribute to XmlParser scope. 2020-08-19 00:19:56 +02:00
Kim Kulling
554ed1bf91 next step.s 2020-08-18 20:44:06 +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
kimkulling
6a8edb21f8 fix merge issues 2020-08-18 17:41:37 +02:00
Malcolm Tyrrell
0ffcdf160e Build formatting into DeadlyImportError 2020-08-18 16:32:34 +01:00
kimkulling
7e93ae4428 3MF: Migration. 2020-08-18 16:54:29 +02:00
lsliegeo
0d00ff7043 use ai_real instead of float 2020-08-15 14:57:49 +02:00
Kim Kulling
394651e640 x3d: migration of goups. 2020-08-10 22:13:45 +02:00
Kim Kulling
1f348c5fc0 Remove redundant float f 2020-08-04 20:55:29 +02:00
Kim Kulling
aabf12827b fix typo 2020-08-04 17:52:43 +02:00
Kim Kulling
855b47452e Export opacity is 3DS
closes https://github.com/assimp/assimp/issues/3291
2020-08-04 17:41:28 +02:00
Kim Kulling
008e551f8e Merge branch 'master' into fbxVersionCheck 2020-07-31 14:33:21 +02:00
Malcolm Tyrrell
0282f358a4 Remove unneeded check. 2020-07-31 12:40:17 +01:00
Malcolm Tyrrell
301bae3967 Improve message 2020-07-30 16:37:41 +01:00
Malcolm Tyrrell
eaf0587dd8 FBX Version/Size Check 2020-07-30 14:56:01 +01:00
Ryan Styrczula
3170c3d15c FBXExport: Fix crash if scene->mMetaData is null 2020-07-30 09:21:43 -04:00