0904e4880b
Merge branch 'master' into fix-simpletextureddirectx11-sample2
2020-03-10 12:04:54 -04:00
af59010583
Merge branch 'master' into cmake_fix_native_path
2020-03-10 16:29:44 +01:00
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
1c6077aa4f
Merge branch 'master' into raise-cmake-minimum-version-to-3.0
2020-03-10 13:16:33 +01:00
02e5698a38
fix linker issues.
2020-03-09 22:49:32 +01:00
c7628d0f92
Merge pull request #3058 from assimp/fix_zip_issue
...
Fix zip issue
2020-03-09 13:47:45 +01:00
9fae5fdabb
Merge branch 'master' into fix_zip_issue
2020-03-09 10:57:04 +01:00
f3b6b78d4d
small refactorings.
2020-03-09 10:55:32 +01:00
bb3db0ebaf
closes https://github.com/assimp/assimp/issues/2954 : upgrade to latest greatest.
2020-03-09 10:51:26 +01:00
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
f305f10551
Only try to initialize members whose name starts with 'm' followed by an uppercase character
2020-03-09 00:05:17 -07:00
e8d2b84017
clean all warnings for vs-2019
2020-03-08 21:24:01 +01:00
5866f3f98f
Merge branch 'master' into fix-simpletextureddirectx11-sample2
2020-03-08 18:48:26 +01:00
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
424f5e939f
Fixed wrong matrix type used in comparaison operators.
2020-03-08 12:18:09 -04:00
dda083fa7b
Added missing std namespace prefix to std types.
2020-03-08 10:50:18 -04:00
a3ff03f193
Merge branch 'master' into raise-cmake-minimum-version-to-3.0
2020-03-08 09:06:09 +01:00
1e2c3c9c01
Merge pull request #3053 from malortie/fix-simpledirectx11-sample
...
Fixed SimpleTexturedDirectX11 sample.
2020-03-07 17:59:24 +01:00
b5d65bf94e
Update ModelLoader.cpp
...
Apply asimp-code-style.
2020-03-07 12:22:57 +01:00
31c6f0db92
Update Mesh.h
...
Apply code style.
2020-03-07 12:19:55 +01:00
c620e9a2ac
Fixed memory leak caused by glutMainLoop() not returning.
...
Fixed memory leak by allowing glutMainLoop() to return to allow for the scene and streams to be released.
2020-03-06 13:28:05 -05:00
673a1dcea5
Merge branch 'master' into sample-simpleopengl-minor-improvements
2020-03-06 10:45:58 -05:00
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
291d86c4e0
Merge branch 'master' into raise-cmake-minimum-version-to-3.0
2020-03-06 14:18:04 +01:00
8b9abc58e7
ifdef the exporters as specifying harsher linker flags than what's in default CMake causes linking issues.
2020-03-04 17:15:09 -08:00
bb62249f0c
fix gltf2 exporter memory crash
2020-03-04 14:52:26 -08:00
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
0b227219b7
Merge branch 'master' into gltf2_broken_bones_count
2020-03-03 11:33:56 +01:00
a254690ba0
Merge branch 'master' into raise-cmake-minimum-version-to-3.0
2020-03-02 20:44:07 +01:00
920535165d
next fixed warnings
2020-03-01 13:15:45 +01:00
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
710dbba52d
Trimmed trailing whitespaces
2020-02-28 19:19:10 -08:00
496fcd35c1
Trimmed trailing whitespaces
2020-02-28 19:17:53 -08:00
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
22311883ce
Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop
2020-02-28 18:42:22 -08:00
f343d3eec2
Merge pull request #3022 from iamAdrianIusca/master
...
small improvements in the CMakeLists.txt file
2020-02-28 22:52:59 +01:00
03182c21b8
xml-migration amf - next steps.
2020-02-26 22:19:42 +01:00
440629f1d2
Merge branch 'master' into master
2020-02-26 20:27:52 +02:00
c5aa817bda
Merge branch 'master' into sample-simpleopengl-minor-improvements
2020-02-26 12:44:25 -05:00
5eca30e274
Merge pull request #3010 from jcarpent/master
...
pkg-config: fix include path
2020-02-26 18:35:46 +01:00
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
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
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
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
919ae489fc
Merge branch 'master' into master
2020-02-25 23:32:31 +02:00
100a7a7c11
Merge branch 'master' into master
2020-02-25 20:51:17 +01:00
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
e56def7585
Fix indentation.
2020-02-25 14:52:59 +11:00
ae50c4ebdf
Add support for orthographic camera information and use in glTF2 importer. Fixes #3030 .
2020-02-25 14:45:00 +11:00
fb5b01958a
Fix to read orthographic camera data. Manual merge for this branch. Fixes #3028
2020-02-25 11:03:07 +11:00
Marc-Antoine Lortie
Kim Kulling
Kim Kulling
Shawn Presser
Marc-Antoine Lortie
Sebastian Matusik
Yingying Wang
Adrian Iusca
Nikita Shubin
Paul Arden