Commit Graph

10500 Commits (002cdcdd7fbc94880142f396527a599ca3829842)

Author SHA1 Message Date
Kim Kulling db8e9eb556
Merge branch 'master' into develop 2021-01-29 19:20:38 +01:00
Kim Kulling 3174a9cac8
Merge pull request #3598 from thomasbiang/master
GLTF2: Allow Export Node in TRS format
2021-01-29 19:20:10 +01:00
Kim Kulling 8d4b816dfe
Merge branch 'master' into master 2021-01-29 18:16:04 +01:00
Kim Kulling 1afc4c045e
Merge pull request #3608 from villevoutilainen/master
GCC 11 build fixes
2021-01-29 11:32:53 +01:00
contriteobserver e33b69a428 Collada importer now identifies animations
addresses issue #3584
2021-01-28 13:06:02 -08:00
Kim Kulling 706d636c63
Merge branch 'master' into master 2021-01-28 18:25:39 +01:00
RichardTea efae3b83b1 Draco requires default visibility on gcc/clang 2021-01-28 10:18:12 +00:00
RichardTea 48bcbbefdd use nullptr and float constants 2021-01-27 10:56:57 +00:00
RichardTea 150514fc8b Move draco warning suppression
Should be around the include for portability, not template instantiation
Fix clang pragma typos
2021-01-27 10:42:28 +00:00
RichardTea 5e7281dac6
Merge branch 'master' into issue_2195_draco 2021-01-27 10:26:16 +00:00
RichardTea 26ce6ba4f6 draco unit test when draco disabled
Should not load the draco file
2021-01-27 10:25:56 +00:00
RichardTea f6862f9697 Disable draco on cmake prior to 3.12 2021-01-27 10:18:33 +00:00
RichardTea 6ec32b6b78 Apply clangformat 2021-01-27 09:55:03 +00:00
RichardTea c6fd1ce996 glTF2 Minor cleanup 2021-01-27 09:42:49 +00:00
RichardTea 5b9d06c2fc Disable draco clang/gcc warnings via pragma
draco templated functions also throw warnings
2021-01-27 09:19:35 +00:00
Kim Kulling b2af2b2137
Merge pull request #3616 from assimp/kimkulling-issue_3572
Fix compiler bug for VS2019
2021-01-27 09:59:56 +01:00
Kim Kulling 1e38f84c3a
fix typo 2021-01-27 09:40:19 +01:00
Kim Kulling ac0f1f2cab
Update FBXMaterial.cpp 2021-01-27 09:37:35 +01:00
Kim Kulling c02ad323a5
Fix VS compiler warning: convertig int to char 2021-01-27 09:22:59 +01:00
thomasbiang 4ed9f3c2f4
Merge branch 'master' into master 2021-01-26 13:55:40 -08:00
Kim Kulling 4471c36c08
Fix compiler bug for VS2019
- Check https://developercommunity.visualstudio.com/content/problem/1223143/visual-studio-2019-c-program-crash-with-stdstring.html for more details
- closes https://github.com/assimp/assimp/issues/3572
2021-01-26 20:59:21 +01:00
Kim Kulling 83d4227e5c
Merge pull request #3597 from RichardTea/issue_3573
Increase float and double string export precision
2021-01-26 20:41:57 +01:00
Kim Kulling 1950247329
Merge branch 'master' into issue_3573 2021-01-26 19:38:18 +01:00
RichardTea 0c49cddae6 Cleanup cmakelists
Don't repeat self
Add links to google draco issues
2021-01-26 18:11:05 +00:00
RichardTea 88001d1609 Disable clang/gcc warnings for Draco 2021-01-26 17:58:00 +00:00
Kim Kulling 2cd6cd603c
Merge pull request #3615 from assimp/kimkulling-funding_update
Replace patreon by opencollective
2021-01-26 18:51:29 +01:00
RichardTea d79e0c0ba9 Avoid std::make_unique
Assimp is still C++11
2021-01-26 17:33:10 +00:00
Kim Kulling c12f747bde
Merge branch 'master' into kimkulling-funding_update 2021-01-26 18:25:07 +01:00
Kim Kulling b6b061b21a
Merge pull request #3610 from assimp/kimkulling-remove_appveyor
Delete appveyor.yml
2021-01-26 18:24:47 +01:00
RichardTea fe97ff6474 Draco platform libraries have different names
On Windows it's draco.dll/lib
On Linux/macOS draco_shared.dylib & draco_static.lib
2021-01-26 17:19:41 +00:00
Kim Kulling 95fe3e98a6
Merge branch 'master' into kimkulling-remove_appveyor 2021-01-26 18:09:43 +01:00
Kim Kulling 0244aec0a5
Update Readme.md 2021-01-26 18:09:25 +01:00
Kim Kulling d04b1b9e2e
Replace patreon by opencollective 2021-01-26 18:08:20 +01:00
RichardTea c917e6513f
Merge branch 'master' into issue_2195_draco 2021-01-26 16:43:46 +00:00
RichardTea f39ba8ddb2 Add compile error for bad error draco config
KHR_draco_mesh_compression requires
DRACO_MESH_COMPRESSION_SUPPORTED
2021-01-26 16:24:18 +00:00
RichardTea dde7605158 Implement draco decoding 2021-01-26 16:08:12 +00:00
RichardTea 3a7d0f5656 Add Draco to cmakelists
Initial pass. Not yet used.
Add Draco library to assimp build and link
2021-01-26 15:58:14 +00:00
contriteobserver d7bf513250 renaming iterator to avoid any possibility of scop collisions 2021-01-26 01:36:12 -08:00
contriteobserver 69fc809307 size_t is not the same as unsigned int on some systems 2021-01-26 01:01:59 -08:00
contriteobserver f92a34e0b7 Merge branch 'master' into ColladaSubmeshFix 2021-01-26 00:38:37 -08:00
Kim Kulling 4017a6da26
Merge branch 'master' into issue_3573 2021-01-25 20:48:31 +01:00
xiaohunqupo fbc45fecec
Merge pull request #1 from assimp/master
Merge From assimp/assimp master
2021-01-25 14:12:28 +08:00
Kim Kulling 294d4230b0
Merge pull request #3612 from assimp/kimkulling-issue_3601
Add missing skip
2021-01-24 18:59:03 +01:00
Kim Kulling 243d017463
Add missing skip
- closes https://github.com/assimp/assimp/issues/3601
- Fix some format issues
2021-01-24 18:47:50 +01:00
Kim Kulling 47dd6c0786
Merge pull request #3611 from assimp/kimkulling-issue_3599
Fix typo in collada parser
2021-01-24 18:37:16 +01:00
Kim Kulling a2b889ab09
Fix typo in collada parser
closes https://github.com/assimp/assimp/issues/3599
2021-01-24 18:21:46 +01:00
Kim Kulling e18261953d
Delete mtime_cache 2021-01-24 18:14:43 +01:00
Kim Kulling 7a706be920
Delete cacheglobs.txt 2021-01-24 18:14:36 +01:00
Kim Kulling dd0facd722
Delete appveyor.yml 2021-01-24 18:14:00 +01:00
contriteobserver b48e19c28f Merge branch 'master' into ColladaSubmeshFix 2021-01-24 02:30:31 -08:00