Commit Graph

6878 Commits

Author SHA1 Message Date
Kim Kulling
202907d471 collada: fix warning: unused variable. 2020-09-27 21:11:42 +02:00
Kim Kulling
3f97a1df2c collada: fix warning: unused variable. 2020-09-27 21:09:06 +02:00
Kim Kulling
bdd3c96eee amf: fix warning: unused variable. 2020-09-27 21:06:14 +02:00
Kim Kulling
5877f81419 amf: fix warning: unused variable. 2020-09-27 21:03:59 +02:00
Kim Kulling
5230b91611 amf: fix warning: unused variable. 2020-09-27 21:01:48 +02: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
5653a82a87 fix the unittests. 2020-09-27 20:20:44 +02:00
Kim Kulling
9234fee35e Ogre: fix xml migration. 2020-09-27 09:36:38 +02:00
Sherief Farouk
a3c8cfc0ff Fix for build break due to warnings-as-errors when not building M3D exporter. 2020-09-26 23:21:23 -07: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
0e9621012c Adapt code style - finally :-). 2020-09-14 08:43:31 +02:00
Kim Kulling
1ff9e2b522 Adapt code style. 2020-09-14 08:40:21 +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
bd91033172 Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 2020-09-08 20:53:00 +02:00
Kim Kulling
0618db1f99 AMF: some smaller refactorings to improve readability. 2020-09-07 20:52:46 +02:00
Denis Blank
f3b25b999b Fix an unreferenced formal parameter warning on MSVC when no exporter is built 2020-09-05 23:20:31 +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