Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,261 Commits 19 Branches 43 Tags
797446aadf18a9c19d7d2a3b5c25ab5b209ff7b5
Commit Graph

6261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brendan Hack
5c6c87c7b1 Merge pull request #1 from assimp/master 
pull from assimp
 2018-07-05 09:27:28 +10:00
Seb Bro
cb1fc76859 Add TARGET_INCLUDE_DIRECTORIES for assimp target 
With `TARGET_INCLUDE_DIRECTORIES` the `assimp` target can directly used in another CMake project, e.g. assimp can be used in a submodule with an `add_subdirectory()` call.
 2018-07-04 22:56:35 +02:00
Kim Kulling
32abf9294a Merge pull request #2044 from loebl/bug/keep_small_triangles_in_triangulation 
Keep small triangles in triangulation
 2018-07-03 19:13:41 +02:00
Kim Kulling
1a0231f91e Merge branch 'master' into bug/keep_small_triangles_in_triangulation 2018-07-02 18:08:09 +02:00
Kim Kulling
eb21756eaa Merge pull request #2039 from maxvollmer/master 
Fixed some gltf files being detected as OBJ
 2018-07-02 18:07:54 +02:00
Doron Adler
0adc793eb4 Lipo the debug binaries by appending d to their name 2018-07-01 14:53:05 +03:00
Doron Adler
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
 2018-07-01 14:48:20 +03:00
Doron Adler
6a45f84b73 Revert 2018-07-01 13:10:44 +03:00
Doron Adler
6e346a5504 Added comment 2018-07-01 11:35:56 +03:00
Daniel Löber
1feb0d1c60 Change order of PP steps to triangulate before searching for degenerates 2018-06-29 15:52:12 +02:00
Daniel Löber
3c5c0a0df3 Deactivate area based rejection of triangles in triangulation 
Use FindDegenerates post processing step for that.
 2018-06-29 15:52:09 +02:00
Doron Adler
1b7f3de636 assimp will now be correctly built with -O3 or -Og based on build type 2018-06-27 13:26:01 +03:00
Doron Adler
d79a82faa2 -Og for debug 2018-06-27 13:10:41 +03:00
Doron Adler
35871b6c37 Use -g or -O3 based on debug/release 2018-06-27 13:04:49 +03:00
Doron Adler
5428fa6dd5 Norod: Managed to get it past the make file creation phase 2018-06-27 11:39:14 +03:00
Doron Adler
eebf549e8e Merge branch 'master' into ios-build-script 
* master:
  Fix regression on FBX importer unit test
  Check nb of faces and vertices for FBX unit test
  Update helper.py
  Update helper.py
  Solved pyassimp.errors.AssimpError in conda
  Hide commit signature information when fetching commit hash
 2018-06-27 09:59:51 +03:00
Max Vollmer
a17e788808 Merge branch 'master' into master 2018-06-26 15:12:03 +02:00
Kim Kulling
bca41ceba5 Merge pull request #2037 from aavenel/fix/FBXImportRegression 
Fix fbx import regression
 2018-06-25 20:12:10 +02:00
Max Vollmer
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. 2018-06-25 12:05:37 +02:00
Max Vollmer
dddf33d394 Merge pull request #2 from assimp/master 
Sync with assimp master
 2018-06-25 11:50:00 +02:00
Alexandre Avenel
de8adacb54 Fix regression on FBX importer unit test 
box.fbx was broken since b28bcc commit.
 2018-06-23 20:25:31 +02:00
Alexandre Avenel
89b90cf2d5 Check nb of faces and vertices for FBX unit test 
This test is currently broken !
 2018-06-23 20:24:52 +02:00
Kim Kulling
39c84931ba Merge pull request #2020 from pierremoreau/hide_gpg_signature 
Hide commit signature information when fetching commit hash
 2018-06-22 21:53:03 +02:00
Kim Kulling
370681fe66 Merge branch 'master' into hide_gpg_signature 2018-06-22 19:32:20 +02:00
Kim Kulling
41be5400bd Merge pull request #2035 from mr-ravin/master 
Solved pyassimp.errors.AssimpError in conda
 2018-06-22 19:32:08 +02:00
