Commit Graph
6309 Commits
Author SHA1 Message Date
d 6d1dee606a integrated DropFaceNormals process (cmake, poststepregistry) 2018-10-29 16:26:50 +01:00
d 95c0deaaff added DropFaceNormals process 2018-10-29 16:23:11 +01:00
Haroon Qureshi 57d3d71b6e Add support for importing GLTF2 animations.
Refactors the glTF2 internal classes to more closely reflect the structure
of the actual GLTF2 file format. Adds implementations for reading skins
and animations from GLTF2 files into those structures.

Also provides implementations for converting skins and animations from GLTF
into assimp data structures.  Special handling is required for bone weights
since assimp stores vertex-weights-per-bone whereas GLTF2 stores
bone-weights-per-vertex.  Only supports keyframed LINEAR animation data;
STEP and CUBICSPLINE is not currently supported.
2018-10-26 15:39:28 -07:00
ihmc3jn09hk 9a86714265 Merge branch 'master' into patch-1 2018-10-21 14:18:02 +08:00
Minmin Gong df1669d07e Fix the wrong results when calling aiGetMaterialInteger on bool type properties, such as AI_MATKEY_TWOSIDED. 2018-10-20 17:00:27 -07:00
Minmin Gong 248f6c3aa1 Make gltf2's roughnessAsShininess matches between importer and exporter.
In glTF2Exporter, roughnessFactor = 1 - normalizedShininess = 1 - someFunc(sqrt(shininess / 1000)). But in gltf2Importer, roughnessAsShininess = (1 - roughnessFactor) * 1000. No sqr there. So if save a shininess to a gltf2 and load it back, the value changed. This fix add a square to importer to make sure the consistency.
2018-10-16 21:17:35 -07:00
ihmc3jn09hk 05b5930b29 Amended the "Key" for the database ReadField
Amended the key "flags" -> "flag". The field key("flags") was not matching the key("flag") in the BlendDNA. It was annoying during debug mode since the exception prompt for the mismatching and.
2018-10-16 00:25:44 +08:00
Kim Kulling b340c5f2e8 Merge branch 'master' into step-import 2018-10-09 17:35:44 +02:00
Kim Kulling ed43c48e93 Update SplitLargeMeshes.cpp
Fix double-parthesis.
2018-10-09 15:34:44 +02:00
Kim Kulling d166e1fd73 Merge branch 'master' into Manage_PCloud_in_Filters 2018-10-09 11:56:39 +02:00
Kim Kulling 27c9461aad Update SplitLargeMeshes.cpp
Fix typo.
2018-10-09 11:56:30 +02:00
Kim Kulling 1c672f4c9d Update SplitLargeMeshes.cpp
Fix clang compile error ( unneeded enum parhesis ) and fix some minor findings.
2018-10-08 21:06:48 +02:00
Kim Kulling 871e1524e4 Update IFCLoader.cpp
Remove dead code.
2018-10-08 14:51:50 +02:00
Kim Kulling 931ef2cd0b StepFile: fix conversion from ulong to uint. 2018-10-07 21:15:09 +02:00
Kim Kulling 2e443dc669 Merge branch 'master' into C4267 2018-10-07 20:31:41 +02:00
Burkhard Mittelbach afbdb043b0 ReadFieldPtrVector should return true when successful 2018-10-07 19:11:34 +02:00
Kim Kulling 4c5c172ee2 Merge branch 'master' into C4267 2018-10-07 18:16:44 +02:00
Kim Kulling e84ccaea15 Merge branch 'master' into step-import 2018-10-07 16:22:32 +02:00
Gargaj 16bdac5c9e Merge branch 'master' into patch-1 2018-10-07 16:04:11 +02:00
Gargaj 6af016d149 Fix Blender FOV loading 2018-10-07 15:34:44 +02:00
Kim Kulling c355412348 Merge branch 'master' into C4244 2018-10-07 14:29:39 +02:00
Matthias Moulin c90eda983d Fix: C4267 2018-10-06 16:31:58 +02:00
Matthias Moulin b4425d8e36 Fix: C4267 2018-10-06 16:30:38 +02:00
Matthias Moulin e7da1c634d Fix: C4244 conversion warning 2018-10-06 16:28:10 +02:00
Matthias Moulin 239c59d715 Fixed include: IFCReaderGen_4 instead of IFCReaderGen4 2018-10-06 16:12:58 +02:00
Matthias Moulin 88c173a6f4 Replaced "../Include/" include from glTFAsset.h 2018-10-06 15:20:28 +02:00
Matthias Moulin 47fcbfd369 Replaced "../Include/" include from glTF2Asset.h 2018-10-06 15:19:56 +02:00
Matthias Moulin 7061493ead Replaced "../Include/" include from HMPFileData.h 2018-10-06 15:16:40 +02:00
Matthias Moulin d7bcd58174 Replaced "../Include/" include from MD4FileData.h 2018-10-06 15:15:43 +02:00
Matthias Moulin 8bb4b57d1d Replaced "../Include/" include from HMPFileData.h 2018-10-06 15:11:47 +02:00
Matthias Moulin 91a805a082 Update HalfLifeFileData.h 2018-10-06 15:05:18 +02:00
Matthias Moulin 463a7e8016 Replaced "../Include/" include from MD3FileData.h 2018-10-06 15:02:58 +02:00
Matthias Moulin 99fc989af7 Replaced "../Include/" include from MDLFileData.h 2018-10-06 15:01:42 +02:00
Matthias Moulin d9a7ed19a8 Replaced "../Include/" include from 3DSHelper.h 2018-10-06 14:59:20 +02:00
Matthias Moulin 531f30302f Replaced "../Include/" include from 3DSHelper.h 2018-10-06 14:58:06 +02:00
Matthias Moulin d4b0cd53ea Replaced "../Include/" include from FBXDocumentUtil.h 2018-10-06 14:55:20 +02:00
Kim Kulling 619e09fbec Stepfile: separate generated code. 2018-10-06 08:45:55 +02:00
Kim Kulling 106b139ef3 Stepfile: renaming first generated code. 2018-10-05 19:42:26 +02:00
Kim Kulling aceaecaed7 StepFile: introduce generated parser code. 2018-10-05 19:41:52 +02:00
dormon b43cf92337 Improved cmake configs for Windows and Linux.
Now the configs follows the standard cmake-package code: see https://cmake.org/cmake/help/v3.12/manual/cmake-packages.7.html

