Commit Graph

3565 Commits

Author SHA1 Message Date
Kim Kulling
b069e7d7d0 Merge branch 'master' into feature/glTFv2_blendshapes_support 2018-07-14 17:09:05 +02:00
Kim Kulling
309c52b10f Merge branch 'master' into patch-1 2018-07-10 13:07:28 +02:00
Kim Kulling
c58aef4b4b Merge branch 'master' into ios-build-script 2018-07-10 11:28:54 +02: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
3e3a785750 glTF v2 importer morph targets support 2018-07-05 14:28:29 +01: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
1a0231f91e Merge branch 'master' into bug/keep_small_triangles_in_triangulation 2018-07-02 18:08:09 +02: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
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
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
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
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
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
961cefb227 Merge branch 'master' into issue_2024 2018-06-18 21:49:07 +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
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
d416fe874e Update XFileParser.cpp
Fix compiler warnings.
2018-06-16 10:32: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
Max Vollmer
0b02b92701 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. 2018-06-15 15:46:38 +02:00
Doron Adler
1d5b1b12e2 Merge branch 'master' into ios-build-script
* master: (34 commits)
  Update INSTALL for iOS build
  Improve the contribution guide
  usage of dynamic_cast instead of static_cast
  prevent zero sized array allocations
  reworked to ElemBase *
  use of malloc and free (given to shared ptr) for correct mem management
  rereworked suggested by clang
  travis changes according clang 5.0
  again travis hit me
  changes according travis compiles
  changes according travis build
  changed to coding convention
  issue_1973 added support for CustomData(Layer) to support multiple (texture) UV mappings added unittest with sample model
  Update script.iss
  replace typo by comment statement.
  Update script.iss
  Update script.iss
  Update script.iss
  Update script.iss
  Update script.iss
  ...
2018-06-14 14:55:02 +03:00
Kim Kulling
a8236f2986 Merge branch 'master' into master 2018-06-12 22:10:54 +02:00
Kim Kulling
5f3aa142b4 Merge branch 'master' into master 2018-06-12 11:40:40 +02:00
CwTCwT
9415380b4c usage of dynamic_cast instead of static_cast 2018-06-10 10:35:15 +02:00
CwTCwT
7db668e66f prevent zero sized array allocations 2018-06-09 23:36:42 +02:00
CwTCwT
959c0e8907 reworked to ElemBase * 2018-06-09 23:29:50 +02:00
CwTCwT
5b4b16f360 use of malloc and free (given to shared ptr) for correct mem management 2018-06-09 21:25:59 +02:00
CwTCwT
9d2a1ca047 rereworked suggested by clang 2018-06-09 21:12:05 +02:00
CwTCwT
19fade2164 travis changes according clang 5.0 2018-06-09 20:57:32 +02:00
CwTCwT
09825d8d03 again travis hit me 2018-06-09 20:42:02 +02:00
CwTCwT
96bc2d3146 changes according travis compiles 2018-06-09 20:22:59 +02:00
CwTCwT
2c2b76a2bb changes according travis build 2018-06-09 16:47:05 +02:00
CwTCwT
b8facc5dae changed to coding convention 2018-06-09 15:56:26 +02:00
CwTCwT
85b0026c92 issue_1973
added support for CustomData(Layer) to support multiple (texture) UV mappings
added unittest with sample model
2018-06-09 15:45:09 +02:00
Sebastian Maisch
fbdb4b17fd Merge branch 'force_generate_normals'
# solved Conflicts:
#	code/GenFaceNormalsProcess.cpp
#	code/GenVertexNormalsProcess.cpp
2018-06-04 10:51:12 +02:00
Kim Kulling
a2a7877939 Merge branch 'master' into make_tools 2018-06-04 09:12:11 +02:00
microm8
87315883b5 Merge branch 'master' into master 2018-06-04 08:17:50 +02:00
Doron Adler
d86a0e3adb Merge branch 'master' into ios-build-script
* master:
  LWOMaterial: Fix strict aliasing violations
  3DS: Fix strict aliasing violations
  Fix strict aliasing violation in MaterialSystem
  Replace type punning with explicit memcpys
  Update FBXConverter.cpp
  Update Readme.md
  FBX: LayeredTextures now work with embedded texture data
  [pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3
  [pyassimp] Updated setup.py
  Properly reads in glTF/2.0 sampler address modes.
  does not access undefined memory area anymore.
2018-06-03 14:25:36 +03:00
Sebastian Maisch
f15dcf7663 Added forced generation of normals with extra flag. 2018-06-01 17:32:02 +02:00
microm8
9064c983ad Merge branch 'master' into master 2018-06-01 13:42:35 +02:00