Commit Graph

11098 Commits (936cc791f2cd7b4f88dda36d8b6365277a9e718d)

Author SHA1 Message Date
kimkulling 76e10b96fc Fix missing members and do some small refactorings. 2022-03-09 10:51:37 +01:00
Terence Russell b35879989c Added missing ObjMaterial.h to CMakeLists 2022-03-08 20:00:22 -07:00
Kim Kulling 40d896ccc1
Merge pull request #4403 from JaroslavPribyl/fix/obj_with_bspline_crash
Fix parsing OBJ with free-form curve/surface body statements
2022-03-07 21:39:38 +01:00
Kim Kulling ba379c20e1
Merge branch 'master' into fix/obj_with_bspline_crash 2022-03-06 17:39:57 +01:00
Kim Kulling 92b5c284ce
Merge pull request #4203 from RichardTea/deprecated_gltfpbr_macros
Reinstate a deprecated gltfpbr macro: AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS
2022-03-06 17:39:35 +01:00
Kim Kulling 9ca9254445
Merge branch 'master' into deprecated_gltfpbr_macros 2022-03-06 11:15:49 +01:00
Kim Kulling 7eb5fd0e4e
Merge pull request #4427 from assimp/smartday-master
Smartday master
2022-03-05 23:00:21 +01:00
Kim Kulling 80a8807c47 Fix compiler warnings 2022-03-05 20:37:34 +01:00
Kim Kulling d4527d4e87
Merge branch 'master' into master 2022-03-05 14:00:32 +01:00
Sergio Acereda a2543e7151 Add properties information on assimp info command line 2022-03-04 17:09:29 +01:00
Sergio Acereda a1e03e3481 clang-format 2022-03-04 14:31:06 +01:00
Sergio Acereda cfe84b9260 Use generic METALNESS and DIFFUSE_ROUGHNESS texture types 2022-03-03 16:18:25 +01:00
Sergio Acereda 52008ec989 Apply clang-format 2022-03-03 15:42:23 +01:00
youkeyao 9b227fc262 Fix getting anisotropy in obj 2022-03-03 01:01:34 +08:00
RichardTea 8a6a1fc2df Update AI_TEXTURE_TYPE_MAX
Must be equal to the largest aiTextureType_XXX enum
2022-03-01 12:12:07 +00:00
RichardTea d704824be3 Merge branch 'master' into deprecated_gltfpbr_macros 2022-03-01 10:01:43 +00:00
Kim Kulling bbcefbd034
Merge pull request #4417 from rbsheth/rbsheth_fix_hunter
Update version of Hunter to v0.24.0 that supports VS 2022
2022-02-28 23:48:19 +01:00
Jaroslav Pribyl 62930076af
Merge branch 'master' into fix/obj_with_bspline_crash 2022-02-26 04:03:59 +01:00
Rahul Sheth e368a69824
Merge branch 'master' into rbsheth_fix_hunter 2022-02-25 14:58:07 -06:00
Kim Kulling 3957fbba8b
Merge pull request #4416 from SolaToucher/master
Optimize the problem of excessive memory allocation in FBX import
2022-02-25 21:03:47 +01:00
Rahul Sheth 8e59287b94 Update version of Hunter to v0.24.0 that supports VS 2022 2022-02-25 13:52:18 -06:00
sola c73ff82fc4 FBXConvert::ConvertMeshMultiMaterial: allocate memory using variable count_vertices 2022-02-25 19:58:44 +08:00
Kim Kulling 04858c5d89
Merge pull request #4409 from TerenceRussell/master
Expose the original OBJ "illum" value
2022-02-25 00:06:12 +01:00
Kim Kulling 94178df61b
Merge branch 'master' into master 2022-02-24 19:31:31 +01:00
Kim Kulling 1b2f705ee4
Merge pull request #4415 from assimp/kimkulling/fix_negative_offset_in_hast_access-issue4414
Fix possible negative array access
2022-02-24 17:20:03 +01:00
Kim Kulling 0dc24ab3a7
Fix declaration of offset 2022-02-24 17:04:39 +01:00
Kim Kulling cf96639119
Fix possible negative array access
- Return when the calculated offset gets negative
- closes https://github.com/assimp/assimp/issues/4414
2022-02-24 16:49:35 +01:00
Kim Kulling 72da1e6d7b
Merge branch 'master' into master 2022-02-23 21:20:39 +01:00
Kim Kulling e3001f1eb7
Merge pull request #4408 from assimp/kimkulling/fix_ordering_of_gltf2_issue4407
Fix ordering of member initialization
2022-02-23 21:19:33 +01:00
Kim Kulling 6f31254ae1 Ensure dictionary for LazyDics is created before adding content to it 2022-02-23 20:57:15 +01:00
Terence Russell 3a09d19374
Merge branch 'master' into master 2022-02-22 18:43:11 -07:00
Terence Russell 4ddacdb5df Expose the original OBJ illum model as a material property. 2022-02-22 17:55:41 -07:00
Kim Kulling 466b34cf53
Merge branch 'master' into kimkulling/fix_ordering_of_gltf2_issue4407 2022-02-22 21:09:11 +01:00
Kim Kulling aa04ee89f1 Fix init order to fix build 2022-02-22 21:07:42 +01:00
Kim Kulling a6808b868c Small code cleanup 2022-02-22 21:07:23 +01:00
Jaroslav Přibyl 480d6fee2a cleanup 2022-02-22 01:46:47 +01:00
Jaroslav Přibyl 62c9347985 fixed obj parsing with cstype 2022-02-22 01:32:41 +01:00
Kim Kulling ba785910d1
Merge pull request #4402 from assimp/kimkulling/warn_when_viewer_shall_be_build_on_non_win32
Show warning when assimp_viewer cannot be build on target platform
2022-02-21 15:39:11 +01:00
Kim Kulling caaeef2b56
Update CMakeLists.txt
- Show a cmake-warning if assimp_view shall be build for linux / mac
2022-02-21 15:17:23 +01:00
Kim Kulling a34688230d
Merge pull request #4393 from TerenceRussell/master
Added support for "map_Bump -bm"
2022-02-20 20:14:21 +01:00
Kim Kulling 52b106bf7e
Merge branch 'master' into master 2022-02-20 19:04:32 +01:00
Kim Kulling eed5570c39
Merge pull request #4399 from assimp/kimkulling/fix_typo_in_cmake
Update CMakeLists.txt
2022-02-20 18:45:06 +01:00
Kim Kulling 3e7294feeb
Merge branch 'master' into kimkulling/fix_typo_in_cmake 2022-02-20 15:33:54 +01:00
Kim Kulling 2c33ed1087
Merge pull request #4397 from youkeyao/issue_3191
update the calculation and orthogonalization for bitangent
2022-02-20 15:32:41 +01:00
Kim Kulling b625961197
Merge branch 'master' into issue_3191 2022-02-20 15:14:46 +01:00
Kim Kulling 03f44cd983
Merge branch 'master' into kimkulling/fix_typo_in_cmake 2022-02-20 14:17:27 +01:00
Kim Kulling 5c53726c8e
Merge pull request #4394 from BA7LYA/master
udpate build script to fit "Visual Studio 16 2019" Generator
2022-02-20 14:07:49 +01:00
Kim Kulling 96522bc114
Update CMakeLists.txt 2022-02-20 14:06:11 +01:00
Kim Kulling b825740df7
Merge branch 'master' into master 2022-02-20 12:53:26 +01:00
Kim Kulling f952100dbb
Merge pull request #4398 from assimp/kimkulling-patch-1
Fix stat for 32-biut linuxes
2022-02-20 12:19:06 +01:00