Commit Graph

6877 Commits

Author SHA1 Message Date
Kim Kulling
850d57b39d closes https://github.com/assimp/assimp/issues/2206: make bone error in verification more verbose. 2018-11-08 22:12:05 +01:00
Kim Kulling
044c9b39e0 Merge branch 'master' into patch-2 2018-11-08 22:00:33 +01:00
mnml_
d5c9b27af8 delete[] doesnt set nullptr 2018-11-08 12:49:35 +01:00
mnml_
97450fcb55 added DropFaceNormalsProcess to out vector 2018-11-08 11:44:44 +01:00
kimkulling
ad237f1949 MD5-Loader: set meshnames. 2018-11-02 17:02:36 +01:00
haroonq
d1af9526b1 Update glTF2Importer.cpp 2018-11-01 10:52:39 -07:00
haroonq
e205399052 Update glTF2Importer.cpp 2018-11-01 09:01:19 -07:00
haroonq
69abac59d2 Update glTF2Exporter.cpp 2018-11-01 08:49:06 -07:00
Kim Kulling
b33054e05a Merge branch 'master' into glt2anim 2018-10-30 15:51:08 +01:00
Kim Kulling
b8e1207b13 Merge branch 'master' into master 2018-10-30 12:43:15 +01:00
kkulling
dc591f5c07 Merge branch 'patch-1' of https://github.com/ihmc3jn09hk/assimp into ihmc3jn09hk-patch-1 2018-10-30 10:44:40 +01:00
haroonq
04c6d8347b Update glTF2Exporter.cpp 2018-10-29 15:23:26 -07:00
haroonq
bc80652ae9 Update glTF2Exporter.cpp 2018-10-29 15:04:48 -07:00
haroonq
e5eb00d8d3 Update glTF2Importer.cpp 2018-10-29 14:53:33 -07:00
haroonq
7b9f4a66de Update glTF2Exporter.cpp 2018-10-29 14:52:41 -07:00
Haroon Qureshi
bfe1dc2914 Merge branch 'glt2anim' of https://github.com/haroonq/assimp into glt2anim 2018-10-29 14:46:52 -07:00
Haroon Qureshi
acad9a06e9 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-29 14:44:29 -07:00
Kim Kulling
c465040738 Update DropFaceNormalsProcess.cpp
Fix typo.
2018-10-29 16:58:02 +01:00
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