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

3312 Commits

Author SHA1 Message Date
Marco Di Benedetto
b0ac2d9daf Merge https://github.com/assimp/assimp 2018-02-24 17:06:12 +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
375dd4c179 Update D3MFImporter.cpp 
Fix order of init list.
 2018-02-23 20:34:34 +01:00
Kim Kulling
437ae0c839 Merge branch 'master' into 3mf_basematerial_support 2018-02-23 18:29:54 +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
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
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
a92dbabc25 Update FileSystemFilter.h 
Fix missing save.
 2018-02-20 16:36:55 +01:00
Kim Kulling
7c33d932e3 Merge branch 'master' into master 2018-02-20 10:40:04 +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
5f4539db28 Merge branch 'master' into issue_1773 2018-02-19 22:55:11 +01:00
Kim Kulling
b9a34dbc50 Merge branch 'master' into globalscale-registry 2018-02-19 20:19:17 +01:00
Kim Kulling
f78f273916 Merge branch 'master' into issue_1773 2018-02-19 15:54:46 +01:00
Tommy
1de9b3232a Silence a clang warning. 2018-02-19 15:04:46 +01:00
Tommy
95f66f84ef Remove constexpr for MSVC. 2018-02-19 14:33:40 +01:00
Tommy
242b5d5874 Initial FBX Export Support, sponsored by MyDidimo (mydidimo.com). 
Supports:
 * mesh data with normals and uvs
 * lambert and phong materials
 * file textures
 * bones / skeletons
 * skinning

Does not yet support:
 * animations
 * cameras
 * lights
 * embedded textures
 2018-02-19 13:53:55 +01:00
Kim Kulling
219702597f Merge branch 'master' into develop_kimkulling 2018-02-19 11:47:41 +01:00
Kim Kulling
8950504cf0 Fix import of materials. 2018-02-18 21:30:23 +01:00
Giuseppe Barbieri
58436068e7 Update BlenderScene.cpp 2018-02-16 22:16:10 +01:00
Kim Kulling
1b53c26943 Merge branch 'master' into globalscale-registry 2018-02-15 18:04:38 +01:00
Martin Buchner
a7587cb526 Merge branch 'master' into issue_1773 2018-02-15 15:31:41 +01:00
Kim Kulling
ccbcaa2ee8 fix some static-analysis findings. 2018-02-13 20:36:22 +01:00
Kim Kulling
cdfe33e3f2 Merge branch 'master' into pbrmaterial_h 2018-02-13 19:17:18 +01:00
Kim Kulling
4fb0e85d9d Merge branch 'master' into issue_1773 2018-02-13 14:45:14 +01:00
Sergio Acereda
9a7611a93e AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h 2018-02-12 22:33:51 +01:00
Kim Kulling
331e67c32d 3mf: introduce first prototype for basematerial support. 2018-02-12 22:07:12 +01:00
Sergio Acereda
8a4fd2f947 globalScale process not registered 2018-02-12 21:51:40 +01:00
Kim Kulling
78173177e8 closes https://github.com/assimp/assimp/issues/1564: remove copy constructor. 2018-02-12 21:45:47 +01:00
mbuchner
1299905026 Make FileSystemFilter forward all virtual functions to wrapped IOSystem instance 
This makes it possible to override those functions. Previously the
default implementation was always used.

Fixes #1773
 2018-02-12 12:13:44 +01:00
Giuseppe Barbieri
f00d450d25 Update BlenderDNA.inl 2018-02-11 17:43:49 +01:00
Marco Di Benedetto
c874fd8ae2 changed std::to_string to to_string. 2018-02-09 16:18:49 +01:00
Marco Di Benedetto
affedc139e Merge https://github.com/assimp/assimp 2018-02-09 15:54:34 +01:00
Turo Lamminen
ebdad4f883 Ogre: Avoid creating function-scoped static constants 
They're causing false positive race condition messages from Helgrind
 2018-02-09 15:40:28 +02:00
Kim Kulling
4e4098f1fc Merge branch 'master' into issue_567 2018-02-08 20:29:47 +01:00
Kim Kulling
674a47dd3e closes https://github.com/assimp/assimp/issues/567: prevend dependency cycle 2018-02-08 20:24:18 +01:00
Kim Kulling
c7ea536351 closes https://github.com/assimp/assimp/issues/1386: fix undefined behaviour in compare function. 2018-02-07 20:21:05 +01:00
Max Vollmer
990dc983ed Issue #1776 Fixed potential crash bug in ObjectCompare, because it didn't follow strict weak ordering. As counter-intuitive as it seems, a comparator must return false for equal values. The C++ standard defines and expects this behavior: true if lhs < rhs, false otherwise. 2018-02-07 10:48:39 +01:00
Kim Kulling
277fa2da93 Merge branch 'master' into memleaks 2018-02-07 00:38:23 +01:00
Kim Kulling
57c1fe5954 x-parser: fix the crash. 2018-02-06 23:59:46 +01:00
Giuseppe Barbieri
4736160b79 Update BlenderDNA.h 2018-02-06 22:36:37 +01:00