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

10972 Commits (a2543e715127b7bb94255fd06597dd92d6b26a7e)

Author SHA1 Message Date
Kim Kulling 72bc41b50f
Merge branch 'master' into fix/xcode-compile-20201018 2020-10-28 22:00:08 +01:00
Kim Kulling 18471a39ca
Merge pull request #3460 from MalcolmTyrrell/readFbxWeightsInConfig 
AI_CONFIG_IMPORT_FBX_READ_WEIGHTS
 2020-10-28 21:59:39 +01:00
Kim Kulling 8c135f779e
Merge branch 'master' into readFbxWeightsInConfig 2020-10-28 20:38:29 +01:00
Kim Kulling 3fd95aff4e
Merge branch 'master' into fix/3365 2020-10-27 17:43:28 +01:00
Kim Kulling f0a0b5c85e
Merge pull request #3471 from MomoDeve/patch-1 
MSVC crash while importing fbx model workaround
 2020-10-27 17:42:56 +01:00
Kim Kulling df768bdd99
Merge branch 'master' into patch-1 2020-10-27 16:20:33 +01:00
Kim Kulling 753503ad83
Merge pull request #3478 from assimp/new_openddl 
openddl: latest greatest.
 2020-10-27 10:03:50 +01:00
Kim Kulling 43f7224d0c
Update CMakeLists.txt 2020-10-27 09:46:31 +01:00
Kim Kulling 22ad7028f0
Delete CMakeLists.txt 2020-10-27 09:42:46 +01:00
Kim Kulling 4bba338d92
Update CMakeLists.txt 2020-10-27 09:23:20 +01:00
Kim Kulling 7e1a8f09c5 more openddl-fixes 2020-10-26 21:35:44 +01:00
Kim Kulling aee2e9a87d
Merge branch 'master' into patch-1 2020-10-25 20:35:06 +01:00
Kim Kulling 57e691e28e openddl: latest greatest. 2020-10-25 10:34:43 +01:00
Kim Kulling 55feb0cb78
Merge branch 'master' into fix/xcode-compile-20201018 2020-10-23 22:06:49 +02:00
Kim Kulling 831af12974
Merge pull request #3476 from ms-maxvollmer/gltf_crash_fixes 
Fixes for crashes in GLTF2 Importer
 2020-10-23 16:31:10 +02:00
Max Vollmer 4006bb71f4 Fixes for crashes in GLTF2 Importer 2020-10-23 12:01:43 +01:00
John Mai cea54d1ac5
Merge branch 'master' into fix/xcode-compile-20201018 2020-10-23 14:06:25 +08:00
Kim Kulling 6ee5e248ee
Fix typo 2020-10-22 22:26:29 +02:00
Kim Kulling 8d7e5db98c
Fix typo. 2020-10-22 22:26:03 +02:00
Kim Kulling a5a331847b
Merge pull request #3412 from MalcolmTyrrell/fbxReportAssetIssuesProperly 
Fbx report asset issues properly
 2020-10-22 22:24:44 +02:00
#Momo b168d8f441
replaced data with taking address of first element 
oops, seems like `data()` returns `char*` only since C++17. Replaced with taking address of first string element
 2020-10-21 23:41:33 +03:00
#Momo 7781fe5781
MSVC crash workaround 
I do not know why, but the following line causes crash if assimp was compiled using MSVC with RelWithDebInfo configuration:
`std::transform(shading.begin(), shading.end(), shading.begin(), Assimp::ToLower<char>);`
replacing `shading.begin()` with `shading.data()` fixes this issue.
 2020-10-21 23:21:50 +03:00
Kim Kulling b842b4a3c1
Merge branch 'master' into fbxReportAssetIssuesProperly 2020-10-21 20:02:48 +02:00
Kim Kulling f13a69a817
Merge pull request #3470 from assimp/kimkulling-patch-7 
Update FUNDING.yml
 2020-10-21 17:04:36 +02:00
