Commit Graph

  • 976091a6f6 ix compiler warning for pragma statements. Kim Kulling 2020-03-15 11:47:05 +01:00
  • 9e91a33d76 fix review findings. Kim Kulling 2020-03-15 10:28:37 +01:00
  • 8b6f95ec30 Obj: apply clang format. Kim Kulling 2020-03-15 10:21:08 +01:00
  • 4210318a34 Merge branch 'master' into enable_vs_warning_all Kim Kulling 2020-03-15 10:19:49 +01:00
  • 0357333c81 fix all unittests. Kim Kulling 2020-03-15 10:17:54 +01:00
  • 255758e6ff fix read for precision-depending data. kimkulling 2020-03-14 11:16:44 +01:00
  • dc04759492 fix unittests part 2. kimkulling 2020-03-13 17:00:14 +01:00
  • 3c97447c9c Merge branch 'master' into gltf2_blendshape_export Kim Kulling 2020-03-13 13:26:08 +01:00
  • 3eba67dca3 Merge branch 'master' into cmake_targets_determine_lib_path Kim Kulling 2020-03-12 20:24:12 +01:00
  • 733e5343c8 export blendshape positions/normals in gltf2/glb2 Yingying Wang 2020-03-12 12:14:17 -07:00
  • b295fda22c fix unittests part 1. kimkulling 2020-03-12 17:38:42 +01:00
  • ec69e2bf59 Added unit test for recursive references in GLTF2 file Max Vollmer 2020-03-11 15:32:28 +00:00
  • a4bbd9b936 Added two unit tests for cases where Assimp returned a scene that didn't have a root node: Max Vollmer 2020-03-11 15:56:54 +00:00
  • afccda95f2 Merge pull request #3060 from malortie/fix-directx-in-cmakelist Kim Kulling 2020-03-12 00:11:49 +01:00
  • 7485e530b4 Merge branch 'master' into fix-directx-in-cmakelist Kim Kulling 2020-03-11 21:23:45 +01:00
  • 93610a8634 Merge pull request #3034 from maquefel/cmake_fix_native_path Kim Kulling 2020-03-11 19:47:19 +01:00
  • bb4eab3ff2 Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all kimkulling 2020-03-11 17:42:28 +01:00
  • 19b40397a9 fix misor findings. kimkulling 2020-03-11 17:42:10 +01:00
  • b4344cc7cf Update CMakeLists.txt Kim Kulling 2020-03-11 16:51:12 +01:00
  • 3f75ef68ae Assimp guarantees in its docs that mRootNode is never NULL. Max Vollmer 2020-03-11 09:30:04 +00:00
  • ad278055ae Added test file and test case for ASCII FBX files with invalid (out of bounds) float values Max Vollmer 2020-03-11 12:46:13 +00:00
  • 1bc7c710d6 Added a check to detect and prevent recursive references in GLTF2 files Max Vollmer 2020-03-11 09:54:24 +00:00
  • 84e060a816 Change: ExtractData throws exception instead of returning false if data is invalid. Max Vollmer 2020-03-11 09:40:42 +00:00
  • 69551e81ed Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all kimkulling 2020-03-11 10:15:25 +01:00
  • f8757322be fix warnings kkulling 2020-03-11 09:43:55 +01:00
  • 7e7555a91b fix compiler warnings in tools and test- Kim Kulling 2020-03-11 00:43:44 +01:00
  • 0a5419828a Merge branch 'master' into cmake_fix_native_path Kim Kulling 2020-03-10 22:16:38 +01:00
  • 7e23773776 Merge pull request #3055 from malortie/fix-simpletextureddirectx11-sample2 Kim Kulling 2020-03-10 22:16:01 +01:00
  • ed62ed9e7c Minor changes in CMakeLists files. Marc-Antoine Lortie 2020-03-10 13:47:10 -04:00
  • 0904e4880b Merge branch 'master' into fix-simpletextureddirectx11-sample2 Marc-Antoine Lortie 2020-03-10 12:04:54 -04:00
  • af59010583 Merge branch 'master' into cmake_fix_native_path Kim Kulling 2020-03-10 16:29:44 +01:00
  • 22ca2efa8f Merge pull request #3033 from malortie/raise-cmake-minimum-version-to-3.0 Kim Kulling 2020-03-10 16:29:13 +01:00
  • 1c6077aa4f Merge branch 'master' into raise-cmake-minimum-version-to-3.0 Kim Kulling 2020-03-10 13:16:33 +01:00
  • 02e5698a38 fix linker issues. Kim Kulling 2020-03-09 22:49:32 +01:00
  • c7628d0f92 Merge pull request #3058 from assimp/fix_zip_issue Kim Kulling 2020-03-09 13:47:45 +01:00
  • 9fae5fdabb Merge branch 'master' into fix_zip_issue Kim Kulling 2020-03-09 10:57:04 +01:00
  • f3b6b78d4d small refactorings. kimkulling 2020-03-09 10:55:32 +01:00
  • bb3db0ebaf closes https://github.com/assimp/assimp/issues/2954: upgrade to latest greatest. kimkulling 2020-03-09 10:51:26 +01:00
  • 7b1187a917 Merge pull request #3057 from shawwn/2020-03-09/fix Kim Kulling 2020-03-09 10:15:03 +01:00
  • f305f10551 Only try to initialize members whose name starts with 'm' followed by an uppercase character Shawn Presser 2020-03-09 00:05:17 -07:00
  • e8d2b84017 clean all warnings for vs-2019 Kim Kulling 2020-03-08 21:24:01 +01:00
  • 5866f3f98f Merge branch 'master' into fix-simpletextureddirectx11-sample2 Kim Kulling 2020-03-08 18:48:26 +01:00
  • 339f9387a7 Merge pull request #3056 from malortie/fix-matrix3x3-comparison-operators Kim Kulling 2020-03-08 18:47:11 +01:00
  • 424f5e939f Fixed wrong matrix type used in comparaison operators. Marc-Antoine Lortie 2020-03-08 12:18:09 -04:00
  • dda083fa7b Added missing std namespace prefix to std types. Marc-Antoine Lortie 2020-03-08 10:50:18 -04:00
  • a3ff03f193 Merge branch 'master' into raise-cmake-minimum-version-to-3.0 Kim Kulling 2020-03-08 09:06:09 +01:00
  • 1e2c3c9c01 Merge pull request #3053 from malortie/fix-simpledirectx11-sample Kim Kulling 2020-03-07 17:59:24 +01:00
  • b5d65bf94e Update ModelLoader.cpp Kim Kulling 2020-03-07 12:22:57 +01:00
  • 31c6f0db92 Update Mesh.h Kim Kulling 2020-03-07 12:19:55 +01:00
  • c620e9a2ac Fixed memory leak caused by glutMainLoop() not returning. Marc-Antoine Lortie 2020-03-06 13:28:05 -05:00
  • 673a1dcea5 Merge branch 'master' into sample-simpleopengl-minor-improvements Marc-Antoine Lortie 2020-03-06 10:45:58 -05:00
  • aa8a6122ce Fixed SimpleTexturedDirectX11 sample. Marc-Antoine Lortie 2020-03-06 10:26:51 -05:00
  • 291d86c4e0 Merge branch 'master' into raise-cmake-minimum-version-to-3.0 Kim Kulling 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. Sebastian Matusik 2020-03-04 17:15:09 -08:00
  • bb62249f0c fix gltf2 exporter memory crash Yingying Wang 2020-03-04 14:52:26 -08:00
  • 0201fc57dc Merge pull request #3039 from Nimer-88/gltf2_broken_bones_count Kim Kulling 2020-03-04 23:10:32 +01:00
  • 0b227219b7 Merge branch 'master' into gltf2_broken_bones_count Kim Kulling 2020-03-03 11:33:56 +01:00
  • a254690ba0 Merge branch 'master' into raise-cmake-minimum-version-to-3.0 Kim Kulling 2020-03-02 20:44:07 +01:00
  • 920535165d next fixed warnings Kim Kulling 2020-03-01 13:15:45 +01:00
  • 772774495c Merge pull request #3040 from Nimer-88/split_by_bone_count_infinite_loop Kim Kulling 2020-02-29 20:19:43 +01:00
  • 710dbba52d Trimmed trailing whitespaces Sebastian Matusik 2020-02-28 19:19:10 -08:00
  • 496fcd35c1 Trimmed trailing whitespaces Sebastian Matusik 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 Sebastian Matusik 2020-02-28 18:41:29 -08:00
  • 22311883ce Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop Sebastian Matusik 2020-02-28 18:39:40 -08:00
  • f343d3eec2 Merge pull request #3022 from iamAdrianIusca/master Kim Kulling 2020-02-28 22:52:59 +01:00
  • 03182c21b8 xml-migration amf - next steps. Kim Kulling 2020-02-26 22:19:42 +01:00
  • 440629f1d2 Merge branch 'master' into master Adrian Iusca 2020-02-26 20:27:52 +02:00
  • c5aa817bda Merge branch 'master' into sample-simpleopengl-minor-improvements Marc-Antoine Lortie 2020-02-26 12:44:25 -05:00
  • 5eca30e274 Merge pull request #3010 from jcarpent/master Kim Kulling 2020-02-26 18:35:46 +01:00
  • ed5aab9495 Fixed and changed a few things. Marc-Antoine Lortie 2020-02-26 12:19:06 -05:00
  • 3c081f5f70 [RFC] cmake: targets: check lib or lib64 path Nikita Shubin 2020-02-26 17:06:22 +03:00
  • 4182d6fb60 cmake: double quotes around the <path> Nikita Shubin 2020-02-26 16:24:34 +03:00
  • 957abaa15a Raised minimum CMake version to 3.0 for assimp_cmd and assimp_view. Marc-Antoine Lortie 2020-02-26 08:00:49 -05:00
  • 919ae489fc Merge branch 'master' into master Adrian Iusca 2020-02-25 23:32:31 +02:00
  • 100a7a7c11 Merge branch 'master' into master Kim Kulling 2020-02-25 20:51:17 +01:00
  • c5aa7cceee Merge pull request #3024 from malortie/remove-else-endif-constructs-cmake-files Kim Kulling 2020-02-25 20:44:10 +01:00
  • e56def7585 Fix indentation. Paul Arden 2020-02-25 14:52:59 +11:00
  • ae50c4ebdf Add support for orthographic camera information and use in glTF2 importer. Fixes #3030. Paul Arden 2020-02-25 14:45:00 +11:00
  • fb5b01958a Fix to read orthographic camera data. Manual merge for this branch. Fixes #3028 Paul Arden 2020-02-25 11:03:07 +11:00
  • be391a3b66 Merge pull request #13 from assimp/master ardenpm 2020-02-25 10:39:49 +11:00
  • e4b2fd246d Merge branch 'master' into remove-else-endif-constructs-cmake-files Kim Kulling 2020-02-24 20:08:17 +01:00
  • 28f4b95ff5 Merge branch 'master' into master Adrian Iusca 2020-02-24 21:05:51 +02:00
  • 824a412239 Merge pull request #3009 from inhosens/master Kim Kulling 2020-02-24 20:05:19 +01:00
  • edfaaed56f Removed uneeded expression in else() and endif() constructs. Marc-Antoine Lortie 2020-02-23 07:09:35 -05:00
  • 55e9171e1f Merge branch 'master' into master Kim Kulling 2020-02-22 21:13:33 +01:00
  • 344170469c Merge branch 'master' into master Adrian Iusca 2020-02-22 22:04:48 +02:00
  • 55eb89d476 Merge pull request #3013 from malortie/common-directory-for-compiled-binaries Kim Kulling 2020-02-22 21:01:56 +01:00
  • 2d382c5e76 Merge branch 'master' into common-directory-for-compiled-binaries Kim Kulling 2020-02-22 09:05:28 +01:00
  • f3c89b0bd7 Merge branch 'master' into master Adrian Iusca 2020-02-21 20:23:42 +02:00
  • 4e414eb4ef Merge remote-tracking branch 'origin/master' iamAdrianIusca 2020-02-21 20:17:49 +02:00
  • f28b087d16 small improvements in the CMakeLists.txt file iamAdrianIusca 2020-02-21 20:17:38 +02:00
  • 3f5136b7b2 Merge branch 'master' into master Kim Kulling 2020-02-19 21:52:57 +01:00
  • 848922feae Merge pull request #3014 from iamAdrianIusca/master Kim Kulling 2020-02-19 21:47:33 +01:00
  • 93d1586f44 Merge branch 'master' into master Adrian Iusca 2020-02-19 21:31:24 +02:00
  • bc3ed5f702 Merge pull request #3021 from malortie/fix-simpletexturedopengl-memory-leaks Kim Kulling 2020-02-19 20:13:02 +01:00
  • 4d27fccd0b Fixed memory leaks in SimpleTexturedOpenGL sample. Marc-Antoine Lortie 2020-02-19 13:17:45 -05:00
  • 93de396373 Merge branch 'master' into master Adrian Iusca 2020-02-19 16:03:33 +02:00
  • 8639bbabc7 Merge pull request #3020 from assimp/kimkulling-clangformat Kim Kulling 2020-02-19 12:35:09 +01:00
  • 8d6d8e2e38 Update .clang-format Kim Kulling 2020-02-19 10:42:30 +01:00
  • 4de0237167 small fix iamAdrianIusca 2020-02-18 21:55:35 +02:00