Commit Graph

5755 Commits (c7ac32f891a16cc49fcca9b656feec75c116de76)

Author SHA1 Message Date
Kim Kulling c7ac32f891 fix naming readout + export. 2018-03-12 22:28:00 +01:00
Kim Kulling c8ae0bbb3d 3MF: fix model folder desc. 2018-03-11 20:15:49 +01:00
Kim Kulling 017b7d1a2f 3MF: add missig tags for meta data. 2018-03-11 20:15:25 +01:00
Kim Kulling 336a09ee0e add material reference to faces. 2018-03-09 23:35:12 +01:00
Kim Kulling 6668eeb68e Fix possible nullptr dereferencing. 2018-03-09 19:03:05 +01:00
Kim Kulling 69742670dd 3mf: use correct material assignment in case of multi-materials. 2018-03-09 11:40:45 +01:00
Kim Kulling 54ca88b466
Merge pull request #1817 from assimp/fix_tokencheck_for_inmemoryread
BaseImporter: fix lookup for tokens during inmemory imports.
2018-02-27 20:27:33 +01:00
Kim Kulling d53f958011 unittest: fix compiler warning 2018-02-27 18:56:07 +01:00
Kim Kulling c0f04bf965 IMporter: fix lookup for tokens during inmemory imports. 2018-02-27 18:30:36 +01:00
Kim Kulling a0465a1349
Merge pull request #1814 from assimp/cppcheck_fixes
fix cppcheck findings.
2018-02-26 18:24:00 +01:00
Kim Kulling e99dfdb050 fix cppcheck findings. 2018-02-25 21:03:09 +01:00
Kim Kulling 66e200d735
Merge pull request #1812 from mydidimo/fbx_export_skeleton_improvements
Fbx export skeleton improvements
2018-02-25 17:15:38 +01:00
Tommy 9d9acf6840 FBX Export: allow export even when not in bind pose,
iff all bones have an offset matrix defined.
2018-02-25 11:45:38 +01:00
Tommy ce7673979b assimp_cmd export: print error message on failure. 2018-02-25 10:10:07 +01:00
Tommy 249f1844ae FBX Export: reconstruct full skeleton for any FBX deformers. 2018-02-25 09:53:09 +01:00
Kim Kulling 9287adb735
Merge pull request #1804 from mydidimo/fbx_export_squashed
Initial FBX Export Support, sponsored by MyDidimo.
2018-02-24 11:24:57 +01:00
Tommy a9d70b2dbc FBX Import: properly delete inverse geotrans nodes when not using them. 2018-02-24 09:37:36 +01:00
Tommy c18a07e47f FBX Import: Properly clean up post_nodes_chain in case of exception. 2018-02-24 08:43:36 +01:00
Tommy b91976eead FBX Export: handle newly-added geometric transform inverse nodes.
This also tidies up the imported node structure a little,
by not adding the inverse nodes if there are no child nodes.
2018-02-24 08:42:05 +01:00
Kim Kulling 5e4b2b898f
Merge branch 'master' into fbx_export_squashed 2018-02-23 23:33:43 +01:00
Kim Kulling 0b5d83fa95
Merge pull request #1803 from mesilliac/moffsetmatrix_documentation
Fix aiBone->mOffsetMatrix documentation, which was incorrect.
2018-02-23 23:32:40 +01:00
Kim Kulling bdb3a73486
Merge branch 'master' into moffsetmatrix_documentation 2018-02-23 21:13:35 +01:00
Kim Kulling f11f35d157
Merge pull request #1793 from assimp/3mf_basematerial_support
3mf: introduce first prototype for basematerial support.
2018-02-23 21:13:04 +01:00
Kim Kulling 375dd4c179
Update D3MFImporter.cpp
Fix order of init list.
2018-02-23 20:34:34 +01:00
Kim Kulling d00c4a54e6
Update fast_atof.h
fix typo
2018-02-23 18:59:38 +01:00
Kim Kulling 437ae0c839
Merge branch 'master' into 3mf_basematerial_support 2018-02-23 18:29:54 +01:00
Kim Kulling 259fd2df2d
Merge pull request #1805 from assimp/develop_kimkulling
Update FileSystemFilter.h
2018-02-23 18:27:29 +01:00
Kim Kulling 9c663e9630 fast_a_to_f: add some brackets. 2018-02-23 18:14:46 +01:00
Kim Kulling 606a28dbe8
Merge branch 'master' into develop_kimkulling 2018-02-23 17:54:58 +01:00
Kim Kulling 1d901f075c 3mf-importer: fix parsing of base-material color. 2018-02-23 17:49:29 +01:00
Kim Kulling c7dc63af8a
Merge pull request #1806 from mesilliac/fbx_geometric_transforms_fix
FBX geometric transforms fix
2018-02-22 20:47:09 +01:00
Tommy f847d4817d FBX Export: fix logic for determining if scale transformation is identity.
Previously it was comparing scale.SquareLength() to 1.0.
2018-02-21 15:29:59 +01:00
Tommy c1f353f6c7 FBX Export: Geometric transformations always create transformation chain.
In combination with fb213e4b, this fixes #1112.
2018-02-21 14:15:03 +01:00
Kim Kulling 50b6c63594
Merge branch 'master' into develop_kimkulling 2018-02-21 13:31:32 +01:00
Kim Kulling 22dbb6c2d2
Update FileSystemFilter.h
- Fix typo.
-test in public metod against invalid parameters
2018-02-21 13:10:51 +01:00
Tommy a8fc22fd3f assimp_cmd: Add --verbose flag to 'info' command, to print node transforms. 2018-02-21 12:57:45 +01:00
Tommy fb213e4bac FBX Importer: apply inverse of geometric transform to child nodes. 2018-02-21 12:45:09 +01:00
Kim Kulling 7cd1a66c8b Use correct lookup. 2018-02-20 22:08:40 +01:00
Kim Kulling 7c2f7c02ab
Merge branch 'master' into moffsetmatrix_documentation 2018-02-20 17:53:22 +01:00
Kim Kulling a92dbabc25
Update FileSystemFilter.h
Fix missing save.
2018-02-20 16:36:55 +01:00
Kim Kulling c97d19fd6f
Merge pull request #1802 from elect86/master
Typos + bug
2018-02-20 13:59:31 +01:00
Kim Kulling 7c33d932e3
Merge branch 'master' into master 2018-02-20 10:40:04 +01:00
Kim Kulling 222c7b7d51
Merge pull request #1735 from Rohansi/fix-paint3d-vertexcolor
Interpret IndexToDirect as Direct when the index element is missing
2018-02-20 10:39:34 +01:00
Kim Kulling d49c5b6ecf
Merge branch 'master' into fix-paint3d-vertexcolor 2018-02-20 09:23:53 +01:00
Kim Kulling a84604f566
Merge branch 'master' into develop_kimkulling 2018-02-20 09:04:11 +01:00
Kim Kulling f0ccff70a4
Update FileSystemFilter.h
Fix review findings
2018-02-20 09:03:18 +01:00
Kim Kulling 18539ef1ad
Merge pull request #1790 from mabuchner/issue_1773
Make FileSystemFilter forward all functions to wrapped IOSystem instances
2018-02-20 08:54:27 +01:00
Kim Kulling 5f4539db28
Merge branch 'master' into issue_1773 2018-02-19 22:55:11 +01:00
Kim Kulling d9af87d52a
Merge pull request #1792 from sacereda/globalscale-registry
globalScale process not registered
2018-02-19 22:54:46 +01:00
Kim Kulling b9a34dbc50
Merge branch 'master' into globalscale-registry 2018-02-19 20:19:17 +01:00