v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,932 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

9932 Commits (9a0b703db1667bb2f14dc110159e58609fc4eda0)

Author SHA1 Message Date
Malcolm Tyrrell 8d86bcf0fb Also check member 2021-03-15 16:32:17 +00:00
Malcolm Tyrrell 57652a9084 Version is strictly a string 2021-03-15 16:27:50 +00:00
Malcolm Tyrrell 053c0f5e0a Catch type errors in gltf and try to print out useful context. 2021-03-15 13:06:11 +00:00
jaefunk a812fd1a0a can modify the rotation of the model when exporting. 2021-03-15 10:23:17 +09:00
jaefunk 37c2d33cc9
Merge branch 'master' into export_with_rotation 2021-03-14 15:32:46 +09:00
Kim Kulling 0dbaeb57e3
Merge pull request #3697 from jaefunk/change_file_encoding 
change file encoding
 2021-03-13 19:11:06 +01:00
Kim Kulling e5417ea41f
Merge branch 'master' into change_file_encoding 2021-03-13 18:45:58 +01:00
Kim Kulling 9058692d16
Merge pull request #3691 from Paul-Austria/master 
Update crypt.c
 2021-03-13 11:35:29 +01:00
Kim Kulling f5dd8db45f
Merge branch 'master' into master 2021-03-12 16:06:22 +01:00
Kim Kulling 20350ba5cb
Merge pull request #3689 from AndyShawQt/msvc2019fix 
Compile fix for MSVC 2019
 2021-03-12 16:05:59 +01:00
Kim Kulling f5ed217409
Merge branch 'master' into msvc2019fix 2021-03-12 15:49:41 +01:00
Kim Kulling 383dfae79b
Merge pull request #3688 from gongminmin/FixClangCL 
Fix compiling issues in clang-cl
 2021-03-12 15:49:11 +01:00
Kim Kulling 84cd1d95c7
Merge branch 'master' into FixClangCL 2021-03-12 15:26:49 +01:00
Urs Hanselmann c0c7e6a0de trim uvIndices to fix import of Cheetah3D generated fbx files 2021-03-12 14:48:38 +01:00
Urs Hanselmann cc7e229c3c disable size check 2021-03-12 08:55:11 +01:00
jaefunk 16f10a0533 remove debug log 2021-03-12 10:27:33 +09:00
Kim Kulling 47d36cdb97
Merge pull request #3661 from xiaohunqupo/master 
Fix Step Expoter Error.
 2021-03-11 17:31:11 +01:00
Kim Kulling 51ad88afb6
Merge branch 'master' into master 2021-03-10 20:35:37 +01:00
Kim Kulling cdd0fea6e8
Merge pull request #3694 from assimp/issue_3678 
closes https://github.com/assimp/assimp/issues/3678: ensure lowercase
 2021-03-10 20:35:16 +01:00
Kim Kulling 806b12dc8b
Merge branch 'master' into issue_3678 2021-03-10 19:51:04 +01:00
Kim Kulling 520f64eeec Fix missing trimming 2021-03-10 19:40:35 +01:00
Kim Kulling 732e9386aa
Merge branch 'master' into master 2021-03-10 11:49:13 +01:00
jaefunk 5c11ca6c8a
Merge branch 'master' into export_with_rotation 2021-03-10 18:25:09 +09:00
ethan b6dced4b11 export with rotation 2021-03-10 18:06:42 +09:00
Kim Kulling 6c89631581 closes https://github.com/assimp/assimp/issues/3678: ensure lowercase 2021-03-09 21:08:28 +01:00
Kim Kulling ed968367d5
Merge pull request #3687 from contriteobserver/NameManglingFix 
applied extern "C" guards to importerdesc.h
 2021-03-09 18:26:22 +01:00
