Commit Graph

4890 Commits

Author SHA1 Message Date
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
Kim Kulling
14d6141f69 Collada: fix scenenode parsing. 2020-09-14 21:35:36 +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
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
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
Kim Kulling
73fa2cbe88 Fix memory handling of xml-nodes in the parser. 2020-09-01 21:48:50 +02: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
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
Kim Kulling
b7e9595e54 fix loop of xml-files. 2020-08-28 00:09:51 +02: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
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
kimkulling
6a8edb21f8 fix merge issues 2020-08-18 17:41:37 +02:00
kimkulling
7e93ae4428 3MF: Migration. 2020-08-18 16:54:29 +02:00
Kim Kulling
394651e640 x3d: migration of goups. 2020-08-10 22:13:45 +02:00
Kim Kulling
58b81a2590 start migrating X3D. 2020-07-26 10:17:21 +02:00
Kim Kulling
deddaf49df finish migrate ogrexmlserializer. 2020-07-16 11:33:28 +02:00
Kim Kulling
b19ebf5d54 Fix merge conflicts. 2020-07-14 09:02:14 +02:00
Kim Kulling
8cfd2a4cc1 Migrate OgreSerializer. 2020-07-14 09:00:06 +02:00
Kim Kulling
21678df589 ogre + collada migration. 2020-07-10 22:25:38 +02:00
Kim Kulling
77b705048b fix merge issues. 2020-07-04 13:42:23 +02:00
Kim Kulling
839986ca14 next step of AMF-Migration. 2020-07-04 09:04:06 +02:00
Kim Kulling
d74c10dcb7 Merge branch 'master' into pugi_xml 2020-07-03 17:29:38 +02:00
Kim Kulling
693da43095 closes https://github.com/assimp/assimp/issues/3305: remove merge issue. 2020-07-02 15:22:06 +02:00
Kim Kulling
b1369d0912 next steps. 2020-07-02 15:18:59 +02:00
Kim Kulling
7fda533484 Merge branch 'master' into double 2020-06-30 21:12:02 +02:00
Marc-Antoine Lortie
03340787ec Fixed variable in loop - HL1MDLLoader.cpp
Commit 7e5a0acc48 made changes to HL1MDLLoader.cpp. Several variables have been renamed. A loop variable 'i' was renamed to faceIdx, but one reference was left unchanged.
2020-06-29 07:50:51 -04:00
Kim Kulling
eeb4a981bd Merge branch 'master' into patch-2 2020-06-29 09:55:55 +02:00
Hill Ma
30f09e9fc0 Fix build when ASSIMP_DOUBLE_PRECISION is on.
Tested:
$ cmake -DASSIMP_DOUBLE_PRECISION=1 -DASSIMP_BUILD_MDL_IMPORTER=0 ..; make

The MDL importer is disabled due to the fact that there is some float-only code
in MDL. This also means bin/assimp and bin/unit would not link successfully with
the above build flags.
2020-06-28 17:36:21 -07:00
Kim Kulling
fb20e15163 start to migrate colladat and amf 2020-06-27 15:57:06 +02:00