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

6307 Commits (ae0f82d5b7972ac7353329501bfa3690227f8d97)

Author SHA1 Message Date
Alexandre Avenel ae0f82d5b7 Fix #2077 : GLTF segfault using triangle strip 2018-08-04 12:47:37 +02:00
Kim Kulling 468549b752
Merge pull request #2071 from Maxqia/master 
Use a more accurate way of checking if the build is 64 bit
 2018-08-03 00:26:27 +02:00
Kim Kulling 63460d7f20
Merge branch 'master' into master 2018-08-02 21:06:19 +02:00
Kim Kulling 59db7f8bb8
Merge pull request #2076 from LoicFr/master 
Optimisation of FBX node name uniqueness
 2018-08-02 21:05:36 +02:00
Kim Kulling a65a7b6c81
Merge branch 'master' into master 2018-08-02 20:26:48 +02:00
Kim Kulling 1e2f4c0187
Merge pull request #2073 from Nimer-88/bugfix/assimp_flipUVs_flag 
[BUGFIX] FlipUVsProcess should also process AnimMeshes (if any)
 2018-07-31 14:19:07 +02:00
FRICOTEAUX 92490eea01 Optimisation of FBX node name uniqueness 2018-07-30 17:27:03 +02:00
Sebastian Matusik b965e7a6dc FlipUVsProcess should also process AnimMeshes (if any) 2018-07-28 18:18:17 +01:00
Kim Kulling d4db553353
Merge branch 'master' into master 2018-07-27 20:32:31 +02:00
Kim Kulling 28fd396db4
Merge pull request #2068 from JekaS178RUS/stl_format_issue_2064 
STLImporter binary and ASCII files imports differently
 2018-07-27 11:44:17 +02:00
Max Qian a77887c874 Use a more accurate way of checking if the build is 64 bit 2018-07-26 08:08:07 -07:00
Evgeniy cd061a0957
Merge branch 'master' into stl_format_issue_2064 2018-07-25 18:38:59 +03:00
Kim Kulling 4a60190c52
Merge pull request #2069 from assimp/issue_1724 
closes https://github.com/assimp/assimp/issues/1724: add default mate…
 2018-07-25 16:30:38 +02:00
kkulling 7e67553311 Fix memleak. 2018-07-25 15:40:19 +02:00
kimkulling 9a6b07e522 closes https://github.com/assimp/assimp/issues/1724: add default material access to the material API. 2018-07-25 15:11:24 +02:00
Власов Евгений 7d630e98da STLImporter::LoadBinaryFile add one child node to produce same scene structure as in STLImporter::LoadASCIIFile 2018-07-23 16:44:20 +03:00
Kim Kulling c5514cda7d
Merge pull request #2062 from LoicFr/master 
Add support of 32-bit indices for the glTF2 export
 2018-07-20 14:49:43 +02:00
FRICOTEAUX a69e95bdc1 Add support of 32-bit indices for the glTF2 export 2018-07-19 11:29:04 +02:00
Kim Kulling 7c85929649
Merge pull request #2061 from assimp/issue_2056 
closes https://github.com/assimp/assimp/issues/2056: use correc excep…
 2018-07-18 21:01:18 +02:00
Kim Kulling 8a3daa1a24 closes https://github.com/assimp/assimp/issues/2056: use correc exception type in MMD-loader. 2018-07-18 20:29:05 +02:00
Kim Kulling 54f3043728
Merge pull request #2060 from assimp/fix-unique-names-fix-ci 
Fix unique names fix ci
 2018-07-18 12:51:05 +02:00
Kim Kulling 417fed1693
Merge branch 'master' into fbximport-fix-uniquename 2018-07-18 11:43:38 +02:00
Kim Kulling fbc8b4c5d6
Merge pull request #2052 from Nimer-88/feature/join_vertices_processor_kill_unused_vertices 
Feature/join vertices processor kill unused vertices
 2018-07-17 08:34:19 +02:00
