Commit Graph

11 Commits

Author SHA1 Message Date
Kim Kulling
0c3c88270a Merge branch 'master' into master 2019-11-11 10:19:22 +01:00
Kim Kulling
805bc2e766 Update ColladaParser.cpp
Add missing brackets.
2019-10-31 20:18:39 +01:00
Raphael Dümig
2d086fd236 ColladaParser: fix handling of empty XML-elements 2019-10-25 15:23:13 +02:00
RichardTea
198bc428fa Fix some warnings in Collada import 2019-10-14 12:15:02 +01:00
RichardTea
6a6ccc0fb0 Rename ConvertPath() to UriDecodePath() 2019-10-14 11:27:34 +01:00
RichardTea
ce5c71d2e7 Collada ZAE import must convert manifest and image paths
Moved ConvertPath into ColladaParser and use it when reading all filenames from the XML

Added more EXPECTS to the Collada tests
2019-10-11 18:57:38 +01:00
RichardTea
5c6ea5d7ba Fix memory leak in Collada ZAE and 3MF ZipFile reading
Must close the file!
2019-07-25 09:54:39 +01:00
RichardTea
2a72c9b616 Read embedded textures from Collada ZAE 2019-07-12 14:46:48 +01:00
RichardTea
d64e1bde13 First pass of Collada ZAE support
Reads the manifest and loads the DAE
Does not yet load embedded textures
2019-07-12 11:29:35 +01:00
RichardTea
59f732e10d DAE Import: Don't use SkipElement() to skip empty Text
IrrXML doesn't recognise the construction: `<author></author>` as being an empty element, and so ColladaParser::TestTextContent advances the element stream into the `</author>` element.

Use TestClosing(const char*) instead of SkipElement() to skip an empty text element.
2019-06-20 16:30:52 +01:00
Kim Kulling
57c46db042 Reorg of code. 2019-06-06 14:45:43 +02:00