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

6578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
escherstair
deb9eb974b Update appveyor.yml 2018-11-08 13:40:04 +01:00
escherstair
b47739cfb8 build AppVeyor clang_on_Windows branch 2018-11-08 11:47:09 +01:00
escherstair
e97d07ce82 add clang to pushpack1.h 2018-11-08 09:25:48 +01:00
Kim Kulling
2d74514eab Merge pull request #2201 from assimp/MD5-Meshnames 
MD5-Loader: set meshnames.
 2018-11-02 21:30:10 +01:00
kimkulling
ad237f1949 MD5-Loader: set meshnames. 2018-11-02 17:02:36 +01:00
Kim Kulling
ada2950525 Merge pull request #2191 from haroonq/glt2anim 
Add support for importing GLTF2 animations.
 2018-11-02 16:28:41 +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
8c15a35609 Merge pull request #2194 from daef/master 
Added DropFaceNormals process
 2018-10-30 15:11:15 +01:00
Kim Kulling
b8e1207b13 Merge branch 'master' into master 2018-10-30 12:43:15 +01:00
Kim Kulling
0714e544b7 Merge pull request #2197 from assimp/ihmc3jn09hk-patch-1 
Ihmc3jn09hk patch 1
 2018-10-30 12:42:42 +01:00
kkulling
182bc8a759 Merge branch 'ihmc3jn09hk-patch-1' 2018-10-30 10:45:01 +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
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
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
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
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
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