Commit Graph

8361 Commits

Author SHA1 Message Date
Max Vollmer
ec69e2bf59 Added unit test for recursive references in GLTF2 file 2020-03-12 09:10:48 +00:00
Max Vollmer
1bc7c710d6 Added a check to detect and prevent recursive references in GLTF2 files 2020-03-11 09:54:24 +00:00
Kim Kulling
7e23773776 Merge pull request #3055 from malortie/fix-simpletextureddirectx11-sample2
Added missing std namespace prefix to std types.
2020-03-10 22:16:01 +01:00
Marc-Antoine Lortie
0904e4880b Merge branch 'master' into fix-simpletextureddirectx11-sample2 2020-03-10 12:04:54 -04:00
Kim Kulling
22ca2efa8f Merge pull request #3033 from malortie/raise-cmake-minimum-version-to-3.0
Raised minimum CMake version to 3.0 for assimp_cmd and assimp_view.
2020-03-10 16:29:13 +01:00
Kim Kulling
1c6077aa4f Merge branch 'master' into raise-cmake-minimum-version-to-3.0 2020-03-10 13:16:33 +01:00
Kim Kulling
c7628d0f92 Merge pull request #3058 from assimp/fix_zip_issue
Fix zip issue
2020-03-09 13:47:45 +01:00
Kim Kulling
9fae5fdabb Merge branch 'master' into fix_zip_issue 2020-03-09 10:57:04 +01:00
kimkulling
f3b6b78d4d small refactorings. 2020-03-09 10:55:32 +01:00
kimkulling
bb3db0ebaf closes https://github.com/assimp/assimp/issues/2954: upgrade to latest greatest. 2020-03-09 10:51:26 +01:00
Kim Kulling
7b1187a917 Merge pull request #3057 from shawwn/2020-03-09/fix
Only try to initialize members whose name starts with 'm' followed by an uppercase character
2020-03-09 10:15:03 +01:00
Shawn Presser
f305f10551 Only try to initialize members whose name starts with 'm' followed by an uppercase character 2020-03-09 00:05:17 -07:00
Kim Kulling
5866f3f98f Merge branch 'master' into fix-simpletextureddirectx11-sample2 2020-03-08 18:48:26 +01:00
Kim Kulling
339f9387a7 Merge pull request #3056 from malortie/fix-matrix3x3-comparison-operators
Fixed wrong matrix type used in aiMatrix3x3t comparison operators.
2020-03-08 18:47:11 +01:00
Marc-Antoine Lortie
424f5e939f Fixed wrong matrix type used in comparaison operators. 2020-03-08 12:18:09 -04:00
Marc-Antoine Lortie
dda083fa7b Added missing std namespace prefix to std types. 2020-03-08 10:50:18 -04:00
Kim Kulling
a3ff03f193 Merge branch 'master' into raise-cmake-minimum-version-to-3.0 2020-03-08 09:06:09 +01:00
Kim Kulling
1e2c3c9c01 Merge pull request #3053 from malortie/fix-simpledirectx11-sample
Fixed SimpleTexturedDirectX11 sample.
2020-03-07 17:59:24 +01:00
Kim Kulling
b5d65bf94e Update ModelLoader.cpp
Apply asimp-code-style.
2020-03-07 12:22:57 +01:00
Kim Kulling
31c6f0db92 Update Mesh.h
Apply code style.
2020-03-07 12:19:55 +01:00
Marc-Antoine Lortie
aa8a6122ce Fixed SimpleTexturedDirectX11 sample.
- Removed OpenGL/Glut references in SimpleTexturedDirectX11 CMakeFile
- Moved UTFConverter from SimpleTexturedOpenGL to its own file to be able to reuse it.
- Added compile definition SHADER_PATH to allow to locate the shader files in CMakeFile
- Fixed compile warnings
- Made global pointers null to help prevent dangling references.
- Added missing members initialization in class constructors.
- Removed references to missing model "Models/mymodel.fbx"
- Fixed error when extracting model file directory
- Added missing device context assignment in ModelLoader Load method
- Fixed memory leak caused by variable 'ourModel' not deleted.
- Removed call to dev->Release() in ModelLoader.cpp
- Adjusted Release() calls in reverse order when cleaning up D3D
- Made Throwanerror implementation throw an error instead of displaying a message box
- Fixed leaking D3D resources
- Added a pointer to an ID3D11Debug to dump live objects.
2020-03-06 10:26:51 -05:00
Kim Kulling
291d86c4e0 Merge branch 'master' into raise-cmake-minimum-version-to-3.0 2020-03-06 14:18:04 +01:00
Kim Kulling
0201fc57dc Merge pull request #3039 from Nimer-88/gltf2_broken_bones_count
Fix for #3037 cause glTF2Importer creating bunch of bones with 0 for vertex with index 0
2020-03-04 23:10:32 +01:00
Kim Kulling
0b227219b7 Merge branch 'master' into gltf2_broken_bones_count 2020-03-03 11:33:56 +01:00
Kim Kulling
a254690ba0 Merge branch 'master' into raise-cmake-minimum-version-to-3.0 2020-03-02 20:44:07 +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
Adrian Iusca
440629f1d2 Merge branch 'master' into master 2020-02-26 20:27:52 +02: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
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
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