Commit Graph

18 Commits (a642b1d51a307af6ed04051410da282c345a138f)

Author SHA1 Message Date
escherstair 2d0d2374c1
fix ColladaLoader::findMesh() declaration 2019-08-29 12:00:44 +02:00
escherstair 789e8abfe8
prefer prefix ++ operator for non-primitive types 2019-08-29 08:44:49 +02:00
escherstair dbb498095d
function parameter 'meshid' should be passed by const reference 2019-08-29 08:05:45 +02: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
Kim Kulling 41ea607739
Merge branch 'master' into collada_zae 2019-07-20 14:12:18 +02:00
kkulling a8019cf8d8 Unit: Fix new compiler warnings. 2019-07-19 10:38:44 +02:00
kimkulling c1670b6a97 closes https://github.com/assimp/assimp/issues/2548: check if weight are set or set the weight to 1.0f 2019-07-16 11:40:34 +02: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
Kim Kulling 39dc9801e0
Update ColladaLoader.cpp
- add header memory
- Fix format stuff
2019-07-09 20:35:57 +02:00
Kim Kulling a01302dd4d
Merge branch 'master' into issue_2182 2019-07-09 19:45:40 +02:00
Kim Kulling ed6dbf9533 closes code/Collada/ColladaLoader.cpp: fix possible memleak when throwing an exception. 2019-07-09 19:44:56 +02:00
Kim Kulling af199c50aa
Merge branch 'master' into issue_2456_text_formats_precision 2019-06-26 17:31:11 +02:00
Kim Kulling 853afdf42b
Merge branch 'master' into fix_issue_2507_collada_import 2019-06-25 20:19:42 +02:00
Kim Kulling 1952144445 Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev 2019-06-24 21:46:05 +02:00
RichardTea bf252c4452 Add configuration of text format precision
Define ASSIMP_AI_REAL_TEXT_PRECISION
8 when ai_real is float
16 when ai_real is double
2019-06-20 18:11:11 +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