Commit Graph

3993 Commits

Author SHA1 Message Date
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
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
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
Kim Kulling
5bc6787d57 Merge branch 'master' into FindInstancesProcessOptim 2019-05-29 12:21:48 +02:00
Kim Kulling
a6b51ef911 Merge branch 'master' into code-chmod-644 2019-05-29 08:59:47 +02:00
Kim Kulling
51527ba038 Merge branch 'master' into utf8 2019-05-28 19:53:14 +02:00
Kim Kulling
5c3662dc6d Merge branch 'master' into set_stl_mesh_names 2019-05-24 21:49:35 +02:00
Brian Naranjo
fdcae81b61 Merge branch 'master' into set_stl_mesh_names 2019-05-23 11:21:49 -07:00
Kim Kulling
e1ed975839 Merge branch 'master' into topic/fbx_node_naming_optimization 2019-05-22 20:13:36 +02:00
Alexandre Avenel
daef984ac6 Optim FindInstancesProcess
ComputePositionEpsilon() is a costly function which was called in the inner
loop although it only uses data from upper loop.
2019-05-22 20:00:33 +02:00
Rémi Verschelde
fc7575f5c5 Remove Unix executable bit on code files 2019-05-22 10:23:13 +02:00
Rémi Verschelde
5fa750fda0 Fix code files encoding to make them all UTF-8 2019-05-22 10:19:32 +02:00
Kim Kulling
52d4564b7e Merge branch 'master' into topic/fbx_file_more_than_4gb 2019-05-21 20:12:57 +02:00
Mike Samsonov
0eec1c1d4a One map to rule them all 2019-05-21 16:05:38 +01:00
Brian Naranjo
7ac831489c Merge branch 'master' into set_stl_mesh_names 2019-05-20 08:52:20 -07:00
Kim Kulling
627cb93b0b Merge branch 'master' into topic/fragmented_embedded_textures 2019-05-19 20:16:49 +02:00
Brian Naranjo
ff4ab7ff2e Add mesh names to imported ASCII STL 2019-05-17 11:48:57 -07:00
Kim Kulling
2f4cb93764 Merge branch 'master' into topic/exception_spam_fix_fbxmaterial 2019-05-17 19:43:54 +02:00
Kim Kulling
4b10c7e432 Merge branch 'master' into topic/degenerate_area_fix 2019-05-16 21:44:46 +02:00
Kim Kulling
81f8ebf2d4 Merge branch 'master' into kimkulling-2449 2019-05-16 17:04:09 +02:00
Kim Kulling
7cd021e704 Merge branch 'master' into pdb-install-fix 2019-05-16 14:49:29 +02:00
Mike Samsonov
6c13ec8190 fix for clang runtime checks for overflow 2019-05-16 11:59:23 +01:00
Mike Samsonov
c84ac7a135 Fragmented FBX ASCII emdedded resource 2019-05-16 11:59:23 +01:00
Mike Samsonov
13bba4fb4c even more efficient 2019-05-16 11:58:48 +01:00
Mike Samsonov
b957d44943 Node names optimization and fixing non-unique name 2019-05-16 11:58:48 +01:00
Mike Samsonov
c58ed8da22 Support for FBX file sizes more than 4GB 2019-05-16 11:58:26 +01:00
Mike Samsonov
4e03a2c00d Exception spam fix for FBXMaterial 2019-05-16 11:58:07 +01:00
Mike Samsonov
5bca43be74 Degenerate triangles with small area removing fix 2019-05-16 11:57:46 +01:00
Kim Kulling
77281b75b2 Merge branch 'master' into master 2019-05-16 11:13:48 +02:00
Kim Kulling
785ceaf58a Merge branch 'master' into windows-external-zlib-fix 2019-05-14 22:07:56 +02:00
Kim Kulling
747a7c963b Merge branch 'master' into assimpview_unicode 2019-05-13 23:49:06 +02:00