Commit Graph

8909 Commits (ae05dbb2527da54e791e3a115975c3d06504093d)

Author SHA1 Message Date
Victor Mataré 9fb81c3be6 use GNUInstallDirs where possible
Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and
disable redefining FHS-mandated install locations via user-editable
ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary,
Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables.
2020-04-03 00:44:44 +02:00
Marc-Antoine Lortie 895675535a Fixed /W4 compile warnings in sample SimpleTexturedOpenGL. 2020-04-02 15:28:06 -04:00
Kim Kulling 6b68c0ee45
Merge pull request #3124 from malortie/fix-sample-simpleogl-w4-compile-warnings
Fixed /W4 compile warnings in sample SimpleOpenGL.
2020-04-02 21:02:14 +02:00
Marc-Antoine Lortie c0273a2bb4
Merge branch 'master' into fix-sample-simpleogl-w4-compile-warnings 2020-04-02 14:43:24 -04:00
Kim Kulling 210f40e984
Merge pull request #3113 from thomasbiang/assimp_gltf2_exporter
Fix gltf2 exporter memory crash
2020-04-02 20:39:59 +02:00
Marc-Antoine Lortie 56e2f2e37e Fixed /W4 compile warnings in sample SimpleOpenGL. 2020-04-02 14:19:16 -04:00
Max Vollmer (Microsoft Havok) 9511976485
Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-02 08:08:13 +01:00
Max Vollmer (Microsoft Havok) e61cb1794f
Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-02 08:08:08 +01:00
Kim Kulling c21a1ffffa
Remove comments to increase readability 2020-04-01 11:16:39 +02:00
Ville Ruusutie 750bd93eb3
Merge branch 'master' into optimized_bonelimits 2020-04-01 11:04:54 +03:00
György Straub 5205c4a422
Merge branch 'master' into master 2020-04-01 08:02:34 +01:00
Kim Kulling a7208b02e0
Merge branch 'master' into assimp_gltf2_exporter 2020-04-01 08:42:48 +02:00
Kim Kulling bfedc05045
Merge pull request #3117 from malortie/remove-unneeded-headers
Removed unneeded SceneDiffer.h includes.
2020-04-01 08:35:40 +02:00
Marc-Antoine Lortie 06e40b9820 Removed unneeded SceneDiffer.h includes. 2020-03-31 17:22:56 -04:00
Alexey Medvedev 53990ffa42 Check for existed bone 2020-03-31 14:18:51 -07:00
Kim Kulling 8bd8a3ced3
Merge branch 'master' into kimkulling_dev 2020-03-31 22:03:27 +02:00
Kim Kulling c31e49198a closes https://github.com/assimp/assimp/issues/3103: always enable warnings as errors . 2020-03-31 22:01:04 +02:00
Kim Kulling 0af06d3f0c
Merge pull request #3114 from assimp/kimkulling-patch-5
Fix funding
2020-03-31 20:17:56 +02:00
Kim Kulling 323686f878
Fix funding 2020-03-31 19:59:02 +02:00
Kim Kulling 17d8aa008e
Merge pull request #3112 from assimp/issue_3104
closes https://github.com/assimp/assimp/pull/3104:
2020-03-31 19:46:24 +02:00
Kim Kulling f5324e23ef closes https://github.com/assimp/assimp/pull/3104: remove unused includes. 2020-03-31 19:35:19 +02:00
György Straub 773107b015
Merge branch 'master' into master 2020-03-31 14:09:13 +01:00
Ville Ruusutie f072d26c35
Merge branch 'master' into optimized_bonelimits 2020-03-31 15:02:52 +03:00
Kim Kulling a691e8cd3e
Disable terragen test. 2020-03-31 13:49:59 +02:00
Kim Kulling bc3de4079a
Disable terragen test. 2020-03-31 13:49:22 +02:00
György Straub 87e2d3a54d Added support for glTF2 sparse accessors.
Refactored Accessors, pulling out reusable bits between those
and sparse accessors' indices / values.
2020-03-31 11:28:26 +01:00
Max Vollmer (Microsoft Havok) 54419eb9a0
Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-03-31 09:54:12 +01:00
Max Vollmer (Microsoft Havok) 806d81c919
Merge branch 'master' into GLTF2_recursive_references_fix 2020-03-31 09:54:01 +01:00
Kim Kulling 51438bff87
Merge branch 'master' into cmake_targets_determine_lib_path 2020-03-31 10:31:31 +02:00
Alexey Medvedev 3ef46b0edd Weights and bones count checks 2020-03-30 16:56:33 -07:00
Kim Kulling e445eba674 Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev 2020-03-30 21:53:46 +02:00
Kim Kulling 7f63a4b0d7 add terragen importer unittest. 2020-03-30 21:53:25 +02:00
Kim Kulling a57edf2e99
Merge branch 'master' into kimkulling_dev 2020-03-30 21:52:12 +02:00
Kim Kulling 0d9bccbcca
Merge pull request #3098 from assimp/kimkulling-patch-5
add windows build
2020-03-30 21:51:51 +02:00
Alexey Medvedev 5e93b9ea8b Fixed bone splitting with excessive amount of bones with 0 weight 2020-03-30 12:42:32 -07:00
Kim Kulling bb046a3f80
fix typo 2020-03-30 21:41:03 +02:00
Kim Kulling c2cbac979e
Select releyase config 2020-03-30 21:10:23 +02:00
Kim Kulling 6bae5e2a40
Fix unittest execution 2020-03-30 20:44:16 +02:00
Kim Kulling 6973aea6da fix compiler warnings. 2020-03-30 20:41:39 +02:00
Kim Kulling 4c177ad72e fix possible warnings 2020-03-30 20:33:43 +02:00
RichardTea d276044ad3 Merge remote-tracking branch 'upstream/master' 2020-03-30 13:38:54 +01:00
Ville Ruusutie 419b0a1ddc
Merge branch 'master' into optimized_bonelimits 2020-03-29 21:48:38 +03:00
Kim Kulling 22d6b761e6
Merge branch 'master' into kimkulling_dev 2020-03-29 18:42:43 +02:00
Kim Kulling cdc580b947
add windows build 2020-03-29 18:39:55 +02:00
Kim Kulling b6b3b39bb3
Merge pull request #3096 from assimp/kimkulling-patch-3
Add mac
2020-03-29 18:36:26 +02:00
Kim Kulling 5bc2e84c90
Add mac 2020-03-29 17:55:28 +02:00
Kim Kulling d51b89f3ce
trigger build 2020-03-29 13:44:14 +02:00
Kim Kulling b1165cff28
Merge branch 'master' into kimkulling_dev 2020-03-29 12:07:20 +02:00
Ville Ruusutie 222b145307
Merge branch 'master' into optimized_bonelimits 2020-03-29 12:54:07 +03:00
Kim Kulling 4796ad3d5e
Merge pull request #3086 from napina/fbx_rotation_fix
Fixed FBX simple anim pre/post rotation handling
2020-03-29 10:55:55 +02:00