Kim Kulling
f68c60c7c6
Update StepReaderGen.h
...
disable warning
2020-03-17 20:32:23 +01:00
Kim Kulling
a2fa19aa78
Merge branch 'master' into enable_vs_warning_all
2020-03-17 19:19:29 +01:00
kimkulling
a9e8f65941
fix the build - add misisng forward declaration for aiVector3t.
2020-03-16 10:50:07 +01:00
Kim Kulling
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
Kim Kulling
27c125ef4d
Add 2013-spcific compiler warning disabling statements.
2020-03-15 18:22:49 +01:00
Kim Kulling
856ca9f2dd
Fix static-code findings,
2020-03-15 12:16:17 +01:00
Kim Kulling
976091a6f6
ix compiler warning for pragma statements.
2020-03-15 11:47:05 +01:00
Kim Kulling
9e91a33d76
fix review findings.
2020-03-15 10:28:37 +01:00
Kim Kulling
8b6f95ec30
Obj: apply clang format.
2020-03-15 10:21:08 +01:00
Kim Kulling
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
Kim Kulling
0357333c81
fix all unittests.
2020-03-15 10:17:54 +01:00
kimkulling
255758e6ff
fix read for precision-depending data.
2020-03-14 11:16:44 +01:00
kimkulling
dc04759492
fix unittests part 2.
2020-03-13 17:00:14 +01:00
Kim Kulling
3c97447c9c
Merge branch 'master' into gltf2_blendshape_export
2020-03-13 13:26:08 +01:00
Yingying Wang
733e5343c8
export blendshape positions/normals in gltf2/glb2
2020-03-12 12:14:17 -07:00
kimkulling
b295fda22c
fix unittests part 1.
2020-03-12 17:38:42 +01:00
Kim Kulling
afccda95f2
Merge pull request #3060 from malortie/fix-directx-in-cmakelist
...
Minor changes in CMakeLists files.
2020-03-12 00:11:49 +01:00
Kim Kulling
7485e530b4
Merge branch 'master' into fix-directx-in-cmakelist
2020-03-11 21:23:45 +01:00
Kim Kulling
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
kimkulling
bb4eab3ff2
Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all
2020-03-11 17:42:28 +01:00
kimkulling
19b40397a9
fix misor findings.
2020-03-11 17:42:10 +01:00
Kim Kulling
b4344cc7cf
Update CMakeLists.txt
...
Remove empty option.
2020-03-11 16:51:12 +01:00
kimkulling
69551e81ed
Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all
2020-03-11 10:15:25 +01:00
kkulling
f8757322be
fix warnings
2020-03-11 09:43:55 +01:00
Kim Kulling
7e7555a91b
fix compiler warnings in tools and test-
2020-03-11 00:43:44 +01:00
Kim Kulling
0a5419828a
Merge branch 'master' into cmake_fix_native_path
2020-03-10 22:16:38 +01: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
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
Marc-Antoine Lortie
0904e4880b
Merge branch 'master' into fix-simpletextureddirectx11-sample2
2020-03-10 12:04:54 -04:00
Kim Kulling
af59010583
Merge branch 'master' into cmake_fix_native_path
2020-03-10 16:29:44 +01: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
02e5698a38
fix linker issues.
2020-03-09 22:49:32 +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
e8d2b84017
clean all warnings for vs-2019
2020-03-08 21:24:01 +01: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