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

5908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
A. Breust
0624eb0e08 Merge branch 'master' into gltf2-duplicated-textures 2018-04-01 18:09:14 +02:00
Kim Kulling
c7a683ddaf Merge pull request #1858 from mesilliac/fbx_export_ascii 
Ascii FBX Export
 2018-04-01 17:43:24 +02:00
Kim Kulling
d17047cfd1 Merge branch 'master' into fbx_export_ascii 2018-04-01 17:00:42 +02:00
Kim Kulling
b9b433d47b Merge pull request #1865 from assimp/develop_kimkulling 
Develop kimkulling
 2018-04-01 17:00:28 +02:00
Kim Kulling
676e1c9565 Cmake: adapt cmake script for VS2017 2018-03-31 19:12:53 +02:00
Kim Kulling
417c4fcb45 Cmake: remove dead code. 2018-03-31 18:53:00 +02:00
Kim Kulling
dbf32abfb2 Build: use c++11 in openddl-parser as well. 2018-03-31 18:51:31 +02:00
Kim Kulling
7ac245f933 Merge pull request #1864 from assimp/issue_1855 
closes https://github.com/assimp/assimp/issues/1855: fix correction o…
 2018-03-31 18:42:47 +02:00
Kim Kulling
c9bb3592ff FBX-Importer: remove unused lookup tables for nodes. 2018-03-31 18:10:29 +02:00
Kim Kulling
f3cc2f79fc FBX-Importer: remove unused lookup table. 2018-03-31 17:30:31 +02:00
Kim Kulling
2a5728b4c3 FBX-Importer: fix usage of deprecated include. 2018-03-31 17:25:29 +02:00
Kim Kulling
c97fb99435 closes https://github.com/assimp/assimp/issues/1855: fix correction of node names. 2018-03-31 16:37:39 +02:00
Kim Kulling
9539659c60 Merge pull request #1859 from mesilliac/assimp_cmd_better_info_hierarchy 
assimp_cmd: prettier and better-compressed node hierarchy
 2018-03-31 09:24:01 +02:00
Kim Kulling
5e4f7ee24b Merge branch 'master' into assimp_cmd_better_info_hierarchy 2018-03-30 18:23:00 +02:00
Kim Kulling
557466a9ac Merge pull request #1861 from assimp/issue_1836 
closes https://github.com/assimp/assimp/issues/1836: make documentati…
 2018-03-30 18:19:22 +02:00
Kim Kulling
4919d3da2f closes https://github.com/assimp/assimp/issues/1836: make documentation much more clear how to apply global scaling. 2018-03-30 16:58:11 +02:00
Alexis Breust
26ac2ffb6c Not duplicating textures for embedded ones 2018-03-29 15:52:05 +02:00
Kim Kulling
a7c5dae345 Merge branch 'master' into assimp_cmd_better_info_hierarchy 2018-03-29 14:45:43 +02:00
Kim Kulling
5ad2582317 Merge pull request #1857 from mesilliac/fbx_export_animation 
Basic animation support in FBX export
 2018-03-29 14:45:10 +02:00
Tommy
070acfbadd FBX Export: relax bindpose matrix check slightly. 
Apparently +/- 1e-5 is too strict.
 2018-03-29 14:29:02 +02:00
Tommy
39d9878429 FBX Export: use ai_snprintf. 2018-03-29 13:10:41 +02:00
Tommy
4a4b9cd31b assimp_cmd: prettier and better-compressed node hierarchy. 
Also removed line and nesting limits.
It's better to show all the info than to silently discard some.
With the new compressed display, it is far less obtrusive anyway.
 2018-03-29 12:59:35 +02:00
Tommy
4b2120ab56 FBX Export: fix for geometric transform nodes with multiple children. 2018-03-29 10:45:23 +02:00
Tommy
0dad1d0c04 FBX Export: fix Texture_Alpha_soutce typo. 2018-03-29 01:47:31 +02:00
Tommy
826243f289 Implement ascii FBX export. 
It's available under the 'fbxa' format id.
 2018-03-29 01:44:32 +02:00
Tommy
e549705af0 StreamWriter: add a PutChar method to write a single char. 2018-03-28 21:38:22 +02:00
Tommy
aadb413fc0 Explicit handling of an FBXExportNode edge-case. 2018-03-28 16:09:07 +02:00
Tommy
00277d93f2 Tidier FBXExportNode construction with properties. 2018-03-28 15:47:27 +02:00
Kim Kulling
2e5055efbc Merge branch 'master' into fbx_export_animation 2018-03-27 21:44:06 +02:00
Tommy
e972b73fc2 FBX Export: tidy includes 2018-03-27 13:29:03 +02:00
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