Commit Graph

12783 Commits

Author SHA1 Message Date
Kim Kulling
920535165d next fixed warnings 2020-03-01 13:15:45 +01:00
Kim Kulling
772774495c Merge pull request #3040 from Nimer-88/split_by_bone_count_infinite_loop
Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop
2020-02-29 20:19:43 +01: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
Kim Kulling
f343d3eec2 Merge pull request #3022 from iamAdrianIusca/master
small improvements in the CMakeLists.txt file
2020-02-28 22:52:59 +01:00
Kim Kulling
03182c21b8 xml-migration amf - next steps. 2020-02-26 22:19:42 +01:00
Adrian Iusca
440629f1d2 Merge branch 'master' into master 2020-02-26 20:27:52 +02:00
Marc-Antoine Lortie
c5aa817bda Merge branch 'master' into sample-simpleopengl-minor-improvements 2020-02-26 12:44:25 -05:00
Kim Kulling
5eca30e274 Merge pull request #3010 from jcarpent/master
pkg-config: fix include path
2020-02-26 18:35:46 +01:00
Marc-Antoine Lortie
ed5aab9495 Fixed and changed a few things.
- Removed references to test models with relative path.
- Fixed a compile warning.
- Added usage message.
2020-02-26 12:19:06 -05:00
Nikita Shubin
3c081f5f70 [RFC] cmake: targets: check lib or lib64 path
Linkage against lib or lib64 should be taken into assumption.

Without it we get:

The imported target "assimp::assimp" references the file

     "/usr/lib/libassimp.so.5"

When compiling against x86_64 target. The library of couse exits in
/usr/lib64.

see:
https://cmake.org/cmake/help/v3.17/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.html

As i am not a master of cmake this should be double checked if
it doesn't break anything.

Signed-off-by: Nikita Shubin <NShubin@topcon.com>
2020-02-26 17:06:22 +03:00
Nikita Shubin
4182d6fb60 cmake: double quotes around the <path>
see https://cmake.org/cmake/help/latest/command/file.html#to-native-path
2020-02-26 16:24:34 +03:00
Marc-Antoine Lortie
957abaa15a Raised minimum CMake version to 3.0 for assimp_cmd and assimp_view.
This is a follow-up to PR #3024, in which I explained that I would then change the version of CMake to 3.0 in several files to match the changes that were originally made by OP in PR #3008.

The minimum CMake version have been raised to 3.0 in both assimp_cmd and assimp_view projects.

The same CMake configuration as in PR #3024 was used. All projects from PR #3024 are found in the solution with the current changes. All projects built. All tests were run.
2020-02-26 08:00:49 -05:00
Adrian Iusca
919ae489fc Merge branch 'master' into master 2020-02-25 23:32:31 +02:00
Kim Kulling
100a7a7c11 Merge branch 'master' into master 2020-02-25 20:51:17 +01:00
Kim Kulling
c5aa7cceee Merge pull request #3024 from malortie/remove-else-endif-constructs-cmake-files
Removed uneeded expression in else() and endif() constructs.
2020-02-25 20:44:10 +01:00
Paul Arden
e56def7585 Fix indentation. 2020-02-25 14:52:59 +11:00
Paul Arden
ae50c4ebdf Add support for orthographic camera information and use in glTF2 importer. Fixes #3030. 2020-02-25 14:45:00 +11:00
Paul Arden
fb5b01958a Fix to read orthographic camera data. Manual merge for this branch. Fixes #3028 2020-02-25 11:03:07 +11:00
ardenpm
be391a3b66 Merge pull request #13 from assimp/master
Update to upstream master
2020-02-25 10:39:49 +11: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
Kim Kulling
824a412239 Merge pull request #3009 from inhosens/master
A bug when importing multiple gltf files
2020-02-24 20:05:19 +01: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
Kim Kulling
55e9171e1f Merge branch 'master' into master 2020-02-22 21:13:33 +01:00
Adrian Iusca
344170469c Merge branch 'master' into master 2020-02-22 22:04:48 +02:00
Kim Kulling
55eb89d476 Merge pull request #3013 from malortie/common-directory-for-compiled-binaries
Made changes to write compiled binaries to a common directory.
2020-02-22 21:01:56 +01:00
Kim Kulling
2d382c5e76 Merge branch 'master' into common-directory-for-compiled-binaries 2020-02-22 09:05:28 +01:00
Adrian Iusca
f3c89b0bd7 Merge branch 'master' into master 2020-02-21 20:23:42 +02:00
iamAdrianIusca
4e414eb4ef Merge remote-tracking branch 'origin/master' 2020-02-21 20:17:49 +02: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
Kim Kulling
848922feae Merge pull request #3014 from iamAdrianIusca/master
small changes
2020-02-19 21:47:33 +01:00
Adrian Iusca
93d1586f44 Merge branch 'master' into master 2020-02-19 21:31:24 +02:00
Kim Kulling
bc3ed5f702 Merge pull request #3021 from malortie/fix-simpletexturedopengl-memory-leaks
Fixed memory leaks in SimpleTexturedOpenGL sample.
2020-02-19 20:13:02 +01:00
Marc-Antoine Lortie
4d27fccd0b Fixed memory leaks in SimpleTexturedOpenGL sample.
- Added function "cleanup" to centralize release of resources.
- Added function "freeTextureIds" to free textureIds memory.
- Added call to freeTextureIds in LoadGLTextures to free memory before it is allocated again.
- Made several changes in KillGLWindow to prevent certain Win32 handle/resources
 from being released more than once.
2020-02-19 13:17:45 -05:00
Adrian Iusca
93de396373 Merge branch 'master' into master 2020-02-19 16:03:33 +02:00
Kim Kulling
8639bbabc7 Merge pull request #3020 from assimp/kimkulling-clangformat
Keep post-processor intentions
2020-02-19 12:35:09 +01:00
Kim Kulling
8d6d8e2e38 Update .clang-format
Update clang.format to keep formatting of hashes in include file to optimize readabilaty.
2020-02-19 10:42:30 +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
76908002c6 Merge remote-tracking branch 'origin/master' 2020-02-18 18:25:17 +02:00
iamAdrianIusca
d0922230a9 fixed the = default on the destructor 2020-02-18 18:24:52 +02:00
Justin Carpentier
ba925e8860 Merge branch 'master' into master 2020-02-18 17:23:02 +01:00
Adrian Iusca
0811a69dab Merge branch 'master' into master 2020-02-18 18:02:25 +02:00