Commit Graph

10184 Commits (57b1040a0c0dacfdf342b49c7a953468b47600d3)

Author SHA1 Message Date
Kim Kulling 22413d85ad
Merge branch 'master' into MalcolmTyrrell/tangentCheck 2021-04-03 17:42:44 +02:00
Kim Kulling cfad36d0f4
Merge pull request #3737 from assimp/615IO-ios-port-update
615 io ios port update
2021-04-03 17:41:07 +02:00
Kim Kulling 7d68eab4a7 Update license 2021-04-03 12:09:23 +02:00
Kim Kulling d677005487 Merge branch '615IO-ios-port-update' 2021-04-03 12:08:38 +02:00
Kim Kulling 0b628a0ebb Merge branch 'ios-port-update' of https://github.com/615IO/assimp into 615IO-ios-port-update 2021-04-03 12:04:03 +02:00
Kim Kulling 456af8c493
Merge pull request #3736 from assimp/issue_3678
Issue 3678
2021-04-03 11:23:17 +02:00
Kim Kulling 80fc8538be
Update AMFImporter_Material.cpp 2021-04-03 10:29:16 +02:00
Kim Kulling d62c89557b
Remove dead code 2021-04-03 10:28:19 +02:00
Kim Kulling 46e49d0b83
Update AMFImporter_Geometry.cpp 2021-04-03 10:27:54 +02:00
Kim Kulling cdb6a62cdb
Merge branch 'master' into issue_3678 2021-04-03 10:27:07 +02:00
Kim Kulling da0543972b Fix parsing for AMF-Files. 2021-04-03 10:25:03 +02:00
Kim Kulling 89a8f87dae AMF: Remove unused macros 2021-04-02 13:10:24 +02:00
Kim Kulling 91cb2947ac
Merge pull request #3723 from eliasdaler/master
Add zlibstatic to the list of exported targets
2021-04-01 21:05:58 +02:00
Clement JACOB a25ef8a329
Merge branch 'master' into feature/gltf_fb_ngon_encoding 2021-04-01 20:35:16 +02:00
Kim Kulling 18af013c9e
Merge branch 'master' into master 2021-04-01 20:02:53 +02:00
Kim Kulling 577a8fc186
Merge pull request #3728 from assimp/kimkulling-patch-4
Update FUNDING.yml
2021-04-01 19:23:51 +02:00
Kim Kulling 658ffe3d2c
Update FUNDING.yml
Only use OpenCollective.
2021-04-01 17:21:12 +02:00
Kim Kulling 20e3261304
Merge pull request #3727 from assimp/kimkulling-patch-4
Update Readme.md
2021-04-01 17:20:38 +02:00
Kim Kulling 60794f3743
Update Readme.md 2021-04-01 17:07:35 +02:00
Clement JACOB 5d09105a49
Update mesh.h
Fixing ngon encoding flag value
2021-03-30 20:24:03 +02:00
Clement Jacob fc2c12ad6a Fixing encoding when lines and points are encountered 2021-03-30 09:58:28 +02:00
Clement Jacob fc0cf2ea8d NGON encoding triangles only 2021-03-30 09:19:50 +02:00
Clement Jacob 2e90fed527 Refactoring and fixing remaining issues in triangulation process 2021-03-30 09:10:50 +02:00
Clement Jacob 596001c89c Refactoring the extension 2021-03-30 09:10:50 +02:00
Clement Jacob 81019d5e58 Fixing quad encoding 2021-03-30 09:10:50 +02:00
Clement Jacob 6d1a0c6054 Adding quad proper handling 2021-03-30 09:10:50 +02:00
Clement Jacob 8e589221d7 [gltf2-exporter] Adding FB_ngon_encoding support 2021-03-30 09:10:50 +02:00
Kim Kulling 3880cd225c
Merge pull request #3721 from vfxgordon/fbxBlendshapes
Added Blendshape Support to FBX Export
2021-03-29 22:31:37 +02:00
Kim Kulling f61a41bdd9
Merge branch 'master' into fbxBlendshapes 2021-03-29 21:48:51 +02:00
Kim Kulling b5d4e50895
Merge pull request #3724 from bekraft/3ds-import-fix
Fixing 3DS import for CHUNK_TRMATRIX translation vector.
2021-03-29 20:34:55 +02:00
Bernold Kraft 09d3266250 Fixing 3DS import for CHUNK_TRMATRIX translation vector. 2021-03-29 15:31:08 +02:00
Elias Daler 0bd938c024 Add zlibstatic to the list of exported targets 2021-03-29 02:26:03 +03:00
urschanselmann 5755530bab
Merge branch 'master' into master 2021-03-28 17:40:17 +02:00
Kim Kulling e5862c18be
Merge branch 'master' into fbxBlendshapes 2021-03-28 13:02:35 +02:00
Kim Kulling b7df376836
Merge pull request #3722 from bekraft/bekraft/3ds-export-fix
Fixing CHUNK_TRMATRIX translation sub chunk
2021-03-27 19:53:38 +01:00
Bernold Kraft 348c34811f Fixing CHUNK_TRMATRIX translation sub chunk
and therefore omitting the transform aggregation in the CHUNK_VERTLIST.
2021-03-26 22:21:45 +01:00
Gordon Chapman 3fd865b4bf Added Blendshape Support to FBX Export 2021-03-24 18:10:03 -07:00
Malcolm Tyrrell d94ddd32b1 Extra check. Better logging. 2021-03-24 11:04:39 +00:00
Malcolm Tyrrell add165c4a1 Check target sizes to avoid reading beyond allocation 2021-03-24 10:55:40 +00:00
Kim Kulling d1ef28fa52
Merge pull request #3716 from assimp/kimkulling-issue_2063
Provide a dockerfile
2021-03-22 09:12:52 +01:00
Kim Kulling 2c5fd39176
Provide a dockerfile
closes https://github.com/assimp/assimp/issues/1063:
2021-03-22 08:55:21 +01:00
urschanselmann 0a1efe5d58
Merge branch 'master' into master 2021-03-21 17:19:43 +01:00
Kim Kulling 525213a045
Merge pull request #3707 from MalcolmTyrrell/MalcolmTyrrell/gltfCrashes
Fix a set of glTF2 crashes on bad input
2021-03-21 12:14:37 +01:00
urschanselmann 86c05a1154
Merge branch 'master' into master 2021-03-19 18:15:15 +01:00
Kim Kulling 5f652feb75
Merge branch 'master' into MalcolmTyrrell/gltfCrashes 2021-03-19 13:35:13 +01:00
Kim Kulling 608b48e1fc
Merge pull request #3696 from jaefunk/export_with_rotation
export with rotation
2021-03-19 12:34:51 +01:00
Kim Kulling 18886686e1
Merge branch 'master' into export_with_rotation 2021-03-19 08:21:36 +01:00
Alexander Gessler 191fcafcc0
Merge pull request #3709 from mahiuchun/erase
Fix a memory leak in glTF2.
2021-03-18 21:42:54 +01:00
Hill Ma 3e99385f44 Fix a memory leak in glTF2.
The destructor of LazyDict uses `delete` but `delete` was not used for objects removed by LazyDict::Remove.
2021-03-17 15:12:54 -07:00
Urs Hanselmann d9cd07f0d9 Merge branch 'master' of https://github.com/assimp/assimp 2021-03-17 18:26:11 +01:00