Commit Graph

3611 Commits (07a8bac415e94077e4c9581d56b28f54c35f03a5)

Author SHA1 Message Date
Paul Arden e43e30b726 Slight rework for fix to issue #2046 to remove some duplicated code. 2018-07-05 09:49:08 +10:00
Paul Arden e7699ca585 Added support for non-indexed meshes in glTF importer. Addresses issue #2046. 2018-07-05 09:37:57 +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 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
Turo Lamminen b0b6048502 LWOMaterial: Fix strict aliasing violations 2018-06-01 12:37:21 +03:00
Turo Lamminen 6788d7b18b 3DS: Fix strict aliasing violations 2018-06-01 12:28:33 +03:00
Turo Lamminen bbb60c29f0 Fix strict aliasing violation in MaterialSystem 2018-06-01 12:20:16 +03:00
Michael Roer Pedersen b176513efa FBX export. to_ktime ticks was ok. 2018-06-01 09:24:53 +02:00
Kim Kulling 31e75b9d54
Update FBXConverter.cpp
Replaces a 0 by nullptr.
2018-05-31 20:18:17 +02:00
Kim Kulling 339cc2e951 Some review findings. 2018-05-31 20:15:13 +02:00
Michael Roer Pedersen fceeaa72f4 FBX animation export: Assimp animation time is already in seconds. Just convert to FBX time. 2018-05-31 15:07:00 +02:00
Tammo Hinrichs ffb6756d2a FBX: LayeredTextures now work with embedded texture data 2018-05-30 14:56:53 +02:00
Doron Adler 1ee9200277 smallerMax 2018-05-30 08:49:11 +03:00
Kim Kulling 1883d44b9b
Merge branch 'master' into master 2018-05-29 19:02:40 +02:00
Sebastian Maisch c6eda67296 Changed assimp to force regeneration of normals. 2018-05-29 13:01:11 +02:00
Doron Adler 27b989fd36 Merge branch 'master' into ios-build-script
* master: (148 commits)
  Update Importer.cpp
  [-] Trace print removed.
  [F] Get return "like true" when error occured.
  [*] qt_assimp_viewer can be built with Qt4 or Qt5. [F] Working in doule precision.
  [F] List of importers can be empty.
  [F] More correct control by a mouse
  [F] React on mouse pressing ig view only.
  [F] One alignment for labels. [-] Unused checkbox.
  [+] QtCreator temporary file.
  [*] Refactoring of "draw axes" procedure. [-] Removed not working part of code for reloading textures. That do nothing, just show checkbox. As Yoda said: "Do. Or do not. There is no try."
  [-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
  glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
  Fix GenVertexNormals
  [F] Wrong type in equation.
  [F] Uninitialized variables.
  Fix #1587 : add validation to LWS unit test
  Fix #1970: stl with empty solid
  Add test for issue 1970: STL with empty solid
  Add mesh name to ValidateDataStructure log
  Read and write the KHR_materials_unlit glTF/2.0 extension.
  ...

# Conflicts:
#	CMakeLists.txt
#	port/iOS/build.sh
2018-05-28 16:27:00 +03:00
Doron Adler 323d59c7aa Check for null 2018-05-28 16:12:54 +03:00
Kim Kulling bf7ec7d130
Merge branch 'master' into fix-vector-out-of-bound-access 2018-05-26 13:25:57 +02:00
Kim Kulling aa18e8a2a5
Update Importer.cpp
Make check more expressive.
2018-05-25 21:43:39 +02:00
smalcom 02d2b6e0d8 [F] Get return "like true" when error occured. 2018-05-25 21:30:59 +03:00
smalcom 5b23492421 Merge branch 'master' into qt_assimp_viewer 2018-05-25 21:20:03 +03:00
smalcom d72ff712cb [F] List of importers can be empty. 2018-05-25 21:16:08 +03:00
gstanlo 97cecc858a Properly reads in glTF/2.0 sampler address modes.
Assimp was returning glTF/2.0 values as address modes instead of aiTextureMapModes.
Also modified text glTF/2.0 model's sampler uv address modes to mirror/clamp respectively, and tests for them in the unit test.
2018-05-24 17:25:26 -07:00
Kim Kulling c4c22069e1
Merge branch 'master' into master 2018-05-24 14:38:50 +02:00
Matthias Möller e761f13c80 does not access undefined memory area anymore.
This will fix some Debuggers, which throw an exception, when accessing out-of-bound memory
2018-05-24 12:07:05 +02:00
smalcom 3861fb4ab5 Merge branch 'master' into qt_assimp_viewer 2018-05-24 12:36:59 +03:00
smalcom e201fcf4f4 [-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed. 2018-05-24 12:25:27 +03:00
gstanlo 0c07397720 glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified. 2018-05-22 17:32:12 -07:00
Adrian Mark Perez 7777883fe7 Fix GenVertexNormals 2018-05-22 13:55:36 -07:00
smalcom 8abcc454ad [F] Uninitialized variables. 2018-05-21 17:38:01 +03:00
Alexandre Avenel 84739fda0a Fix #1970: stl with empty solid
Log warning instead of stopping whole import.
2018-05-19 23:19:36 +02:00
Alexandre Avenel 6c0553d810 Add mesh name to ValidateDataStructure log 2018-05-19 23:19:25 +02:00
Stanlo Slasinski a1a17c1dda Read and write the KHR_materials_unlit glTF/2.0 extension. 2018-05-18 14:52:02 -07:00
Kim Kulling c788fff2b0
Merge branch 'master' into bug/exception-on-empty-mesh-after-degenerate-removal 2018-05-17 09:36:53 +02:00
Daniel Löber 9e80e18b1a Remove dead code 2018-05-16 11:10:48 +02:00
Daniel Löber 46ed73c768 Do not throw exception on empty mesh after removal of degenerates
Remove mesh instead. This keeps one edge case open: nodes without mesh
references. They are kept as it is for now (they may stilol contain
transformations and child references).
2018-05-16 11:06:06 +02:00
Alexandre Avenel 2879e0d6ef Fix typos on code using codespell 2018-05-13 16:35:03 +02:00
Kim Kulling e3548fe850
Update glTF2Exporter.h
Fix typo.
2018-05-12 08:50:17 +02:00
Kim Kulling 950496c351 some minor refactorings. 2018-05-12 08:39:22 +02:00
Kim Kulling f93ee9dace closes https://github.com/assimp/assimp/issues/1780: check against nullptr before accessing normal data in aiMesh instance. 2018-05-12 08:10:26 +02:00
Kim Kulling ef605fecaa FBX: small optimization to avoind static computation in loop. 2018-05-12 08:09:27 +02:00
Kim Kulling c08614bbff closes https://github.com/assimp/assimp/issues/919: add missing cast for vs2015. 2018-05-10 09:44:31 +02:00
Diego Lopes 700c85bbfb
_stat64 doesn't seem to exist. use __stat64!
Merely add an extra _ to the type name...
2018-05-08 13:01:56 -04:00
Kim Kulling f92d4edced
Merge branch 'master' into patch-1 2018-05-08 10:22:14 +02:00
Kim Kulling 948cf4d3cc
Merge branch 'master' into master 2018-05-07 21:32:13 +02:00
A. Breust 50c5f3cb58
Fixes DXF loader false positive on FBX file
A binary FBX file can have an header section `FBXHeaderVersion` which starts around the 70th byte.
Therefore, the token check for DXF file was hitting true because the `SearchFileHeaderForToken` is case insensitive.
We limit the scope of the token search to the first 32 bytes.
2018-05-07 15:16:32 +02:00
Kim Kulling ce11aa51f5 add win32-based make script. 2018-05-07 00:07:41 +02:00
Kim Kulling be0203229b
Merge branch 'master' into master 2018-05-06 16:41:12 +02:00
Kim Kulling 36c6ce7431
Merge branch 'master' into master 2018-05-06 12:29:21 +02:00
Eugene Barnett 908ef3e44a 1740 Issue - Enabling and Disabling importers
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT will be respected by the macro
--using local variable ASSIMP_IMPORTER_ENABLED to include or exclude
--an importer
-Fixes individual importer ex: set(ASSIMP_BUILD_FBX_IMPORTER OFF)

-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT is cached
--if assimp is a child cmake project, need to force cache
--from parent project
--ex: set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT CACHE INTERNAL FALSE)
2018-05-05 16:57:59 -04:00
Nicholas Woodfield 458a7ae801 Silencing compile warnings during build, all little stuff like uint to size_t or BOOL to bool. 2018-05-03 15:03:14 -04:00
Kim Kulling b759aa63a0
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2 2018-05-03 20:33:50 +02:00
Alexis Breust 4aaf7ad547 Added name to nodes 2018-05-03 11:07:39 +02:00
LoicFr a5791b66fe
Merge branch 'master' into master 2018-05-02 17:47:32 +02:00
LoicFr 99139e9c9e
Merge branch 'master' into master 2018-05-02 17:11:54 +02:00
kimkulling a0bf664695 closes code/SortByPTypeProcess.cpp: fix memory leak. 2018-05-02 16:42:22 +02:00
Loïc Fricoteaux ed86023016 Change glTF2 file extensions from gltf2/glb2 to gltf/glb in the exporter so that it matches the importer and respect the standard specifications 2018-05-02 16:13:17 +02:00
Kim Kulling 2acb513732
Merge branch 'master' into issue-1167 2018-05-02 15:45:52 +02:00