jaefunk e53335e58c change file encoding 2021-03-09 18:31:15 +09:00
Kim Kulling 8a89ffa7a5
Merge branch 'master' into NameManglingFix 2021-03-09 00:01:23 +01:00
Matthew Wallace 0ebab47ca2 updated MIN_IOS_VERSION to 10.0 2021-03-08 07:11:39 -06:00
Paul Engelhardt dffaeade94
Update crypt.c 2021-03-08 09:04:22 +01:00
Kim Kulling 75144dd7fd
Merge pull request #3667 from thomasbiang/sparse_minmax 
Export Min/Max for Sparse Accessor
 2021-03-04 21:42:10 +01:00
Andy Shaw 2576c8c3a6 Compile fix for MSVC 2019 
Small is seen as a type with some options so this fixes the errors starting with:

code\PostProcessing\ComputeUVMappingProcess.cpp(125): error C2632: 'int' followed by 'char' is illegal
 2021-03-04 08:04:19 +01:00
Minmin Gong c6c0f141f1 Fix compiling issues in clang-cl 2021-03-03 22:30:36 -08:00
contriteobserver fc955a5f8a applied extern "C" guards to importerdesc.h 
addresses #3685
 2021-03-03 12:23:26 -08:00
Kim Kulling ff769ecce2
Merge branch 'master' into sparse_minmax 2021-03-02 12:30:01 +01:00
Kim Kulling e09e4ab670
Merge pull request #3683 from contriteobserver/PrecisionFix 
workaround for ASSIMP_DOUBLE_PRECISION compile errors
 2021-03-02 12:29:08 +01:00
Kim Kulling 75210576cf
Merge branch 'master' into sparse_minmax 2021-03-01 21:34:24 +01:00
contriteobserver 6ab2e8d558 simplified the getRealAttribute implementation 2021-02-28 15:13:01 -08:00
contriteobserver 111752cff0 workaround for ASSIMP_DOUBLE_PRECISION compile errors 
changed float types to ai_real types as needed

addresses issue #3682
 2021-02-28 14:45:39 -08:00
Kim Kulling 315362862a
Merge pull request #3660 from ademets/android_jniiosystem_cmake_patch 
CMake fix for Android build with enabled JNI io system
 2021-02-28 17:10:56 +01:00
Kim Kulling 20ef096db6
Merge branch 'master' into android_jniiosystem_cmake_patch 2021-02-28 13:33:02 +01:00
Kim Kulling ff057dbcb2
Merge pull request #3681 from assimp/update_copyrights 
Update copyrights to 2021.
 2021-02-28 13:32:49 +01:00
Kim Kulling c669c8f1eb
Merge branch 'master' into update_copyrights 2021-02-28 12:18:41 +01:00
Kim Kulling 9e8dbd0ca5 Update copyrights to 2021. 2021-02-28 12:17:54 +01:00
Kim Kulling 9336341eac
Merge pull request #3680 from assimp/kimkulling-draco_disabled 
Workaround for VS2019
 2021-02-27 11:05:54 +01:00
Kim Kulling 21c2f8bc9c
Workaround for VS2019 
- DRACO is disabled as the default
- Use ASSIMP_BUILD_DRACO=ON to reenable it
- Workaround for https://github.com/assimp/assimp/issues/3663
 2021-02-27 10:01:09 +01:00
Kim Kulling 143d134cd7
Merge branch 'master' into android_jniiosystem_cmake_patch 2021-02-26 08:34:23 +01:00
Kim Kulling 05ee5432f6
Merge pull request #3670 from ms-maxvollmer/user/mavollme/GLTF2_CheckNormalCount 
Check that normal count and tangent count match vertex count.
 2021-02-25 22:18:07 +01:00
Kim Kulling 5b78e3fb5d
Merge branch 'master' into user/mavollme/GLTF2_CheckNormalCount 2021-02-25 21:29:03 +01:00
Kim Kulling 861829a04b
Merge pull request #3674 from assimp/kimkulling-issue_3664 
Remove buggy assert
 2021-02-25 14:21:12 +01:00