v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,978 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

5978 Commits (78d04c137d4a7ddb04f0a4cd9e7640fb475883fd)

Author SHA1 Message Date
Kim Kulling a3cb1ef55e Merge branch 'master' into develop_kimkulling 2018-04-06 10:32:35 +02:00
Kim Kulling 40f5f19ce0
Merge branch 'master' into issue-1219 2018-04-05 15:24:40 +02:00
Kim Kulling 6403dc8012
Merge pull request #1879 from DMJC/master 
Updated GLView to draw with white lighting after drawCoordSystem().
 2018-04-05 15:24:01 +02:00
James Carthew 8cb25328cb committing all changes. 2018-04-05 17:50:30 +10:00
James Carthew 4254142575 Updated GLView to draw with white lighting after drawCoordSystem(). 2018-04-05 06:37:18 +10:00
Edward Andrew b8025d92fc
Merge branch 'master' into issue-1219 2018-04-04 21:12:52 +01:00
Kim Kulling 0e945b5581 Merge branch 'master' into develop_kimkulling 2018-04-04 16:32:46 +02:00
Kim Kulling c232c4bfb3 Add missing file to fix the build. 2018-04-04 16:32:18 +02:00
Kim Kulling 24880740aa
Merge pull request #1876 from DMJC/master 
Updated COB importer plugin to flip normals.
 2018-04-04 16:30:42 +02:00
James Carthew 6147a4f50d Updated COB importer plugin to flip normals. 2018-04-04 08:08:28 +10:00
Kim Kulling 06579e87f7
Merge pull request #1872 from asmaloney/asm_master 
Add links to some file format info in readme
 2018-04-03 09:58:35 +02:00
Andy Maloney 7faf638cca Add links to some file format info in readme 2018-04-02 14:41:02 -04:00
Edward Andrew 0c035f131d
Merge branch 'master' into issue-1219 2018-04-02 14:39:13 +01:00
Kim Kulling 4d662c42b3 Add check for SSE2-support. 2018-04-02 10:27:05 +02:00
Kim Kulling 00e2e60b67
Merge pull request #1860 from wanadev/gltf2-duplicated-textures 
[glTF2] Not duplicating embedded textures
 2018-04-02 10:24:34 +02:00
Edward Andrew 35f4e7101a Fixed issue#1219. CalcTangentsProcess::ProcessMesh. 2018-04-02 01:46:14 +01:00
Kim Kulling c24c1a7802
Merge branch 'master' into gltf2-duplicated-textures 2018-04-01 19:48:50 +02:00
Kim Kulling 61fe3e52ce
Merge pull request #1867 from assimp/issue_1831 
closes https://github.com/assimp/assimp/issues/1831: make config CMAK…
 2018-04-01 19:25:36 +02:00
A. Breust 0624eb0e08
Merge branch 'master' into gltf2-duplicated-textures 2018-04-01 18:09:14 +02:00
Kim Kulling c4f5377793
Merge branch 'master' into issue_1831 2018-04-01 17:43:48 +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 04c65ccdcb closes https://github.com/assimp/assimp/issues/1831: make config CMAKE_LIBRARY_CONFIG overridable. 2018-04-01 17:16:14 +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