Commit Graph

4027 Commits (e05ece2eec2a52eee44dd6ac5dfd5f05a96be239)

Author SHA1 Message Date
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 ae7b1f1a77
Merge branch 'master' into kimkulling_dev 2019-07-03 18:28:15 +02:00
Kim Kulling 0ec5eb752c
Update FBXConverter.cpp
Removing dead and unused code.
2019-07-03 12:50:01 +02:00
Kim Kulling 1fc232effa closes https://github.com/assimp/assimp/issues/2368: just fix it 2019-07-02 21:46:52 +02:00
Kim Kulling 96f16c7aea closes https://github.com/assimp/assimp/issues/2527: use correct macro for Assimp-exporter. 2019-07-02 19:48:53 +02:00
Kim Kulling 3fcf3bd81f
Merge branch 'master' into topic/embedded_texture_name_fix 2019-06-30 12:43:40 +02:00
Rob Conde f5ece83f31 initial unnamed node uniqueness index outside of loop 2019-06-28 16:12:58 -04:00
Mike Samsonov 6d07473550 all textures use relative path except embedded, this is fix for it 2019-06-27 17:59:55 +01:00
Kim Kulling 05f5b54f75
Merge branch 'master' into issue_2518_active_importer_ident 2019-06-27 14:02:01 +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
Kim Kulling 0f66a917e5 Add unittest. 2019-06-24 21:37:53 +02:00
RichardTea 8f43fb144a Add "importerIndex" Importer property
This indicates the index of the Importer that was selected, or -1 if did not find one at all.
2019-06-24 14:55:48 +01:00
Kim Kulling 26bd54ae0b PostProcesswing: add gen-aabb process to postprocessing. 2019-06-23 20:24:32 +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 ced080f9f3 X: fix out of bound access. 2019-06-15 19:17:15 +02:00
Kim Kulling eb27fb753d Merge branch 'master' into kimkulling-patch-3 2019-06-15 13:44:13 +02:00
Rahul Sheth 6c33374491 update install interface location 2019-06-13 22:08:34 -07:00
Rahul Sheth d00f4f4b3a Build Hunter-compatible config file 2019-06-13 21:34:47 -07:00
Rahul Sheth 5cda81e84b code fixes for Hunter-based build 2019-06-13 21:32:37 -07:00
Rahul Sheth dab8041bcd rewrite include paths for Hunter packages 2019-06-13 21:32:36 -07:00
Rahul Sheth a4587e8609 Use hunter to download dependencies if HUNTER_ENABLED is ON 2019-06-13 21:31:24 -07:00
Kim Kulling ba29b8f1da
Merge branch 'master' into patch-1 2019-06-13 13:41:40 +02:00
Kim Kulling 0021c93892 closes https://github.com/assimp/assimp/issues/2431: use irrXml directly for mingw compiler. 2019-06-12 22:12:38 +02:00
Kim Kulling 66f693a6a4
Update IRRLoader.cpp
fix case-sensitive typo.
2019-06-12 10:25:11 +02:00
Kim Kulling e914b9531b
Update IRRLoader.h
fix case-sensity typo.
2019-06-12 00:55:06 +02:00
Kim Kulling 4dcb3c9235
Update ImporterRegistry.cpp
fix case-sensiive folder bug.
2019-06-11 21:55:21 +02:00
Kim Kulling fc065d8ab4 Merge branch 'master' into reorg 2019-06-11 20:59:46 +02:00
Kim Kulling a6e3fc3fd9 Fix case-sensitive folder name for unix platforms. 2019-06-11 20:54:01 +02:00
Kim Kulling cc10967913 Fix the build. 2019-06-11 20:17:50 +02:00
PK d448b49ae1
fixed MSVC toolset versions >140
according to https://cmake.org/cmake/help/latest/variable/MSVC14.html the use of the MSVC** flags is deprecated, this change uses the encouraged MSVC_VERSION variable.
2019-06-11 15:16:53 +02:00
Kim Kulling f76d77955d Merge branch 'master' into reorg 2019-06-11 00:22:50 +02:00
Kim Kulling 2da3a38d60 Fix the compile pass, still unresolved symbols. 2019-06-10 23:26:00 +02:00
Kim Kulling 7e20356a20
Update XFileParser.cpp
Fix exception.
2019-06-10 20:32:56 +02:00
Kim Kulling 6fc42cb898
Merge branch 'master' into kimkulling-patch-3 2019-06-10 00:39:05 +02:00
Kim Kulling a4bda3a205
Update XFileParser.cpp
Test
2019-06-09 21:25:25 +02:00
Kim Kulling 2d985b92c9 Fix references in cmake file. 2019-06-09 18:43:56 +02:00
petrmohelnik 83247e3fbd
Merge branch 'master' into glTF-importer---clean-all-member-arrays 2019-06-09 15:52:32 +02:00
Kim Kulling cbd5c5b284
Merge branch 'master' into Ogre_with_skeleton_missing 2019-06-08 21:31:47 +02:00
Kim Kulling 4a46717a77
Merge branch 'master' into kimkulling-patch-3 2019-06-08 09:09:37 +02:00
Arkeon 5679dd435a Prevent crash when Ogre skeleton file is missing 2019-06-07 09:49:24 +02:00
Kim Kulling 57c46db042 Reorg of code. 2019-06-06 14:45:43 +02:00
Kim Kulling 589a306c85
Merge branch 'master' into code-chmod-644 2019-06-06 09:16:07 +02:00
petrmohelnik 1855bf44f9 glTF importer - clean all member arrays
When importing more than one scene using the same gtlf importer loading fails with error 'bad array new length'. This happens because 'meshOffsets' are not cleared and the importer continues to push_back values at the end. Adjacent values are then used to calculate the length of 'mMeshes' array. This calculation expects that each value is higher than the previous otherwise we get negative length. But when pushin at the end of uncleared array we get contents like this: 0,1,2,3,0,1,2. Then when calculating 0-3 we try to allocate array of length -3 and get this exception.
2019-06-05 18:51:49 +02:00
Kim Kulling dcee3295cc
Merge branch 'master' into FindInstancesProcessOptim 2019-06-04 10:36:59 +02:00
Mike Samsonov 48ed2d2d3c Double precision fix 2019-05-30 10:54:44 +01:00