Sebastian Matusik a5f95f993c
Merge branch 'master' into feature/join_vertices_processor_kill_unused_vertices 2018-07-15 22:21:04 +02:00
Kim Kulling bf1683ab7e
Merge branch 'master' into fbximport-fix-uniquename 2018-07-15 19:19:33 +02:00
Kim Kulling 7cb467da11
Update FBXConverter.cpp 
Try to trigger travis.
 2018-07-15 14:55:52 +02:00
Kim Kulling 85ba6acfa5
Merge pull request #2049 from migenius/issue_2046 
Implement support for non-indexed meshes in glTF importers
 2018-07-14 22:29:53 +02:00
Kim Kulling a4533770f4
Merge branch 'master' into issue_2046 2018-07-14 19:25:07 +02:00
Kim Kulling 89190dda97
Merge pull request #2050 from Nimer-88/feature/glTFv2_blendshapes_support 
glTF v2 importer morph target support
 2018-07-14 19:04:28 +02:00
Kim Kulling b069e7d7d0
Merge branch 'master' into feature/glTFv2_blendshapes_support 2018-07-14 17:09:05 +02:00
Kim Kulling 72de09a562
Update FBXConverter.cpp 
Remove dead code.
 2018-07-14 17:08:04 +02:00
Kim Kulling 91b30e7e74
Update FBXConverter.cpp 
simple change to retrigger CI
 2018-07-14 12:10:59 +02:00
Kenneth Perry (thothonegan) 7967f0a33f FBXImporter: Fix GetUniqueName to return names properly 2018-07-13 15:25:04 -05:00
Kim Kulling 3c6ba8162b
Merge pull request #2057 from assimp/issue_1340 
closes https://github.com/assimp/assimp/issues/1340: Fix handling of …
 2018-07-11 14:16:35 +02:00
Kim Kulling e0a6ffbf4f
Merge branch 'master' into issue_1340 2018-07-11 13:38:27 +02:00
Kim Kulling 659d777702
Merge pull request #2053 from brendanmig/build-minizip-2 
Do not link to system zlib/minizip when building zlib from source
 2018-07-11 11:34:04 +02:00
kimkulling ee383fd8d2 Add missing files. 2018-07-11 11:09:53 +02:00
kimkulling e13f6876bb closes https://github.com/assimp/assimp/issues/1340: Fix handling of empty nodes in openddl-parser. 2018-07-11 10:10:26 +02:00
Kim Kulling 797446aadf
Merge branch 'master' into build-minizip-2 2018-07-10 14:34:46 +02:00
Kim Kulling a4a609e218
Merge pull request #2047 from sbrodehl/patch-1 
Add TARGET_INCLUDE_DIRECTORIES for assimp target
 2018-07-10 14:32:15 +02:00
Kim Kulling 309c52b10f
Merge branch 'master' into patch-1 2018-07-10 13:07:28 +02:00
Kim Kulling f6eddbff6e
Merge pull request #2045 from Norod/ios-build-script 
Enhanced iOS build script + default build type to "Release" + Very minor update
 2018-07-10 13:06:03 +02:00
Kim Kulling c58aef4b4b
Merge branch 'master' into ios-build-script 2018-07-10 11:28:54 +02:00
Brendan Hack 410b54d4b8 When building local zlib ensure we don't link to any system zlib or minzip. 2018-07-09 08:41:42 +10:00
Sebastian Matusik 992194b1b9 Removed signed int vs unsigned int comparison in for loops 2018-07-05 15:15:50 +01:00
Sebastian Matusik 0cc9240886 Build fix 2018-07-05 14:46:15 +01:00
Sebastian Matusik ec1333bfdf JoinVerticesProcess should only try to deduplicate used vertices. 2018-07-05 14:38:58 +01:00
Sebastian Matusik 3e3a785750 glTF v2 importer morph targets support 2018-07-05 14:28:29 +01:00
Sebastian Matusik 624e5b4d1a Merge remote-tracking branch 'upstream/master' 2018-07-05 13:40:46 +01:00
Paul Arden e43e30b726 Slight rework for fix to issue #2046 to remove some duplicated code. 2018-07-05 09:49:08 +10:00