Kim Kulling
d4c7eb3b67 Update helper.py 
Remove deprecated comment.
 2018-06-22 16:14:20 +02:00
Kim Kulling
4a720511e4 Update helper.py 
Remove dead code.
 2018-06-22 16:13:46 +02:00
Ravin Kumar
7b0f100fc3 Solved pyassimp.errors.AssimpError in conda 
This error occurred because of error in finding .extension files.
 
os.path.splitext(filename)[-1].lower() not in ext_whitelist:  ### this line had bugs, failed to select files with extensions .so.x  [.so.1  .so.2  .so.3.1] but worked on simple extensions only. like- .so .dll

Added a mechanism to remove this bug.
 2018-06-22 12:22:27 +05:30
Doron Adler
097625e542 Merge branch 'master' into ios-build-script 
* master:
  Make glTF2 the default exporter for glft
 2018-06-20 14:34:17 +03:00
Kim Kulling
185c84f93d Merge pull request #2031 from assimp/issue_2001 
Make glTF2 the default exporter for glft
 2018-06-19 21:15:35 +02:00
Kim Kulling
7acc4c6808 Make glTF2 the default exporter for glft 
- Put it in front of the list of exporters
closes https://github.com/assimp/assimp/issues/2001
 2018-06-19 20:40:41 +02:00
Doron Adler
ee2f0bccac Merge branch 'master' into ios-build-script 
* master:
  Fix missing model error in Irr-instancing
  closes https://github.com/assimp/assimp/issues/2024: make code more readable.
  closes https://github.com/assimp/assimp/issues/2019: fix the qt-viewer without export.
  applied coding conventions added check against the known faces
  issue_2016 only add material uv mappings if set, ignore when no uvmapping set removed unneccessary pad_i1 field (to prevent unnecessary field read exceptions)
  Update XFileParser.cpp
  Update XFileParser.cpp
  Some FBX files have Null/LimbNode attributes with an empty Properties70 element, where the Element is not NULL, but it's Compound is. The code only checked if the Element itself is NULL, thus causing a DeadlyImportError when trying to instantiate a PropertyTable for an Element that doesn't have a Compound.
  fix build for independent build dir
  Some review findings.
 2018-06-19 10:02:25 +03:00
Kim Kulling
0b98e6c922 Merge pull request #2030 from assimp/kimkulling-issue-2011 
Fix missing model error in Irr-instancing
 2018-06-19 00:16:48 +02:00
Kim Kulling
f0c8ef68b2 Merge branch 'master' into kimkulling-issue-2011 2018-06-18 23:20:25 +02:00
Kim Kulling
7abf2b9412 Merge pull request #2028 from assimp/issue_2024 
Issue 2024
 2018-06-18 23:08:41 +02:00
Kim Kulling
64ab3e27fc Fix missing model error in Irr-instancing 
closes https://github.com/assimp/assimp/issues/2011: add reference to free model.
 2018-06-18 22:16:50 +02:00
Kim Kulling
961cefb227 Merge branch 'master' into issue_2024 2018-06-18 21:49:07 +02:00
Kim Kulling
a903ce42d0 Merge pull request #2022 from CwTCwT/master 
issue_2016
 2018-06-18 21:48:40 +02:00
Kim Kulling
43ddd93fae Merge branch 'master' into issue_2024 2018-06-18 21:21:07 +02:00
Kim Kulling
cc08c19248 closes https://github.com/assimp/assimp/issues/2024: make code more readable. 2018-06-18 21:19:54 +02:00
Christian
cd0f5d0f70 Merge branch 'master' into master 2018-06-18 20:16:12 +02:00
Kim Kulling
eaa3b30e25 Merge pull request #2025 from assimp/issue_2019 
closes https://github.com/assimp/assimp/issues/2019: fix the qt-viewe…
 2018-06-17 23:11:42 +02:00
Kim Kulling
e5fa1798f6 closes https://github.com/assimp/assimp/issues/2019: fix the qt-viewer without export. 2018-06-17 20:37:09 +02:00
CwTCwT
a96587d551 applied coding conventions 
added check against the known faces
 2018-06-16 15:30:22 +02:00