Commit Graph

215 Commits

Author SHA1 Message Date
Kim Kulling
9234fee35e Ogre: fix xml migration. 2020-09-27 09:36:38 +02:00
Kim Kulling
d6892b3f58 Merge branch 'master' into pugi_xml 2020-09-25 21:00:09 +02:00
Kim Kulling
557273818d collada: next iteration. 2020-09-23 21:23:12 +02:00
Kim Kulling
34351b3cb9 fix collada material parsing. 2020-09-23 00:20:06 +02:00
Kim Kulling
c0e58c1895 Merge branch 'master' into gltfBufferViewSizeFix 2020-09-22 20:02:16 +02:00
kimkulling
71f20eaa8a next fixes 2020-09-22 15:51:21 +02:00
kimkulling
dee8e5bee1 Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml 2020-09-22 15:20:35 +02:00
Kim Kulling
c4039d5cf0 fix collada data parsing. 2020-09-21 20:05:16 +02:00
kimkulling
8c88526da8 fix collada unittests. 2020-09-21 16:39:24 +02:00
Max Vollmer (Microsoft Havok)
c9fb21661f Merge branch 'master' into gltfBufferViewSizeFix 2020-09-18 08:01:24 +01:00
rahulshethsc
354e09e785 Merge branch 'master' into rbsheth_hunter_rapidjson 2020-09-17 14:39:04 -04:00
Fabian Schmidt
338c0b753c Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 2020-09-16 21:43:35 +02:00
Max Vollmer (Microsoft Havok)
9c1edaee96 Merge branch 'master' into gltfBufferViewSizeFix 2020-09-16 10:08:47 +01:00
Kim Kulling
14d6141f69 Collada: fix scenenode parsing. 2020-09-14 21:35:36 +02:00
Kim Kulling
9e2c4e0cf4 Merge branch 'master' into rbsheth_hunter_rapidjson 2020-09-14 09:00:11 +02:00
Kim Kulling
23defc275a Merge branch 'master' into makeInternalErrorsAccessible 2020-09-14 08:36:13 +02:00
kimkulling
d0932c405f fix duplicated node parsing. 2020-09-11 15:46:46 +02:00
Kim Kulling
c1f50e116a fix next unittests. 2020-09-11 00:46:29 +02:00
Kim Kulling
31f3812241 XGL: fix import of node values. 2020-09-10 21:03:02 +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
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