Commit Graph

3951 Commits

Author SHA1 Message Date
Kim Kulling
a3ad45f3b3 Merge branch 'master' into 3mf_basematerial_support 2018-03-11 20:16:40 +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
JeffH-BMG
72280463c2 Merge branch 'master' into patch-3 2018-03-09 14:40:30 -05:00
JeffH-BMG
f7469df871 Merge branch 'master' into patch-2 2018-03-09 14:40:16 -05:00
JeffH-BMG
c539dfe7a2 Merge branch 'master' into patch-1 2018-03-09 14:38:54 -05:00
Kim Kulling
6668eeb68e Fix possible nullptr dereferencing. 2018-03-09 19:03:05 +01:00
Kim Kulling
2ca2e7e355 Merge branch 'master' into fbx_export_footer_tweak 2018-03-09 18:11:56 +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
56f9069eb5 Merge branch 'master' into blender_fbx_opacity_fix 2018-03-09 08:30:23 +01:00
Kim Kulling
7f04b4dd43 Merge branch 'master' into fix/issue623 2018-03-09 00:04:28 +01:00
JeffH-BMG
cfd56a43a5 Fix compile error
Fixed bad cast.
2018-03-07 18:24:38 -05:00
JeffH-BMG
89a4cf9495 Respond to comments
Use memcpy() to read normals and vertices, to mitigate alignment issues, per comments.
2018-03-07 17:26:01 -05:00
Kim Kulling
af8839a8b5 Merge branch 'master' into fbx_export_footer_tweak 2018-03-07 19:44:38 +01:00
Tommy
9f02c8a97c Fix default opacity of materials exported to FBX by Blender. 2018-03-07 09:15:08 +01:00
JeffH-BMG
6fd64b95c3 Fix compile error
Add parens to use of 'sizeof' operator
2018-03-06 15:03:44 -05:00
JeffH-BMG
5ea06e1bb6 Add support for texture file in PLY exports
The PLY format has an unofficial way to specify an associated texture, using the "comment TextureFile"  comment line. The PLY loader supports this, but the exporter does not. The change looks for a diffuse texture in the scene's materials, and if it finds one, it adds it to the exported mesh using "comment TextureFile".
2018-03-06 14:50:02 -05:00
JeffH-BMG
0dab5c508e STL binary Export should write 4-byte floats for vertex and normal coordinates
The STL binary format uses 4-byte floats. When using double-precision builds of Asset Importer, the STL exporter was writing out 8-byte double values instead..
2018-03-06 13:55:32 -05:00
JeffH-BMG
05cf8bfb2e Fix import of binary STL files in double-precision builds
When ASSIMP_DOUBLE_PRECISION is used, the STL loader attempts to read 8-byte double vertex and normal values from the STL file. STL files are written using 4-byte floats, however, and the import will read past the end of the buffer, and possibly crash.
2018-03-06 13:48:11 -05:00
Daniel Kirchner
f4c37fa245 Collada: add importer property that forces the use of collada names. Closes #1375. 2018-03-06 00:30:33 +01:00
Kim Kulling
5312ec806e Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g 2018-03-05 18:19:36 +01:00
Kim Kulling
22182a907e Merge branch 'master' into master 2018-03-05 13:20:07 +01:00
Alexandre Avenel
15fa86f100 Set primitive_type to point when PLY is a point cloud 2018-03-04 22:43:20 +01:00
Alexandre Avenel
f053695176 Fix issue #623 PLY importer should not create faces
When the PLY file contains no faces, we should not create them.
2018-03-04 22:43:20 +01:00
Alexandre Avenel
d2547e84f5 Fix for undefined behavior when loading binary PLY
This commit fix undefined behavior reported by UBSAN when loading a binary
PLY file.
2018-03-04 22:04:31 +01:00
Tommy
701f9ccfe9 FBX Export: minor tweak to footer.
Should now be identical to those output by the FBX SDK.
2018-03-03 19:53:49 +01:00
Kim Kulling
8e7b7a0d87 Merge branch 'master' into master 2018-03-02 15:04:28 +01:00
Tommy
a58f8e1c1a FBX Export: add missing 0 value to file footer. 2018-02-28 23:38:49 +01:00
Josh Faust
f07d27eb07 Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g 2018-02-27 18:47:11 -08:00
Josh Faust
190190c1d7 Fix material index off-by-one error in some OBJ files (seen in a C4D export) 2018-02-27 14:58:04 -08:00
Kim Kulling
ef371bddd6 Merge branch 'master' into master 2018-02-27 18:34:34 +01:00
Kim Kulling
c0f04bf965 IMporter: fix lookup for tokens during inmemory imports. 2018-02-27 18:30:36 +01:00
Kim Kulling
e99dfdb050 fix cppcheck findings. 2018-02-25 21:03:09 +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
249f1844ae FBX Export: reconstruct full skeleton for any FBX deformers. 2018-02-25 09:53:09 +01:00
Marco Di Benedetto
72e9f3ecb9 fixed embedded texture reading. 2018-02-24 18:47:43 +01:00
Marco Di Benedetto
138b990d0a added missing install of pbrmaterial.h 2018-02-24 17:57:42 +01:00
Marco Di Benedetto
4b7cd97fea added support for embedded textures defined with buffer views. 2018-02-24 17:44:40 +01:00
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