Commit Graph

4594 Commits (8f41516637ec5e8efb7c4e6cc7c34cb3125ad6b3)

Author SHA1 Message Date
iamAdrianIusca 8f41516637 Merge remote-tracking branch 'origin/master' 2020-03-09 22:19:22 +02:00
iamAdrianIusca 051d01e339 fixing the conflicts 2020-03-09 22:19:12 +02:00
Adrian Iusca 067677595c
Merge branch 'master' into master 2020-03-05 10:29:21 +02:00
Kim Kulling 0b227219b7
Merge branch 'master' into gltf2_broken_bones_count 2020-03-03 11:33:56 +01:00
iamAdrianIusca 66288df49b small change 2020-03-01 12:24:34 +02:00
iamAdrianIusca ffaa3629d8 back with the emplace_back 2020-03-01 11:24:58 +02:00
Adrian Iusca ec61318443
Merge branch 'master' into master 2020-03-01 11:24:12 +02:00
iamAdrianIusca 0d8434ed34 fix 2020-03-01 11:23:55 +02:00
iamAdrianIusca 2917ab04b7 fix 2020-03-01 11:22:44 +02:00
iamAdrianIusca 89ca66f300 fix 2020-03-01 11:21:53 +02:00
iamAdrianIusca 1f4b99479d fix 2020-03-01 11:20:55 +02:00
iamAdrianIusca 3bef9382bb Merge remote-tracking branch 'origin/master' 2020-03-01 11:12:46 +02:00
iamAdrianIusca aca6aaf35d small changes
- removed static definition
- use emplace_back instead of push_back
- changed the c++ deprecated headers
- removed some redundant std containers initialization in the destructor
- removed redundant .clear call for the std containers in the destructor
- added some const reference for some std container parameters
- other small changes in different places
2020-03-01 11:12:37 +02:00
Sebastian Matusik 710dbba52d Trimmed trailing whitespaces 2020-02-28 19:19:10 -08:00
Sebastian Matusik 496fcd35c1 Trimmed trailing whitespaces 2020-02-28 19:17:53 -08:00
Sebastian Matusik 5f35d62d61 Fix for #3037 cause glTF2Importer creating bunch of bones with 0 for vertex with index 0 2020-02-28 18:43:47 -08:00
Sebastian Matusik 22311883ce Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop 2020-02-28 18:42:22 -08:00
Adrian Iusca 919ae489fc
Merge branch 'master' into master 2020-02-25 23:32:31 +02:00
Kim Kulling e4b2fd246d
Merge branch 'master' into remove-else-endif-constructs-cmake-files 2020-02-24 20:08:17 +01:00
Adrian Iusca 28f4b95ff5
Merge branch 'master' into master 2020-02-24 21:05:51 +02:00
Marc-Antoine Lortie edfaaed56f Removed uneeded expression in else() and endif() constructs.
The following changes were tested against building with a master copy.

For a more detailed report, please read the followings below:

The flags that were checked were the ones checked by default + the following:

ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES

The list of compilable projects in Visual Studio were the following:

- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic

The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.

UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004.
2020-02-23 07:09:35 -05:00
iamAdrianIusca f28b087d16 small improvements in the CMakeLists.txt file
If ASSIMP_NO_EXPORT is not defined:
- don't add the macro for the exporters
- don't include the files for all the exporter
- don't display any messages about what exporters are enabled or not
2020-02-21 20:17:38 +02:00
Kim Kulling 3f5136b7b2
Merge branch 'master' into master 2020-02-19 21:52:57 +01:00
iamAdrianIusca 4de0237167 small fix 2020-02-18 21:55:35 +02:00
iamAdrianIusca a5524ffcd9 more changes 2020-02-18 19:02:14 +02:00
iamAdrianIusca ad52c5c5f6 .clear in destructor is redundant 2020-02-18 18:56:09 +02:00
iamAdrianIusca bf85fc1386 small changes 2020-02-18 18:50:48 +02:00
iamAdrianIusca 016c0a8665 small changes 2020-02-18 18:42:59 +02:00
iamAdrianIusca d0922230a9 fixed the = default on the destructor 2020-02-18 18:24:52 +02:00
iamAdrianIusca a65bac27e9 fixed the make_unique 2020-02-18 18:01:53 +02:00
iamAdrianIusca 024b5e60bc Merge remote-tracking branch 'origin/master' 2020-02-15 23:29:26 +02:00
iamAdrianIusca 5c99d6a864 very small changes
- FIND_PACKAGE(DirectX) is already used in the samples and assimp tool cmake files - so is not needed in the main cmake fil
- other small changes
2020-02-15 23:29:04 +02:00
Kim Kulling 00a104efde
Merge branch 'master' into master 2020-02-14 20:58:13 +01:00
Kim Kulling bdd5e52176
Merge branch 'master' into search-invalid-textures-missing-texture-types 2020-02-14 18:04:30 +01:00
Kim Kulling 1473c6616b
Merge branch 'master' into master 2020-02-14 12:56:14 +01:00
Adrian Iusca d662b25b17
Merge branch 'master' into master 2020-02-14 13:40:15 +02:00
Inho Lee d04df3e7c5 A bug when importing multiple gltf files
meshOffsets are not cleared when importing multiple gltf files
2020-02-14 08:41:55 +01:00
Kim Kulling 523e6c9f73
Merge branch 'master' into gltf-camera-pos 2020-02-14 08:21:54 +01:00
Hui.Du b62bd38c71 Fix: GLTF animation works on RTS not matrix; fix matrix related bug. 2020-02-14 02:11:12 +00:00
Adrian Iusca 56a71f22e1
Merge branch 'master' into master 2020-02-14 01:04:46 +02:00
iamAdrianIusca 25feb77982 more minor changes 2020-02-13 00:38:56 +02:00
iamAdrianIusca 6f1870681b reduced the scope of iStep variable 2020-02-13 00:27:30 +02:00
iamAdrianIusca 24cdb1f221 revert small change 2020-02-13 00:21:04 +02:00
Adrian Iusca 6f53e8b43b
Merge branch 'master' into master 2020-02-13 00:14:20 +02:00
iamAdrianIusca fc4dd6455a minor code improvements for the obj code
- make use of range for loops
- make use of empty() method for the std::vector
- removed unnecessary std::string initialization
- use ' ' instead of " " for the find methods (should be "faster")
- simplified some function
- make use of emplace_back instead of push_back (should be "faster")
- other small changes
2020-02-13 00:10:07 +02:00
Kim Kulling f5af791633
Merge branch 'master' into FBXMeshGeometry_checksizes_fix 2020-02-12 17:58:00 +01:00
Kim Kulling 47fc3f2627
Update M3DImporter.cpp
Fix a memoryleak.
2020-02-12 14:54:00 +01:00
Kim Kulling 1c13c793f0
Merge branch 'master' into master 2020-02-11 22:00:22 +01:00
Marc-Antoine Lortie 50334086cf Added missing texture types when searching for invalid textures. 2020-02-11 11:42:13 -05:00
Kim Kulling 58990d4e3f
Update FBXParser.cpp
add missing brackets.
2020-02-10 23:59:52 +01:00