Kim Kulling f96698a6d2
Update FUNDING.yml 2020-10-21 16:39:19 +02:00
Kim Kulling 7c5f04deed
Merge pull request #3466 from assimp/collada_cleanup 
Collada cleanup
 2020-10-20 00:20:40 +02:00
Kim Kulling bbac168ced
Merge branch 'master' into collada_cleanup 2020-10-19 23:56:52 +02:00
Kim Kulling 69143ed149 fix unittests. 2020-10-19 23:53:27 +02:00
Kim Kulling 080322b9e2 cleanup collada xml migration. 2020-10-19 19:06:11 +02:00
Malcolm Tyrrell a2cd5619b4
Merge branch 'master' into readFbxWeightsInConfig 2020-10-19 10:16:02 +01:00
Kim Kulling 376e468877
Merge pull request #3231 from xiaozhuai/master 
optimize CMakeLists.txt
 2020-10-18 18:29:45 +02:00
john d48ac9d0a4 fix xcode compile bug 2020-10-18 10:54:04 +08:00
Kim Kulling 37c09ecb69
Update CMakeLists.txt 2020-10-17 10:58:06 +02:00
Kim Kulling 56e1a80e24
Merge branch 'master' into master 2020-10-17 10:57:26 +02:00
Kim Kulling fc11ca2f5e
Merge pull request #3461 from inhosens/dev_1016 
glTF1's orthgraphic camera & glTF2's skinning
 2020-10-17 10:56:38 +02:00
Inho Lee ad7f8910e9 Rollback the method to handle empty bones for GLTF2 
A patch made the assimp to ignore empty bones.
However, some assets can have bones which don't have weights
but are connected to other bones.
 2020-10-16 17:09:17 +02:00
Inho Lee 9f880e2214 Fix glTF1 orthographic camera 2020-10-16 08:56:55 +02:00
Kim Kulling c035177847
Merge pull request #3451 from xantares/patch-1 
CMake: Fix FindRT warning
 2020-10-15 20:08:35 +02:00
Malcolm Tyrrell 0363c18f1f Read weights 2020-10-15 10:07:24 +01:00
Silvio Traversaro 3b5212067c Fix CMake config generation 
Use standard CMake function to generate the CMake config files.
 2020-10-14 23:55:28 +02:00
Kim Kulling 76d370b054
Merge branch 'master' into patch-1 2020-10-14 22:05:56 +02:00
Kim Kulling dbd99bf700
Merge pull request #3456 from rbsheth/rbsheth_hunter_hotfix 
Hotfix for Hunter builds
 2020-10-14 22:05:34 +02:00
Kim Kulling 828068d224
Merge branch 'master' into rbsheth_hunter_hotfix 2020-10-14 21:14:42 +02:00
Kim Kulling f713d30e9b
Merge pull request #3454 from jsmaatta/master 
Fix for issue #3445
 2020-10-14 21:13:52 +02:00
Kim Kulling 7660070aa4
Merge branch 'master' into master 2020-10-14 21:01:35 +02:00
Kim Kulling b9f83c8db8
Merge pull request #3458 from assimp/issue_3449 
Add handling for source for params
 2020-10-14 20:57:08 +02:00
Kim Kulling 857f62cde0 closes pParam.mReference = source; 2020-10-14 20:34:46 +02:00
Rahul Sheth 4e57c1ee7f Hotfix for Hunter builds 2020-10-14 11:49:05 -04:00
Jukka Maatta 6848a18999 Fix for issue #3445 
Add const to avoid creating a temporary copy.

This should fix the cmake compilation error on XGLLoader.cpp shown in bug #3445

The fix is similar to commit bbe6f7f213
 2020-10-13 21:56:43 +03:00
Kim Kulling 84ef3dc0fc
Merge branch 'master' into fbxReportAssetIssuesProperly 2020-10-13 18:37:03 +02:00