Commit Graph

12783 Commits

Author SHA1 Message Date
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
CwTCwT
41bf572af6 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)
2018-06-16 15:08:19 +02:00
Kim Kulling
34e63dbe09 Merge branch 'master' into hide_gpg_signature 2018-06-16 15:01:17 +02:00
Kim Kulling
31adc4385c Merge branch 'master' of https://github.com/assimp/assimp 2018-06-16 14:59:15 +02:00
Kim Kulling
aa09001333 Merge pull request #1990 from assimp/review
Some review findings.
2018-06-16 12:11:26 +02:00
Kim Kulling
d416fe874e Update XFileParser.cpp
Fix compiler warnings.
2018-06-16 10:32:43 +02:00
Pierre Moreau
8334bb579c Hide commit signature information when fetching commit hash
If someone configures git to always show a commit’s signing information,
this breaks the definition of GitVersion in revision.h:

```
#ifndef ASSIMP_REVISION_H_INC
#define ASSIMP_REVISION_H_INC

#define GitVersion 0xgpg: Signature faite le Fri 15 Jun 2018 20:39:53 CEST
gpg:                avec la clef RSA 4AEE18F83AFDEB23
gpg: Impossible de vérifier la signature : Pas de clef publique
878b4b2c
#define GitBranch "master"

#endif // ASSIMP_REVISION_H_INC
```

This can be avoided by passing the `--no-show-signature` to the `git
log` command for retrieving the hash.
2018-06-16 10:25:43 +02:00
Kim Kulling
3e45acbf4e Merge branch 'master' into review 2018-06-16 09:10:41 +02:00
Kim Kulling
a03ab068be Update XFileParser.cpp
Fix typo.
2018-06-16 09:10:30 +02:00
Kim Kulling
e3bfd08445 Merge pull request #2013 from cloudwu/fixbuild
fix build for independent build dir (mingw)
2018-06-16 09:07:55 +02:00
Kim Kulling
e29437ff3b Merge branch 'master' into fixbuild 2018-06-15 20:40:06 +02:00