Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,556 Commits 19 Branches 43 Tags
e5eb00d8d366c63e08ee6fcdd0691ba214764ab2
Commit Graph

6556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Kim Kulling
19844d0cec Merge pull request #2189 from gongminmin/FixTwoSided 
Fix the wrong results when calling aiGetMaterialInteger on bool type properties, such as AI_MATKEY_TWOSIDED
 2018-10-22 21:48:07 +02: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
Kim Kulling
4d3ce0fed2 Merge pull request #2185 from gongminmin/FixShininess 
Make gltf2's roughnessAsShininess matches between importer and exporter.
 2018-10-17 20:17:44 +02: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
Kim Kulling
12629b3f3b Merge pull request #2175 from assimp/step-import 
Step import
 2018-10-09 19:18:39 +02:00
Kim Kulling
b340c5f2e8 Merge branch 'master' into step-import 2018-10-09 17:35:44 +02:00
Kim Kulling
f26019aa8a Update utglTF2ImportExport.cpp 
disable unused test.
 2018-10-09 16:27:48 +02:00
Kim Kulling
c3e6a01397 Merge pull request #2148 from arkeon7/Manage_PCloud_in_Filters 
Allow findDegenerate and SplitLargeMesh to pass point clouds models.
 2018-10-09 16:14:58 +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
f6f36a1ccf Update utglTF2ImportExport.cpp 
Disable test until bug is fixed.
 2018-10-09 11:55:37 +02:00
Kim Kulling
4cca83f733 fix unittest. 2018-10-08 21:07:40 +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
01921ee81f Retrigger unittest 2018-10-08 20:40:01 +02:00
Kim Kulling
f8d8a43a35 Merge pull request #2172 from matt77hias/C4267 
Fix: C4267 conversion warning
 2018-10-08 20:33:17 +02:00
Kim Kulling
e1247e81e1 Update utglTF2ImportExport.cpp 
Check scene pointer against nullptr.
 2018-10-08 14:53:33 +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
Kim Kulling
65c07613ea Merge pull request #2174 from Wasabi375/patch-1 
ReadFieldPtrVector should return true when successful
 2018-10-07 20:31:10 +02:00
Kim Kulling
92f69affd9 StepFile: Working parser. 2018-10-07 19:22:13 +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
3ac4494393 Merge pull request #2173 from Gargaj/patch-1 
Fix Blender FOV loading (fixes #1854)
 2018-10-07 18:16:16 +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
Kim Kulling
07e22fd3fc Merge pull request #2171 from matt77hias/C4244 
Fix: C4244 conversion warning
 2018-10-07 15:56:53 +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
Kim Kulling
e45e4dc736 Merge pull request #2170 from matt77hias/patch-1 
Refactored "../Include/" includes
 2018-10-07 01:38:30 +02:00
Matthias Moulin
be9ed7a8d3 Merge branch 'master' into C4267 2018-10-06 22:17:56 +02:00
Matthias Moulin
0d14cdea2d Merge branch 'master' into C4244 2018-10-06 22:17:33 +02:00
Kim Kulling
5d58c3a0d5 Merge branch 'master' into patch-1 2018-10-06 21:38:06 +02:00
Kim Kulling
97cca1562a Merge pull request #2169 from assimp/kimkulling-patch-2 
Update Build.md
 2018-10-06 20:56:11 +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
716205fde0 Replaced "../Include/" include from irrXMLWrapper.h 2018-10-06 15:22:10 +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