Downstreamer no longer have to manually specify target_include_directories with ${ASSIMP_INCLUDE_DIRS}, target_link_libraries with ${ASSIMP_LIBRARY_DIRS} and so on.

Downstreamer can now use:
find_package(assimp CONFIG REQUIRED)
target_link_libraries(AWESOME_APP PUBLIC assimp::assimp)
and everything should work.

Added assimpTargets.cmake.in
Added assimpTargets-debug.cmake.in
Added assimpTargets-release.cmake.in
Modified CMakeLists.txt
Modified code/CMakeLists.txt - added ALIAS assimp::assimp

Tested on Ubuntu 18.04 and Windows 10
2018-09-30 17:18:18 +02:00
Kim Kulling 35374e777b Merge branch 'step-import' of https://github.com/assimp/assimp into step-import 2018-09-28 18:02:54 +02:00
Kim Kulling 3249409243 Some minor findings. 2018-09-28 18:02:49 +02:00
kimkulling 4003309e7a StepFile: prepare code gen. 2018-09-28 17:06:03 +02:00
kkulling e38629613c Merge branch 'master' into step-import 2018-09-28 15:59:27 +02:00
Kim Kulling 50a95ad0f2 Merge branch 'master' into migenius-rsws52 2018-09-27 01:04:44 +02:00
Kim Kulling 2dc572167c Merge branch 'master' into issue_2154 2018-09-26 22:13:29 +02:00
Kim Kulling 35a727a3e4 closes https://github.com/assimp/assimp/issues/2154: remove redundant file from source folder. 2018-09-26 21:37:02 +02:00
Kim Kulling 74db0e906b Fix some minor findings. 2018-09-26 21:19:40 +02:00
Kim Kulling ea0f074933 Merge branch 'kimmi_dev' of https://github.com/assimp/assimp into kimmi_dev 2018-09-26 20:53:37 +02:00
Kim Kulling 9c8e6f2127 Fix overflow by face allocation. 2018-09-26 20:52:59 +02:00