3bf62cf6e4
Merge branch 'master' into master
2020-03-16 17:44:00 +02:00
3e78e8b5d3
Merge pull request #3063 from thomasbiang/gltf2_blendshape_export
...
Blendshape Support in Assimp Gltf2/Glb2 Exporter (positions, normals)
2020-03-16 10:24:01 +01:00
3c97447c9c
Merge branch 'master' into gltf2_blendshape_export
2020-03-13 13:26:08 +01:00
733e5343c8
export blendshape positions/normals in gltf2/glb2
2020-03-12 12:14:17 -07:00
df8511e1b0
Merge branch 'master' into master
2020-03-12 11:19:39 +02:00
afccda95f2
Merge pull request #3060 from malortie/fix-directx-in-cmakelist
...
Minor changes in CMakeLists files.
2020-03-12 00:11:49 +01:00
7485e530b4
Merge branch 'master' into fix-directx-in-cmakelist
2020-03-11 21:23:45 +01:00
b4c97f3903
Merge branch 'master' into master
2020-03-11 20:50:55 +02:00
93610a8634
Merge pull request #3034 from maquefel/cmake_fix_native_path
...
cmake: double quotes around the <path>
2020-03-11 19:47:19 +01:00
47e05470ff
Merge branch 'master' into master
2020-03-11 20:45:07 +02:00
0a5419828a
Merge branch 'master' into cmake_fix_native_path
2020-03-10 22:16:38 +01:00
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
ed62ed9e7c
Minor changes in CMakeLists files.
...
- Fixed condition preventing ASSIMP_BUILD_ASSIMP_VIEW showing up on first time
- Set ASSIMP_BUILD_ASSIMP_VIEW to off by default.
- Removed unnecessary reference to DirectX 9 library.
2020-03-10 13:47:10 -04:00
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
6e13baf89c
Merge branch 'master' into master
2020-03-09 22:23:36 +02:00
691dfe7012
fixing the conflicts
2020-03-09 22:23:18 +02:00
18cb5745bc
fixing the conflicts
2020-03-09 22:21:36 +02:00
8f41516637
Merge remote-tracking branch 'origin/master'
2020-03-09 22:19:22 +02:00
051d01e339
fixing the conflicts
2020-03-09 22:19:12 +02: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
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
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
067677595c
Merge branch 'master' into master
2020-03-05 10:29:21 +02: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
66288df49b
small change
2020-03-01 12:24:34 +02:00
ffaa3629d8
back with the emplace_back
2020-03-01 11:24:58 +02:00
ec61318443
Merge branch 'master' into master
2020-03-01 11:24:12 +02:00
0d8434ed34
fix
2020-03-01 11:23:55 +02:00
2917ab04b7
fix
2020-03-01 11:22:44 +02:00
89ca66f300
fix
2020-03-01 11:21:53 +02:00
1f4b99479d
fix
2020-03-01 11:20:55 +02:00
3bef9382bb
Merge remote-tracking branch 'origin/master'
2020-03-01 11:12:46 +02:00
Adrian Iusca
Kim Kulling
Yingying Wang
Marc-Antoine Lortie
Marc-Antoine Lortie
iamAdrianIusca
kimkulling
Shawn Presser