Commit Graph

  • 069dbe6e9c CMake: Fix compatibility check for so-version of the assimp lib. Kim Kulling 2017-04-06 16:32:17 +02:00
  • 76feb4e7bd Merge pull request #1221 from mhereman/bugfix/clang_4.0 Kim Kulling 2017-04-03 12:49:00 +02:00
  • 8f3aaa88f9 Fixed compiler error on clang 4.0 running on OSX Maarten Heremans 2017-04-03 11:07:43 +02:00
  • ea102e226d Merge pull request #1220 from andre-schulz/fix-pdb-install-relwithdebinfo Kim Kulling 2017-04-01 22:14:55 +02:00
  • 0f6782df27 Fix PDB file installation in RelWithDebInfo configuration Andre Schulz 2017-04-01 16:03:01 +02:00
  • 0145eb866e fixed cmake typo preventing use of assimp as submodule in builds that prohibit in-source changes Galen Cochrane 2017-03-31 07:56:49 -06:00
  • 9f3154a5f3 Setup: Fix setup-script. Kim Kulling 2017-03-30 21:15:51 +02:00
  • dfff37f724 X3D: add working example. Kim Kulling 2017-03-29 21:13:44 +02:00
  • 6d71e4d5d7 Config.h.in: fix typo. Kim Kulling 2017-03-29 21:08:40 +02:00
  • 55595a7d18 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-03-29 20:56:55 +02:00
  • 29b5d075e2 Closes https://github.com/assimp/assimp/issues/1205: fix typo in docu. Kim Kulling 2017-03-29 20:56:30 +02:00
  • 1ab85f16ff Merge pull request #1217 from Kai-W/master Kim Kulling 2017-03-28 17:06:06 +02:00
  • 23c70c901e Update Readme.md Kim Kulling 2017-03-28 14:06:31 +02:00
  • 57dad9940e Update Readme.md Kim Kulling 2017-03-28 13:42:32 +02:00
  • 8accf5b386 3MF: reformattings. Kim Kulling 2017-03-28 00:35:56 +02:00
  • 6c73cc8aff Added ComponentType Unsigned int and Error handling Part of GLTF 2.0 changes Kai Westerkamp 2017-03-27 17:22:49 +02:00
  • 0a8966a3e6 add .pmx sample aoowweenn 2017-03-27 23:17:48 +08:00
  • 7bd3242563 comment out override specifier aoowweenn 2017-03-27 22:49:58 +08:00
  • 51dae22828 merge master and adjust assimp/DefaultIOSystem.h aoowweenn 2017-03-27 22:35:19 +08:00
  • 8cd0d3b3c7 change std::make_unique to mmd::make_unique aoowweenn 2017-03-27 22:16:19 +08:00
  • b3089a5f33 Merge branch 'master' into coverity_scan Kim Kulling 2017-03-26 15:03:25 +02:00
  • ccf2bce2b0 correct offset matrix aoowweenn 2017-03-24 15:45:50 +08:00
  • 59b48fb960 finish skin controller aoowweenn 2017-03-24 14:39:34 +08:00
  • 968612fea1 testing2 aoowweenn 2017-03-24 12:04:40 +08:00
  • 63485bdd26 Merge pull request #1214 from assimp/issue_1211 Kim Kulling 2017-03-23 20:36:01 +01:00
  • 1ca54c0b2f closes https://github.com/assimp/assimp/issues/1211: defensice handling of utf-8 decode issues. Kim Kulling 2017-03-23 17:11:52 +01:00
  • 314bb451bb testing weights, still strange aoowweenn 2017-03-23 16:30:01 +08:00
  • f10f2f5814 Almost finish vertex weghts aoowweenn 2017-03-23 04:33:53 +08:00
  • 1c525a9365 Merge pull request #1208 from terziman/master Kim Kulling 2017-03-22 20:08:21 +01:00
  • 845d206959 Fill in mParent for each node in Assbin Loader aoowweenn 2017-03-22 21:11:17 +08:00
  • 5bf974ae3b keep writing dae skinning aoowweenn 2017-03-22 17:06:55 +08:00
  • eb8b00617a Merge pull request #1210 from rmitton/sib-normals Kim Kulling 2017-03-21 14:31:34 +01:00
  • e5a3038abd try to fill in vertex weights to dae exportor aoowweenn 2017-03-21 16:21:49 +08:00
  • d1c7d905e8 Fixed infinite loop on non-manifold geometry rmitton 2017-03-19 13:46:23 -07:00
  • 209e972762 Fixed faceted normals in SIB importer. rmitton 2017-03-18 14:52:48 -07:00
  • bf2e2f7537 Extended support for tessellation parameter to more IFC shapes Leo Terziman 2017-03-17 14:55:18 +01:00
  • d4ead31c18 Merge remote-tracking branch 'github/master' into contrib Leo Terziman 2017-03-17 12:13:52 +01:00
  • 9ef234b842 Added parameter to control cylindrical shapes tessellation + renamed smoothing angle parameter for better user understanding Leo Terziman 2017-03-17 11:58:50 +01:00
  • fff0e886a1 Fixed bug in IFC openings when curmesh.vertcnt is empty Leo Terziman 2017-03-17 11:53:36 +01:00
  • a182faacbf Merge pull request #1207 from Celli119/matrixOperators Kim Kulling 2017-03-17 09:33:41 +01:00
  • 78a58ef5f0 operators to add and multiply by floats girinon 2017-03-16 12:03:04 +01:00
  • 0eecff74d8 correct node hierarchy aoowweenn 2017-03-16 01:25:53 +08:00
  • a071e6ce94 Merge pull request #1204 from assimp/issue-1128 Kim Kulling 2017-03-14 19:55:21 +01:00
  • baafa63621 Unittests: add 3mf load test. Kim Kulling 2017-03-14 19:24:20 +01:00
  • 2cd6c3d755 Closes https://github.com/assimp/assimp/issues/1128: do not use non verbose format flag for import. Kim Kulling 2017-03-14 19:01:41 +01:00
  • 0231af4343 skeleton almost done aoowweenn 2017-03-14 02:01:26 +08:00
  • bb7f387bcf Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-03-11 22:13:48 +01:00
  • 43a3d2c539 Merge branch 'Lugdunum3D-fix-include-api' Kim Kulling 2017-03-11 18:29:31 +01:00
  • 1c6145b39e Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api Kim Kulling 2017-03-11 18:19:36 +01:00
  • 4450d77312 Merge pull request #1195 from assimp/cleanup_includes Kim Kulling 2017-03-11 18:11:10 +01:00
  • b47bfeb0d7 StringUtils: add the right missing header. Kim Kulling 2017-03-11 17:25:34 +01:00
  • 6179e22749 StringUtils: add missing include for VS2012 & 2013 Kim Kulling 2017-03-11 11:34:23 +01:00
  • bd33bcaa0d Fixed some formatting Leo Terziman 2017-03-10 14:46:28 +01:00
  • 8bc183182c Added new option to IFC importer to control tessellation angle + removed unused IFC option Leo Terziman 2017-03-10 14:42:17 +01:00
  • 2d3dd1d40f use SkeletonMeshBuilder to show bone positions. aoowweenn 2017-03-10 17:15:01 +08:00
  • bbd487308b Merge remote-tracking branch 'github/master' into contrib Leo Terziman 2017-03-09 17:28:47 +01:00
  • ba357e74d2 fix the exporter of the qt viewer aoowweenn 2017-03-08 21:13:54 +08:00
  • 143f91d541 Unittests: fix version test. Kim Kulling 2017-03-08 10:54:12 +01:00
  • b725d7dbf5 Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes Kim Kulling 2017-03-08 10:27:57 +01:00
  • 3bd9efa82c Cleanup_includes: fix linux build. Kim Kulling 2017-03-08 09:55:44 +01:00
  • c0c480a4cb fixup! merge master and mv FindDevIL to cmake-modules aoowweenn 2017-03-05 23:36:36 +08:00
  • 83db3fc084 fixup! remove dependency of ICU library aoowweenn 2017-03-05 23:14:21 +08:00
  • 7226d73682 merge master and mv FindDevIL to cmake-modules aoowweenn 2017-03-05 23:07:06 +08:00
  • 34906071fc remove dependency of ICU library aoowweenn 2017-03-05 22:59:53 +08:00
  • 8d27945619 Merge branch 'master' into cleanup_includes Kim Kulling 2017-03-05 15:15:29 +01:00
  • e6dcad384a Fix missing includes. Kim Kulling 2017-03-05 15:05:40 +01:00
  • 0c0ca403b5 Convert to OpenGL space by three processes. aoowweenn 2017-03-05 20:40:41 +08:00
  • d402825d03 Merge pull request #1194 from Sailsman63/fixbuild Kim Kulling 2017-03-02 16:47:37 +01:00
  • 7a25f5ac25 finish UV texture aoowweenn 2017-03-02 23:16:29 +08:00
  • 951f51a066 Import FindPkgMacros to main CMake Configuration Lucas Stanek 2017-03-02 03:12:47 +00:00
  • 8dd137cb3f Merge pull request #1193 from murashin/fix-for-freebsd Kim Kulling 2017-03-01 12:52:52 +01:00
  • ea72b06c21 Update Readme.md Kim Kulling 2017-03-01 09:53:36 +01:00
  • 191936a339 Update Readme.md Kim Kulling 2017-03-01 09:53:15 +01:00
  • ffc95162ec fix for FreeBSD Shin-ya Murakami 2017-03-01 16:30:03 +09:00
  • e89c29a9cc finish vertex aoowweenn 2017-03-01 13:52:46 +08:00
  • a38b2fb10f Merge pull request #1191 from Lugdunum3D/feature-importers-whitelist Kim Kulling 2017-03-01 00:34:10 +01:00
  • 5c45b408d0 Merge pull request #1189 from Lugdunum3D/fix-android-asset-extraction Kim Kulling 2017-03-01 00:21:32 +01:00
  • 9a0a74ef1f Merge pull request #1190 from Lugdunum3D/fix-buildsystem-minizip Kim Kulling 2017-03-01 00:15:12 +01:00
  • 574c192575 Merge pull request #1186 from astillich/ase_cface Kim Kulling 2017-03-01 00:12:12 +01:00
  • f312d8709e More cleanup Kim Kulling 2017-02-28 16:37:07 +01:00
  • 5dd1bb9d6c Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/ Antoine Bolvy 2017-02-27 21:31:56 -05:00
  • d77989088c Allow to enable importers in a whitelist manner Antoine Bolvy 2017-02-27 21:32:44 -05:00
  • 18a12a4a47 Fix encoding in names (partially revert ecbf09e) Antoine Bolvy 2017-02-27 18:43:46 -05:00
  • 4495162f5f Fix new lines problem Antoine Bolvy 2017-02-27 18:28:59 -05:00
  • cf68e03b21 Creates the directory for the asset's extraction on Android Quentin01 2017-02-27 17:24:44 +09:00
  • 125d2ab955 Disable pkg-config on Android, and use the existing macro for minizip Antoine Bolvy 2017-02-27 18:23:39 -05:00
  • 22896f7fec Merge pull request #1187 from assimp/issue-1169 Kim Kulling 2017-02-27 22:52:53 +01:00
  • a75eb86af4 Issue-1169: fix clang build. Kim Kulling 2017-02-27 21:59:50 +01:00
  • 4d92c01933 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-02-27 20:19:42 +01:00
  • 7a47f1f8f7 Issue-1183: add stp to the list of supported extensions for step-files. Kim Kulling 2017-02-27 20:11:59 +01:00
  • e80d3aa9d4 finish mesh creation UMW 2017-02-27 21:02:58 +08:00
  • 0700dfe711 Fixed parsing ASE MESH_CFACE Alexander Stillich 2017-02-25 23:30:41 +01:00
  • 4045466f73 pass through but panic aoowweenn 2017-02-24 08:35:15 +08:00
  • 5e2c846ca0 Remove unused header. Kim Kulling 2017-02-22 17:22:23 +01:00
  • ef540f46a3 Remove unused headers. Kim Kulling 2017-02-22 17:20:26 +01:00
  • c3bb2b66ac Merge pull request #1181 from assimp/issue_1169 Kim Kulling 2017-02-21 17:29:49 +01:00
  • 0f3731ab20 Issue-1169: add a unittest. Kim Kulling 2017-02-21 17:12:22 +01:00
  • d43d9368f2 Issue-1169: fix travis build. Kim Kulling 2017-02-21 11:17:09 +01:00
  • 695439fad0 Issue-1169: fix [] operator of vector3. Kim Kulling 2017-02-21 10:58:27 +01:00
  • 2afeddd5cb Merge pull request #1180 from JonAllee/Memory-Fix Kim Kulling 2017-02-13 20:57:25 +01:00