Commit Graph

  • 15c2a96d25 Add test for glTF2 points Alexandre Avenel 2018-08-02 19:07:51 +02:00
  • 29ebb126b8 Add test for glTF2 lines, line strip, lines loop Alexandre Avenel 2018-08-02 19:05:45 +02:00
  • 9dcf83fabd Add unit test for glTF primitive mode Alexandre Avenel 2018-08-01 23:27:04 +02:00
  • ae0f82d5b7 Fix #2077 : GLTF segfault using triangle strip Alexandre Avenel 2018-07-31 23:06:55 +02:00
  • c2c44a831c Pass parameter by reference Jesus Fernandez 2018-08-03 14:51:01 +02:00
  • 468549b752 Merge pull request #2071 from Maxqia/master Kim Kulling 2018-08-03 00:26:27 +02:00
  • 63460d7f20 Merge branch 'master' into master Kim Kulling 2018-08-02 21:06:19 +02:00
  • 59db7f8bb8 Merge pull request #2076 from LoicFr/master Kim Kulling 2018-08-02 21:05:36 +02:00
  • a65a7b6c81 Merge branch 'master' into master Kim Kulling 2018-08-02 20:26:48 +02:00
  • cb567d9f65 added internal to_string. Marco Di Benedetto 2018-08-01 16:38:33 +02:00
  • 1e2f4c0187 Merge pull request #2073 from Nimer-88/bugfix/assimp_flipUVs_flag Kim Kulling 2018-07-31 14:19:07 +02:00
  • 92490eea01 Optimisation of FBX node name uniqueness FRICOTEAUX 2018-07-30 17:27:03 +02:00
  • b965e7a6dc FlipUVsProcess should also process AnimMeshes (if any) Sebastian Matusik 2018-07-28 18:18:17 +01:00
  • d4db553353 Merge branch 'master' into master Kim Kulling 2018-07-27 20:32:31 +02:00
  • 28fd396db4 Merge pull request #2068 from JekaS178RUS/stl_format_issue_2064 Kim Kulling 2018-07-27 11:44:17 +02:00
  • a77887c874 Use a more accurate way of checking if the build is 64 bit Max Qian 2018-07-26 07:40:05 -07:00
  • cd061a0957 Merge branch 'master' into stl_format_issue_2064 Evgeniy 2018-07-25 18:38:59 +03:00
  • 4a60190c52 Merge pull request #2069 from assimp/issue_1724 Kim Kulling 2018-07-25 16:30:38 +02:00
  • 7e67553311 Fix memleak. kkulling 2018-07-25 15:40:19 +02:00
  • 9a6b07e522 closes https://github.com/assimp/assimp/issues/1724: add default material access to the material API. kimkulling 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
  • c5514cda7d Merge pull request #2062 from LoicFr/master Kim Kulling 2018-07-20 14:49:43 +02:00
  • a69e95bdc1 Add support of 32-bit indices for the glTF2 export FRICOTEAUX 2018-07-19 11:29:04 +02:00
  • 7c85929649 Merge pull request #2061 from assimp/issue_2056 Kim Kulling 2018-07-18 21:01:18 +02:00
  • 8a3daa1a24 closes https://github.com/assimp/assimp/issues/2056: use correc exception type in MMD-loader. Kim Kulling 2018-07-18 20:29:05 +02:00
  • 54f3043728 Merge pull request #2060 from assimp/fix-unique-names-fix-ci Kim Kulling 2018-07-18 12:51:05 +02:00
  • 417fed1693 Merge branch 'master' into fbximport-fix-uniquename Kim Kulling 2018-07-18 11:43:38 +02:00
  • fbc8b4c5d6 Merge pull request #2052 from Nimer-88/feature/join_vertices_processor_kill_unused_vertices Kim Kulling 2018-07-17 08:34:19 +02:00
  • a5f95f993c Merge branch 'master' into feature/join_vertices_processor_kill_unused_vertices Sebastian Matusik 2018-07-15 22:21:04 +02:00
  • bf1683ab7e Merge branch 'master' into fbximport-fix-uniquename Kim Kulling 2018-07-15 19:19:33 +02:00
  • 7cb467da11 Update FBXConverter.cpp Kim Kulling 2018-07-15 14:55:52 +02:00
  • 85ba6acfa5 Merge pull request #2049 from migenius/issue_2046 Kim Kulling 2018-07-14 22:29:53 +02:00
  • a4533770f4 Merge branch 'master' into issue_2046 Kim Kulling 2018-07-14 19:25:07 +02:00
  • 89190dda97 Merge pull request #2050 from Nimer-88/feature/glTFv2_blendshapes_support Kim Kulling 2018-07-14 19:04:28 +02:00
  • b069e7d7d0 Merge branch 'master' into feature/glTFv2_blendshapes_support Kim Kulling 2018-07-14 17:09:05 +02:00
  • 72de09a562 Update FBXConverter.cpp Kim Kulling 2018-07-14 17:08:04 +02:00
  • 91b30e7e74 Update FBXConverter.cpp Kim Kulling 2018-07-14 12:10:59 +02:00
  • 7967f0a33f FBXImporter: Fix GetUniqueName to return names properly Kenneth Perry (thothonegan) 2018-07-13 15:25:04 -05:00
  • 3c6ba8162b Merge pull request #2057 from assimp/issue_1340 Kim Kulling 2018-07-11 14:16:35 +02:00
  • e0a6ffbf4f Merge branch 'master' into issue_1340 Kim Kulling 2018-07-11 13:38:27 +02:00
  • 659d777702 Merge pull request #2053 from brendanmig/build-minizip-2 Kim Kulling 2018-07-11 11:34:04 +02:00
  • ee383fd8d2 Add missing files. kimkulling 2018-07-11 11:09:53 +02:00
  • e13f6876bb closes https://github.com/assimp/assimp/issues/1340: Fix handling of empty nodes in openddl-parser. kimkulling 2018-07-11 10:10:26 +02:00
  • 797446aadf Merge branch 'master' into build-minizip-2 Kim Kulling 2018-07-10 14:34:46 +02:00
  • a4a609e218 Merge pull request #2047 from sbrodehl/patch-1 Kim Kulling 2018-07-10 14:32:15 +02:00
  • 309c52b10f Merge branch 'master' into patch-1 Kim Kulling 2018-07-10 13:07:28 +02:00
  • f6eddbff6e Merge pull request #2045 from Norod/ios-build-script Kim Kulling 2018-07-10 13:06:03 +02:00
  • c58aef4b4b Merge branch 'master' into ios-build-script Kim Kulling 2018-07-10 11:28:54 +02:00
  • a834ea2837 Merge pull request #1 from brendanmig/build-minizip-2 Brendan Hack 2018-07-09 10:26:07 +10:00
  • 410b54d4b8 When building local zlib ensure we don't link to any system zlib or minzip. Brendan Hack 2018-07-09 08:41:42 +10:00
  • 992194b1b9 Removed signed int vs unsigned int comparison in for loops Sebastian Matusik 2018-07-05 15:15:50 +01:00
  • 0cc9240886 Build fix Sebastian Matusik 2018-07-05 14:46:15 +01:00
  • ec1333bfdf JoinVerticesProcess should only try to deduplicate used vertices. Sebastian Matusik 2018-07-05 14:38:58 +01:00
  • 3e3a785750 glTF v2 importer morph targets support Sebastian Matusik 2018-07-05 14:28:29 +01:00
  • 624e5b4d1a Merge remote-tracking branch 'upstream/master' Sebastian Matusik 2018-07-05 13:40:46 +01:00
  • e43e30b726 Slight rework for fix to issue #2046 to remove some duplicated code. Paul Arden 2018-07-05 09:49:08 +10:00
  • e7699ca585 Added support for non-indexed meshes in glTF importer. Addresses issue #2046. Paul Arden 2018-07-05 09:37:57 +10:00
  • 5c6c87c7b1 Merge pull request #1 from assimp/master Brendan Hack 2018-07-05 09:27:28 +10:00
  • cb1fc76859 Add TARGET_INCLUDE_DIRECTORIES for assimp target Seb Bro 2018-07-04 22:56:35 +02:00
  • 32abf9294a Merge pull request #2044 from loebl/bug/keep_small_triangles_in_triangulation Kim Kulling 2018-07-03 19:13:41 +02:00
  • 1a0231f91e Merge branch 'master' into bug/keep_small_triangles_in_triangulation Kim Kulling 2018-07-02 18:08:09 +02:00
  • eb21756eaa Merge pull request #2039 from maxvollmer/master Kim Kulling 2018-07-02 18:07:54 +02:00
  • 0adc793eb4 Lipo the debug binaries by appending d to their name Doron Adler 2018-07-01 14:53:05 +03:00
  • 5b20ad3791 Fixed a mistake I Introduced in the build script where debug and shared-lib parameters were expecting a "=" Revert to default Release build type, but this time only for iOS Do not attempt to use minizip if you are building for iOS shared dylib Keep in mind that the "Shared" option only apply to the assimp library and not the other two built libraries Doron Adler 2018-07-01 14:48:20 +03:00
  • 6a45f84b73 Revert Doron Adler 2018-07-01 13:10:44 +03:00
  • 6e346a5504 Added comment Doron Adler 2018-07-01 11:35:56 +03:00
  • 1feb0d1c60 Change order of PP steps to triangulate before searching for degenerates Daniel Löber 2018-06-29 15:47:41 +02:00
  • 3c5c0a0df3 Deactivate area based rejection of triangles in triangulation Daniel Löber 2018-06-29 09:55:49 +02:00
  • 1b7f3de636 assimp will now be correctly built with -O3 or -Og based on build type Doron Adler 2018-06-27 13:26:01 +03:00
  • d79a82faa2 -Og for debug Doron Adler 2018-06-27 13:10:41 +03:00
  • 35871b6c37 Use -g or -O3 based on debug/release Doron Adler 2018-06-27 13:04:49 +03:00
  • 5428fa6dd5 Norod: Managed to get it past the make file creation phase Doron Adler 2018-06-27 11:39:14 +03:00
  • eebf549e8e Merge branch 'master' into ios-build-script Doron Adler 2018-06-27 09:59:51 +03:00
  • a17e788808 Merge branch 'master' into master Max Vollmer 2018-06-26 15:12:03 +02:00
  • bca41ceba5 Merge pull request #2037 from aavenel/fix/FBXImportRegression Kim Kulling 2018-06-25 20:12:10 +02:00
  • 52c017b595 Added check to BaseImporter::SearchFileHeaderForToken making sure that a detected token is not in fact just a fraction of a longer token. Microsoft exported binary gltf files were detected as OBJ, because the "gltf " in the string "Microsoft GLTF Exporter 2.4.1.7" was detected as the token "f ". I added a new bool parameter to the method enabling this check. It's default false, and only ObjFileImporter sets it to true, so no other code should be affected. Max Vollmer 2018-06-25 12:05:37 +02:00
  • dddf33d394 Merge pull request #2 from assimp/master Max Vollmer 2018-06-25 11:50:00 +02:00
  • de8adacb54 Fix regression on FBX importer unit test Alexandre Avenel 2018-06-23 20:25:31 +02:00
  • 89b90cf2d5 Check nb of faces and vertices for FBX unit test Alexandre Avenel 2018-06-23 20:18:27 +02:00
  • 39c84931ba Merge pull request #2020 from pierremoreau/hide_gpg_signature Kim Kulling 2018-06-22 21:53:03 +02:00
  • 370681fe66 Merge branch 'master' into hide_gpg_signature Kim Kulling 2018-06-22 19:32:20 +02:00
  • 41be5400bd Merge pull request #2035 from mr-ravin/master Kim Kulling 2018-06-22 19:32:08 +02:00
  • d4c7eb3b67 Update helper.py Kim Kulling 2018-06-22 16:14:20 +02:00
  • 4a720511e4 Update helper.py Kim Kulling 2018-06-22 16:13:46 +02:00
  • 7b0f100fc3 Solved pyassimp.errors.AssimpError in conda Ravin Kumar 2018-06-22 12:22:27 +05:30
  • 097625e542 Merge branch 'master' into ios-build-script Doron Adler 2018-06-20 14:34:17 +03:00
  • 185c84f93d Merge pull request #2031 from assimp/issue_2001 Kim Kulling 2018-06-19 21:15:35 +02:00
  • 7acc4c6808 Make glTF2 the default exporter for glft Kim Kulling 2018-06-19 20:40:41 +02:00
  • ee2f0bccac Merge branch 'master' into ios-build-script Doron Adler 2018-06-19 10:02:25 +03:00
  • 0b98e6c922 Merge pull request #2030 from assimp/kimkulling-issue-2011 Kim Kulling 2018-06-19 00:16:48 +02:00
  • f0c8ef68b2 Merge branch 'master' into kimkulling-issue-2011 Kim Kulling 2018-06-18 23:20:25 +02:00
  • 7abf2b9412 Merge pull request #2028 from assimp/issue_2024 Kim Kulling 2018-06-18 23:08:41 +02:00
  • 64ab3e27fc Fix missing model error in Irr-instancing Kim Kulling 2018-06-18 22:16:50 +02:00
  • 961cefb227 Merge branch 'master' into issue_2024 Kim Kulling 2018-06-18 21:49:07 +02:00
  • a903ce42d0 Merge pull request #2022 from CwTCwT/master Kim Kulling 2018-06-18 21:48:40 +02:00
  • 43ddd93fae Merge branch 'master' into issue_2024 Kim Kulling 2018-06-18 21:21:07 +02:00
  • cc08c19248 closes https://github.com/assimp/assimp/issues/2024: make code more readable. Kim Kulling 2018-06-18 21:19:54 +02:00
  • cd0f5d0f70 Merge branch 'master' into master Christian 2018-06-18 20:16:12 +02:00
  • eaa3b30e25 Merge pull request #2025 from assimp/issue_2019 Kim Kulling 2018-06-17 23:11:42 +02:00
  • e5fa1798f6 closes https://github.com/assimp/assimp/issues/2019: fix the qt-viewer without export. Kim Kulling 2018-06-17 20:37:09 +02:00