Commit Graph

5978 Commits (78d04c137d4a7ddb04f0a4cd9e7640fb475883fd)

Author SHA1 Message Date
Tommy ee0cdb3954 FBX Export: Tidy animation export code. 2018-03-27 13:12:15 +02:00
Tommy 57bd125839 FBX Export: implement basic animation export. 2018-03-27 11:45:03 +02:00
Kim Kulling 359f54f6ca
Merge pull request #1856 from mesilliac/unit_test_gcc_warnings_fix
Address some gcc warnings about signed / unsigned comparison.
2018-03-26 21:50:54 +02:00
Tommy 2dff6e2d5b FBXExportProperty: implement float and long array properties. 2018-03-26 18:27:15 +02:00
Tommy 15e9907340 Address some gcc warnings about signed / unsigned comparison. 2018-03-26 11:25:32 +02:00
Kim Kulling 72800bf072
Merge pull request #1827 from JeffH-BMG/patch-1
Fix import of binary STL files in double-precision builds
2018-03-23 20:38:09 +01:00
Kim Kulling d810446bb2
Merge branch 'master' into patch-1 2018-03-23 19:43:58 +01:00
Kim Kulling b256adaa38
Merge pull request #1852 from assimp/issue_1527
FBX: fix parse error for uv-coordinates.
2018-03-23 19:42:02 +01:00
Kim Kulling 666e224359
Merge branch 'master' into issue_1527 2018-03-22 23:57:30 +01:00
Kim Kulling be4c780115
Update FBXMeshGeometry.cpp
Fix build.
2018-03-22 23:08:25 +01:00
Kim Kulling d81078eddd
Merge pull request #1849 from cloudwu/fixmingw
Fix mingw compilation
2018-03-22 23:03:53 +01:00
Kim Kulling 13ae0a0ac3 FBX: fix parse error for uv-coordinates. 2018-03-22 22:14:10 +01:00
Kim Kulling c9a0f1afac
Merge branch 'master' into fixmingw 2018-03-22 21:57:15 +01:00
Kim Kulling c697d51d88
Merge pull request #1851 from assimp/issue_1850
closes https://github.com/assimp/assimp/issues/1850: remove buggy set…
2018-03-22 21:56:43 +01:00
Kim Kulling 349d877899
Update CMakeLists.txt
Remove dead code.
2018-03-22 21:28:52 +01:00
Kim Kulling 6c21a30958 closes https://github.com/assimp/assimp/issues/1850: remove buggy setup in cmake. 2018-03-22 20:07:47 +01:00
JeffH-BMG 376586b164
Merge branch 'master' into patch-1 2018-03-22 13:09:32 -04:00
Cloud Wu cad11df039 Fix mingw compilation 2018-03-22 16:54:12 +08:00
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
JeffH-BMG 4841ee05c5
Merge branch 'master' into patch-1 2018-03-19 10:29:43 -04: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