Commit Graph

  • 0c035f131d Merge branch 'master' into issue-1219 Edward Andrew 2018-04-02 14:39:13 +01:00
  • 4d662c42b3 Add check for SSE2-support. Kim Kulling 2018-04-02 10:27:05 +02:00
  • 00e2e60b67 Merge pull request #1860 from wanadev/gltf2-duplicated-textures Kim Kulling 2018-04-02 10:24:34 +02:00
  • 35f4e7101a Fixed issue#1219. CalcTangentsProcess::ProcessMesh. Edward Andrew 2018-04-02 01:46:14 +01:00
  • c24c1a7802 Merge branch 'master' into gltf2-duplicated-textures Kim Kulling 2018-04-01 19:48:50 +02:00
  • 61fe3e52ce Merge pull request #1867 from assimp/issue_1831 Kim Kulling 2018-04-01 19:25:36 +02:00
  • 0624eb0e08 Merge branch 'master' into gltf2-duplicated-textures A. Breust 2018-04-01 18:09:14 +02:00
  • c4f5377793 Merge branch 'master' into issue_1831 Kim Kulling 2018-04-01 17:43:48 +02:00
  • c7a683ddaf Merge pull request #1858 from mesilliac/fbx_export_ascii Kim Kulling 2018-04-01 17:43:24 +02:00
  • 04c65ccdcb closes https://github.com/assimp/assimp/issues/1831: make config CMAKE_LIBRARY_CONFIG overridable. Kim Kulling 2018-04-01 17:16:14 +02:00
  • d17047cfd1 Merge branch 'master' into fbx_export_ascii Kim Kulling 2018-04-01 17:00:42 +02:00
  • b9b433d47b Merge pull request #1865 from assimp/develop_kimkulling Kim Kulling 2018-04-01 17:00:28 +02:00
  • 676e1c9565 Cmake: adapt cmake script for VS2017 Kim Kulling 2018-03-31 19:12:53 +02:00
  • 417c4fcb45 Cmake: remove dead code. Kim Kulling 2018-03-31 18:53:00 +02:00
  • dbf32abfb2 Build: use c++11 in openddl-parser as well. Kim Kulling 2018-03-31 18:51:31 +02:00
  • 7ac245f933 Merge pull request #1864 from assimp/issue_1855 Kim Kulling 2018-03-31 18:42:47 +02:00
  • c9bb3592ff FBX-Importer: remove unused lookup tables for nodes. Kim Kulling 2018-03-31 18:10:29 +02:00
  • f3cc2f79fc FBX-Importer: remove unused lookup table. Kim Kulling 2018-03-31 17:30:31 +02:00
  • 2a5728b4c3 FBX-Importer: fix usage of deprecated include. Kim Kulling 2018-03-31 17:25:29 +02:00
  • c97fb99435 closes https://github.com/assimp/assimp/issues/1855: fix correction of node names. Kim Kulling 2018-03-31 16:37:39 +02:00
  • 9539659c60 Merge pull request #1859 from mesilliac/assimp_cmd_better_info_hierarchy Kim Kulling 2018-03-31 09:24:01 +02:00
  • 21b518e350 use memset to allow VS compiler aoowweenn 2018-03-31 14:44:18 +08:00
  • 1ea7230785 Handle materials with texture id < 0 aoowweenn 2018-03-31 14:06:26 +08:00
  • 04d70dc76d adjust encoding to fit the new utf8 library aoowweenn 2018-03-31 13:29:42 +08:00
  • 5e4f7ee24b Merge branch 'master' into assimp_cmd_better_info_hierarchy Kim Kulling 2018-03-30 18:23:00 +02:00
  • 557466a9ac Merge pull request #1861 from assimp/issue_1836 Kim Kulling 2018-03-30 18:19:22 +02:00
  • 4919d3da2f closes https://github.com/assimp/assimp/issues/1836: make documentation much more clear how to apply global scaling. Kim Kulling 2018-03-30 16:58:11 +02:00
  • 26ac2ffb6c Not duplicating textures for embedded ones Alexis Breust 2018-03-29 15:52:05 +02:00
  • a7c5dae345 Merge branch 'master' into assimp_cmd_better_info_hierarchy Kim Kulling 2018-03-29 14:45:43 +02:00
  • 5ad2582317 Merge pull request #1857 from mesilliac/fbx_export_animation Kim Kulling 2018-03-29 14:45:10 +02:00
  • 070acfbadd FBX Export: relax bindpose matrix check slightly. Tommy 2018-03-29 14:29:02 +02:00
  • 39d9878429 FBX Export: use ai_snprintf. Tommy 2018-03-29 13:10:41 +02:00
  • 4a4b9cd31b assimp_cmd: prettier and better-compressed node hierarchy. Tommy 2018-03-29 12:38:56 +02:00
  • 4b2120ab56 FBX Export: fix for geometric transform nodes with multiple children. Tommy 2018-03-29 10:45:23 +02:00
  • 0dad1d0c04 FBX Export: fix Texture_Alpha_soutce typo. Tommy 2018-03-29 01:46:59 +02:00
  • 826243f289 Implement ascii FBX export. Tommy 2018-03-28 21:40:26 +02:00
  • e549705af0 StreamWriter: add a PutChar method to write a single char. Tommy 2018-03-28 21:38:22 +02:00
  • aadb413fc0 Explicit handling of an FBXExportNode edge-case. Tommy 2018-03-28 16:09:07 +02:00
  • 00277d93f2 Tidier FBXExportNode construction with properties. Tommy 2018-03-28 15:47:27 +02:00
  • 2e5055efbc Merge branch 'master' into fbx_export_animation Kim Kulling 2018-03-27 21:44:06 +02:00
  • e972b73fc2 FBX Export: tidy includes Tommy 2018-03-27 13:29:03 +02:00
  • ee0cdb3954 FBX Export: Tidy animation export code. Tommy 2018-03-27 13:03:10 +02:00
  • 57bd125839 FBX Export: implement basic animation export. Tommy 2018-03-26 18:30:47 +02:00
  • 359f54f6ca Merge pull request #1856 from mesilliac/unit_test_gcc_warnings_fix Kim Kulling 2018-03-26 21:50:54 +02:00
  • 2dff6e2d5b FBXExportProperty: implement float and long array properties. Tommy 2018-03-26 18:27:15 +02:00
  • 15e9907340 Address some gcc warnings about signed / unsigned comparison. Tommy 2018-03-26 11:25:32 +02:00
  • 72800bf072 Merge pull request #1827 from JeffH-BMG/patch-1 Kim Kulling 2018-03-23 20:38:09 +01:00
  • d810446bb2 Merge branch 'master' into patch-1 Kim Kulling 2018-03-23 19:43:58 +01:00
  • b256adaa38 Merge pull request #1852 from assimp/issue_1527 Kim Kulling 2018-03-23 19:42:02 +01:00
  • 666e224359 Merge branch 'master' into issue_1527 Kim Kulling 2018-03-22 23:57:30 +01:00
  • be4c780115 Update FBXMeshGeometry.cpp Kim Kulling 2018-03-22 23:08:25 +01:00
  • d81078eddd Merge pull request #1849 from cloudwu/fixmingw Kim Kulling 2018-03-22 23:03:53 +01:00
  • 13ae0a0ac3 FBX: fix parse error for uv-coordinates. Kim Kulling 2018-03-22 22:14:10 +01:00
  • c9a0f1afac Merge branch 'master' into fixmingw Kim Kulling 2018-03-22 21:57:15 +01:00
  • c697d51d88 Merge pull request #1851 from assimp/issue_1850 Kim Kulling 2018-03-22 21:56:43 +01:00
  • 349d877899 Update CMakeLists.txt Kim Kulling 2018-03-22 21:28:52 +01:00
  • 6c21a30958 closes https://github.com/assimp/assimp/issues/1850: remove buggy setup in cmake. Kim Kulling 2018-03-22 20:07:47 +01:00
  • 376586b164 Merge branch 'master' into patch-1 JeffH-BMG 2018-03-22 13:09:32 -04:00
  • cad11df039 Fix mingw compilation Cloud Wu 2018-03-22 16:54:12 +08:00
  • 7c8e49522b Merge pull request #1839 from loebl/doc/expand_description_about_embedded_textures Kim Kulling 2018-03-21 23:56:21 +01:00
  • 53e4e653a8 Merge branch 'master' into doc/expand_description_about_embedded_textures Kim Kulling 2018-03-21 23:07:02 +01:00
  • 2e38f59aca Merge pull request #1847 from assimp/kimkulling-documentationfixes Kim Kulling 2018-03-21 23:06:36 +01:00
  • a531e4f35b Merge branch 'master' into kimkulling-documentationfixes Kim Kulling 2018-03-21 22:11:32 +01:00
  • e2f1587516 Merge pull request #1844 from assimp/develop_kimkulling Kim Kulling 2018-03-21 22:11:19 +01:00
  • e01e77a6c7 Merge branch 'master' into develop_kimkulling Kim Kulling 2018-03-21 21:20:28 +01:00
  • efd4a6c371 Update Readme.md Kim Kulling 2018-03-21 20:31:04 +01:00
  • 03e67a38f1 Merge pull request #1841 from TransformAndLighting/master Kim Kulling 2018-03-21 20:27:05 +01:00
  • af3bba1572 fix review findings. Kim Kulling 2018-03-20 23:38:08 +01:00
  • 4ae7298489 Update DefaultIOSystem.cpp Kim Kulling 2018-03-20 21:59:45 +01:00
  • 1a887a64c1 Update EmbedTexturesProcess.cpp Kim Kulling 2018-03-20 21:56:26 +01:00
  • b01594f6a8 Update EmbedTexturesProcess.cpp Kim Kulling 2018-03-20 21:52:42 +01:00
  • 339e33303e Update DefaultIOSystem.cpp Kim Kulling 2018-03-20 20:39:15 +01:00
  • d0edb94208 Update D3MFImporter.cpp Kim Kulling 2018-03-20 20:38:03 +01:00
  • f898f40486 Merge branch 'master' into master Kim Kulling 2018-03-20 20:33:17 +01:00
  • 290dd28c98 Merge pull request #1842 from assimp/3mf_basematerial_support Kim Kulling 2018-03-20 20:32:58 +01:00
  • 5814e6f9f0 Optimize some std::string usages. Kim Kulling 2018-03-20 18:43:54 +01:00
  • 6600446e2c Merge branch 'master' into ios-build-script Doron Adler 2018-03-20 18:04:20 +02:00
  • 2d7ece4ce7 Merge branch 'master' into 3mf_basematerial_support Kim Kulling 2018-03-20 16:14:25 +01:00
  • 9febb392d8 Merge pull request #1843 from assimp/issue_1796 Kim Kulling 2018-03-20 16:13:31 +01:00
  • 643cf9bea2 Norod: Brought back 32bit archs Doron Adler 2018-03-20 17:09:50 +02:00
  • e36f78482c https://github.com/assimp/assimp/issues/1796: return correct value on detach logger. Kim Kulling 2018-03-20 14:53:57 +01:00
  • e668b97453 Merge branch 'master' into 3mf_basematerial_support Kim Kulling 2018-03-20 14:12:00 +01:00
  • 317f3e2a59 3MF: Export metadata. Kim Kulling 2018-03-20 14:10:08 +01:00
  • 3bcef7ed8f Metadata: add test for copying metadata via copy constructor. Kim Kulling 2018-03-20 14:09:52 +01:00
  • b66bee8d79 Export: Copy metadata to be able to export it properly. Kim Kulling 2018-03-20 14:09:07 +01:00
  • c1f6683b20 Partial revert, build only 64bit targets Doron Adler 2018-03-20 14:45:54 +02:00
  • c2f22be99a Norod: Default build type is set as Release, no shared libraries Doron Adler 2018-03-20 13:46:03 +02:00
  • ef12eb84bb 3MF: add metadata import. Kim Kulling 2018-03-20 10:09:47 +01:00
  • 1025b15045 Merge branch 'master' into doc/expand_description_about_embedded_textures Kim Kulling 2018-03-20 08:12:33 +01:00
  • e2e09ba2fa Norod: Support building assimp as dylib for iOS (set as default) Doron Adler 2018-03-19 22:51:52 +02:00
  • 9d813a48b0 fixed emply buffer stream write, removed some cast warnings. Marco Di Benedetto 2018-03-19 18:22:27 +01:00
  • 4841ee05c5 Merge branch 'master' into patch-1 JeffH-BMG 2018-03-19 10:29:43 -04:00
  • 14a1b9980e Norod: Do not attempt to look for Qt5Widgets when building for iOS Norod: Toolchain files get their SDKVER, DEVROOT and SDKROOT values from build.sh Norod: Removed deprecated CMAKE_FORCE_ Norod: Build shared libs is now set-able from a flag, so to be more extendable later Norod: .gitignore updated Doron Adler 2018-03-19 15:49:16 +02:00
  • 3ca6b10810 Norod: Set IOS_SDK_VERSION to the latest based on xcodebuild sdk version Norod:Set XCODE_ROOT_DIR based on xcode-select's --print-path Doron Adler 2018-03-19 13:17:18 +02:00
  • 3390185270 Merge pull request #1837 from gonchar/master Kim Kulling 2018-03-18 23:34:09 +01:00
  • f7854e4b32 Merge branch 'master' into master Kim Kulling 2018-03-18 20:56:25 +01:00
  • 14df0e1bd7 Merge pull request #1829 from JeffH-BMG/patch-3 Kim Kulling 2018-03-18 20:55:58 +01:00
  • 6843b7a00c Merge branch 'master' into patch-3 Kim Kulling 2018-03-18 17:44:21 +01:00
  • ef2343506b Expand the current description about loading of embedded textures Daniel Löber 2018-03-16 11:17:28 +01:00
  • 2d980c16f0 Support Maya 2018 Collada Export with blendshapes and bones controllers for a mesh Sergey Gonchar 2018-03-15 21:41:40 -07:00