Cloud Wu
cad11df039
Fix mingw compilation
2018-03-22 16:54:12 +08:00
Kim Kulling
e01e77a6c7
Merge branch 'master' into develop_kimkulling
2018-03-21 21:20:28 +01:00
Kim Kulling
af3bba1572
fix review findings.
2018-03-20 23:38:08 +01:00
Kim Kulling
4ae7298489
Update DefaultIOSystem.cpp
...
fix typo
2018-03-20 21:59:45 +01:00
Kim Kulling
1a887a64c1
Update EmbedTexturesProcess.cpp
...
Fix typo.
2018-03-20 21:56:26 +01:00
Kim Kulling
b01594f6a8
Update EmbedTexturesProcess.cpp
...
Replace c-cast by static_cast.
2018-03-20 21:52:42 +01:00
Kim Kulling
339e33303e
Update DefaultIOSystem.cpp
...
Use static_cast instead of int.
2018-03-20 20:39:15 +01:00
Kim Kulling
d0edb94208
Update D3MFImporter.cpp
...
Use static cast instead of c-cast.
2018-03-20 20:38:03 +01:00
Kim Kulling
f898f40486
Merge branch 'master' into master
2018-03-20 20:33:17 +01:00
Kim Kulling
5814e6f9f0
Optimize some std::string usages.
2018-03-20 18:43:54 +01:00
Kim Kulling
2d7ece4ce7
Merge branch 'master' into 3mf_basematerial_support
2018-03-20 16:14:25 +01:00
Kim Kulling
e36f78482c
https://github.com/assimp/assimp/issues/1796 : return correct value on detach logger.
2018-03-20 14:53:57 +01:00
Kim Kulling
e668b97453
Merge branch 'master' into 3mf_basematerial_support
2018-03-20 14:12:00 +01:00
Kim Kulling
317f3e2a59
3MF: Export metadata.
2018-03-20 14:10:08 +01:00
Kim Kulling
b66bee8d79
Export: Copy metadata to be able to export it properly.
2018-03-20 14:09:07 +01:00
Kim Kulling
ef12eb84bb
3MF: add metadata import.
2018-03-20 10:09:47 +01:00
Marco Di Benedetto
9d813a48b0
fixed emply buffer stream write, removed some cast warnings.
2018-03-19 18:22:27 +01:00
Kim Kulling
f7854e4b32
Merge branch 'master' into master
2018-03-18 20:56:25 +01:00
Kim Kulling
6843b7a00c
Merge branch 'master' into patch-3
2018-03-18 17:44:21 +01:00
Sergey Gonchar
2d980c16f0
Support Maya 2018 Collada Export with blendshapes and bones controllers for a mesh
2018-03-15 21:41:40 -07:00
Kim Kulling
5cf6509fb5
closes https://github.com/assimp/assimp/issues/1120 : use euler angles for pre- and post-rotation.
2018-03-14 20:42:42 +01:00
Kim Kulling
4c023c3818
fix unittest folder for roundtriptest.
2018-03-13 21:40:23 +01:00
JeffH-BMG
546ad1c1bd
Merge branch 'master' into patch-3
2018-03-13 15:19:14 -04:00
Kim Kulling
6b9add5594
fix compiler warning fr 64 bit
2018-03-13 18:19:10 +01:00
Kim Kulling
f11d4902c6
fix CanRead-method for the 3MF-Importer.
2018-03-13 17:50:34 +01:00
Kim Kulling
c5c0052a6c
Merge branch '3mf_basematerial_support' of https://github.com/assimp/assimp into 3mf_basematerial_support
2018-03-12 22:28:53 +01:00
Kim Kulling
c7ac32f891
fix naming readout + export.
2018-03-12 22:28:00 +01:00
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
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
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
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
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