Commit Graph

5853 Commits

Author SHA1 Message Date
Kim Kulling
7c8e49522b Merge pull request #1839 from loebl/doc/expand_description_about_embedded_textures
Expand the current documentation about loading of embedded textures
2018-03-21 23:56:21 +01:00
Kim Kulling
53e4e653a8 Merge branch 'master' into doc/expand_description_about_embedded_textures 2018-03-21 23:07:02 +01:00
Kim Kulling
2e38f59aca Merge pull request #1847 from assimp/kimkulling-documentationfixes
Update Readme.md
2018-03-21 23:06:36 +01:00
Kim Kulling
a531e4f35b Merge branch 'master' into kimkulling-documentationfixes 2018-03-21 22:11:32 +01:00
Kim Kulling
e2f1587516 Merge pull request #1844 from assimp/develop_kimkulling
Develop kimkulling
2018-03-21 22:11:19 +01:00
Kim Kulling
e01e77a6c7 Merge branch 'master' into develop_kimkulling 2018-03-21 21:20:28 +01:00
Kim Kulling
efd4a6c371 Update Readme.md
- Fix broken link
- Update list with supported importers + exporters
2018-03-21 20:31:04 +01:00
Kim Kulling
03e67a38f1 Merge pull request #1841 from TransformAndLighting/master
fixed empty buffer stream write, removed some cast warnings.
2018-03-21 20:27:05 +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
290dd28c98 Merge pull request #1842 from assimp/3mf_basematerial_support
3mf basematerial support
2018-03-20 20:32:58 +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
9febb392d8 Merge pull request #1843 from assimp/issue_1796
https://github.com/assimp/assimp/issues/1796: return correct value on…
2018-03-20 16:13:31 +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
3bcef7ed8f Metadata: add test for copying metadata via copy constructor. 2018-03-20 14:09:52 +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
Kim Kulling
1025b15045 Merge branch 'master' into doc/expand_description_about_embedded_textures 2018-03-20 08:12:33 +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
3390185270 Merge pull request #1837 from gonchar/master
Support Maya 2018 Collada Export
2018-03-18 23:34:09 +01:00
Kim Kulling
f7854e4b32 Merge branch 'master' into master 2018-03-18 20:56:25 +01:00
Kim Kulling
14df0e1bd7 Merge pull request #1829 from JeffH-BMG/patch-3
Add support for texture file in PLY exports
2018-03-18 20:55:58 +01:00
Kim Kulling
6843b7a00c Merge branch 'master' into patch-3 2018-03-18 17:44:21 +01:00
Daniel Löber
ef2343506b Expand the current description about loading of embedded textures 2018-03-16 11:17:28 +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
9444935ce8 Merge pull request #1834 from assimp/issue_1120
closes https://github.com/assimp/assimp/issues/1120: use euler angles…
2018-03-14 21:54:37 +01: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
58e73143fc Merge pull request #1832 from assimp/3mf_basematerial_support
3mf basematerial support
2018-03-13 22:51:23 +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
20c817bc36 Update utD3MFImportExport.cpp
Fix compiler warning: unused var.
2018-03-13 19:42:06 +01:00
Kim Kulling
18e9aa13d6 fix vs2017-compiler-warning c4002: tr1 is deprecated. 2018-03-13 19:15:56 +01:00
Kim Kulling
f857d72dbb add roundtrip test for 3mf. 2018-03-13 18:56:47 +01: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
beaadf55df Merge pull request #1828 from JeffH-BMG/patch-2
STL binary Export should write 4-byte floats for vertex and normal co…
2018-03-10 15:48:32 +01:00
Kim Kulling
336a09ee0e add material reference to faces. 2018-03-09 23:35:12 +01:00