Commit Graph

  • 6e0810d3c1 clean up thomasbiang 2019-07-10 16:29:50 -07:00
  • cdf60d7423 customize error rate for bind pose thomasbiang 2019-07-10 16:27:59 -07:00
  • c889699d58 set->unordered_set;unsigned int for iteration thomasbiang 2019-07-10 09:51:20 -07:00
  • 9210ff37f2 fix group node being exported as bone node thomasbiang 2019-07-09 19:05:45 -07:00
  • c979b4060d Merge branch 'fix_export_custom_bindpose_error' of https://github.com/thomasbiang/assimp into fix_export_custom_bindpose_error ywang 2019-07-16 13:20:46 -07:00
  • 4ff4938df4 Merge remote-tracking branch 'upstream/master' into fix_export_custom_bindpose_error ywang 2019-07-16 13:17:04 -07:00
  • 2122dc231d Fix line continuations in OBJ files Merwan 2019-07-16 20:37:41 +02:00
  • 0accbb58f1 Merge branch 'master' into fix_export_custom_bindpose_error Kim Kulling 2019-07-16 16:03:09 +02:00
  • fed764d2a8 Merge pull request #2549 from assimp/issue_2548 Kim Kulling 2019-07-16 14:02:07 +02:00
  • c1670b6a97 closes https://github.com/assimp/assimp/issues/2548: check if weight are set or set the weight to 1.0f kimkulling 2019-07-16 11:40:34 +02:00
  • f045170048 update ywang 2019-07-15 15:52:45 -07:00
  • 2bffdc7e08 Merge branch 'fix_export_custom_bindpose_error' of https://github.com/thomasbiang/assimp into fix_export_custom_bindpose_error ywang 2019-07-15 15:50:36 -07:00
  • 36130f9b86 use ExportProperties to customize bind pose epsilon thomasbiang 2019-07-11 17:00:47 -07:00
  • add4d6028b clean up thomasbiang 2019-07-10 16:29:50 -07:00
  • f2731a1b99 customize error rate for bind pose thomasbiang 2019-07-10 16:27:59 -07:00
  • b344beb00b Merge pull request #2546 from Frooxius/master Kim Kulling 2019-07-14 13:10:03 +02:00
  • bcdb173e09 - Fixed anim meshes generated from blendshapes not being copied to output for multi-material meshes - Fixed first vertex of each blendshape on a multi-material mesh having all unmapped vertice offsets being added to it - Fixed blendshapes not importing for multi-material FBX meshes with no bones Frooxius 2019-07-13 22:20:47 +02:00
  • 5fb77f8523 Merge pull request #15 from assimp/master Madrich 2019-07-13 06:49:58 +02:00
  • 4a2df57241 Merge pull request #2541 from assimp/kimkulling_dev Kim Kulling 2019-07-12 20:43:19 +02:00
  • 07d3a7d5b0 Fix some warnings RichardTea 2019-07-12 16:02:51 +01:00
  • 678dd32da3 Add missing header RichardTea 2019-07-12 15:37:10 +01:00
  • 8f74508e40 Fix missing doc in config.h kimkulling 2019-07-12 16:28:36 +02:00
  • e786483c64 Merge branch 'master' into fix_export_custom_bindpose_error Kim Kulling 2019-07-12 16:27:13 +02:00
  • 53c0f91305 Add unittest for json. kimkulling 2019-07-12 16:08:51 +02:00
  • 0c718a9c95 Add Collada ZAE unit test RichardTea 2019-07-12 14:56:29 +01:00
  • 2a72c9b616 Read embedded textures from Collada ZAE RichardTea 2019-07-12 14:46:48 +01:00
  • ddd1e770b9 First pass of Collada ZAE support RichardTea 2019-07-12 11:36:07 +01:00
  • 8636d5607c Add ZipArchiveIOSystem to CMake RichardTea 2019-07-12 11:35:43 +01:00
  • d64e1bde13 First pass of Collada ZAE support RichardTea 2019-07-12 11:29:35 +01:00
  • 2c7f607e7c Create ZipArchiveIOSystem RichardTea 2019-07-11 12:22:43 +01:00
  • 259a9bd2af use ExportProperties to customize bind pose epsilon thomasbiang 2019-07-11 17:00:47 -07:00
  • 3b3a965d2b Delete JTImporter.h Kim Kulling 2019-07-11 22:31:40 +02:00
  • b1d8398243 Delete JTImporter.cpp Kim Kulling 2019-07-11 22:31:24 +02:00
  • 8bf1b9ac5e Update CMakeLists.txt Kim Kulling 2019-07-11 22:29:30 +02:00
  • 82e7775d6d Update JTImporter.cpp Kim Kulling 2019-07-11 19:23:00 +02:00
  • da33262bcc Update FBXConverter.cpp Kim Kulling 2019-07-11 19:17:41 +02:00
  • eb5e829436 Assjson: add json export to list of exporters. kkulling 2019-07-11 17:43:03 +02:00
  • 2e782f43e5 Merge branch 'master' into kimkulling_dev kkulling 2019-07-11 17:37:52 +02:00
  • b463ddd399 closes https://github.com/assimp/assimp/issues/340: start integrating assimp2json. kkulling 2019-07-11 17:37:31 +02:00
  • f03f099fa8 clean up thomasbiang 2019-07-10 16:29:50 -07:00
  • f703a798f4 customize error rate for bind pose thomasbiang 2019-07-10 16:27:59 -07:00
  • d7773dcfba set->unordered_set;unsigned int for iteration thomasbiang 2019-07-10 09:51:20 -07:00
  • 47661034ae Merge pull request #15 from assimp/master RichardTea 2019-07-10 17:46:04 +01:00
  • 6b5e0a9914 fix group node being exported as bone node thomasbiang 2019-07-09 19:05:45 -07:00
  • bc8f85eeae Merge pull request #2535 from assimp/issue_2182 Kim Kulling 2019-07-09 21:41:05 +02:00
  • 39dc9801e0 Update ColladaLoader.cpp Kim Kulling 2019-07-09 20:35:57 +02:00
  • a01302dd4d Merge branch 'master' into issue_2182 Kim Kulling 2019-07-09 19:45:40 +02:00
  • ed6dbf9533 closes code/Collada/ColladaLoader.cpp: fix possible memleak when throwing an exception. Kim Kulling 2019-07-09 19:44:56 +02:00
  • b87f4c03ba Remove not needed init. kkulling 2019-07-09 11:49:59 +02:00
  • b688797766 Merge pull request #2533 from assimp/issue_2439 Kim Kulling 2019-07-05 01:21:09 +02:00
  • 01070b4de7 closes https://github.com/assimp/assimp/issues/2439: add null ptr test before calling hasAttr. Kim Kulling 2019-07-04 22:34:11 +02:00
  • 5a82e27885 Merge pull request #2532 from assimp/kimkulling_dev Kim Kulling 2019-07-04 20:29:53 +02:00
  • ae7b1f1a77 Merge branch 'master' into kimkulling_dev Kim Kulling 2019-07-03 18:28:15 +02:00
  • 6beed14e35 Merge pull request #2531 from assimp/fbx_multimatmesh_with_blendshapes Kim Kulling 2019-07-03 18:27:53 +02:00
  • 0ec5eb752c Update FBXConverter.cpp Kim Kulling 2019-07-03 12:50:01 +02:00
  • 08eb6701c3 Merge branch 'master' into fbx_multimatmesh_with_blendshapes Kim Kulling 2019-07-02 23:29:55 +02:00
  • fa827f9075 Merge pull request #2528 from marxin/fix-gcc-9-warning Kim Kulling 2019-07-02 23:29:29 +02:00
  • 1fc232effa closes https://github.com/assimp/assimp/issues/2368: just fix it Kim Kulling 2019-07-02 21:46:52 +02:00
  • 96f16c7aea closes https://github.com/assimp/assimp/issues/2527: use correct macro for Assimp-exporter. Kim Kulling 2019-07-02 19:48:53 +02:00
  • ab55fb27c3 Fix a GCC 9 warning: Martin Liska 2019-07-02 13:38:04 +02:00
  • 500983074b Merge pull request #14 from assimp/master RichardTea 2019-07-02 10:50:33 +01:00
  • ff662a6104 Merge pull request #2523 from muxanickms/topic/embedded_texture_name_fix Kim Kulling 2019-06-30 20:30:17 +02:00
  • 3fcf3bd81f Merge branch 'master' into topic/embedded_texture_name_fix Kim Kulling 2019-06-30 12:43:40 +02:00
  • 01d144ce89 Merge pull request #2526 from rconde01/bugfix/issue_2525_lwo_node_name_repeats Kim Kulling 2019-06-29 00:31:05 +02:00
  • f5ece83f31 initial unnamed node uniqueness index outside of loop Rob Conde 2019-06-28 16:12:58 -04:00
  • 1ec01a870f Merge pull request #2519 from RichardTea/issue_2518_active_importer_ident Kim Kulling 2019-06-28 21:44:11 +02:00
  • 6d07473550 all textures use relative path except embedded, this is fix for it Mike Samsonov 2019-06-27 17:59:55 +01:00
  • 05f5b54f75 Merge branch 'master' into issue_2518_active_importer_ident Kim Kulling 2019-06-27 14:02:01 +02:00
  • 07779a7ae1 Merge pull request #2517 from RichardTea/issue_2456_text_formats_precision Kim Kulling 2019-06-27 14:01:38 +02:00
  • af199c50aa Merge branch 'master' into issue_2456_text_formats_precision Kim Kulling 2019-06-26 17:31:11 +02:00
  • b15311661c Merge pull request #2516 from RichardTea/fix_issue_2507_collada_import Kim Kulling 2019-06-26 17:30:39 +02:00
  • 853afdf42b Merge branch 'master' into fix_issue_2507_collada_import Kim Kulling 2019-06-25 20:19:42 +02:00
  • ed0cd2f775 Merge pull request #2521 from assimp/kimkulling_dev Kim Kulling 2019-06-25 00:24:24 +02:00
  • d7e442f78a Add missing file. Kim Kulling 2019-06-24 21:48:52 +02:00
  • 1952144445 Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev Kim Kulling 2019-06-24 21:46:05 +02:00
  • 0f66a917e5 Add unittest. Kim Kulling 2019-06-24 21:37:53 +02:00
  • 8f43fb144a Add "importerIndex" Importer property RichardTea 2019-06-24 14:55:48 +01:00
  • 26bd54ae0b PostProcesswing: add gen-aabb process to postprocessing. Kim Kulling 2019-06-23 20:24:32 +02:00
  • 418c07a9bb closes https://github.com/assimp/assimp/issues/2368: add missign anim mesh for multimaterial meshes in fbx,. Kim Kulling 2019-06-21 18:00:53 +02:00
  • bf252c4452 Add configuration of text format precision RichardTea 2019-06-20 18:11:11 +01:00
  • 59f732e10d DAE Import: Don't use SkipElement() to skip empty Text RichardTea 2019-06-20 16:30:52 +01:00
  • fb8ee5e301 Merge pull request #13 from assimp/master RichardTea 2019-06-20 15:54:17 +01:00
  • 6b3d6c3b8f JT: next steps. Kim Kulling 2019-06-18 20:35:02 +02:00
  • 3929ea0644 Merge pull request #2254 from assimp/kimkulling-patch-3 Kim Kulling 2019-06-15 20:39:37 +02:00
  • ced080f9f3 X: fix out of bound access. Kim Kulling 2019-06-15 19:17:15 +02:00
  • eb27fb753d Merge branch 'master' into kimkulling-patch-3 Kim Kulling 2019-06-15 13:44:13 +02:00
  • 2d3c3379e5 Merge pull request #2488 from rbsheth/rbsheth_hunterize_assimp Kim Kulling 2019-06-15 10:14:22 +02:00
  • 6c33374491 update install interface location Rahul Sheth 2019-06-13 22:08:34 -07:00
  • d00f4f4b3a Build Hunter-compatible config file Rahul Sheth 2019-05-24 17:34:25 -04:00
  • 5cda81e84b code fixes for Hunter-based build Rahul Sheth 2019-05-24 17:03:42 -04:00
  • dab8041bcd rewrite include paths for Hunter packages Rahul Sheth 2019-05-24 16:37:09 -04:00
  • a4587e8609 Use hunter to download dependencies if HUNTER_ENABLED is ON Rahul Sheth 2019-05-24 16:13:55 -04:00
  • 1db3e1e11f Allow CXX_STANDARD and other relevant compiler definitions to be set by Hunter user Rahul Sheth 2019-05-24 12:57:23 -04:00
  • dd9511aaef Add HunterGate URL/SHA1 Rahul Sheth 2019-05-24 12:44:47 -04:00
  • 34fa64faf9 Add HunterGate Rahul Sheth 2019-05-22 15:35:39 -04:00
  • b381467fc3 Merge pull request #2508 from pkoller/patch-1 Kim Kulling 2019-06-13 15:40:49 +02:00
  • ba29b8f1da Merge branch 'master' into patch-1 Kim Kulling 2019-06-13 13:41:40 +02:00
  • 43375eafb7 Merge pull request #2509 from pkoller/pkoller-patch-1 Kim Kulling 2019-06-13 13:41:03 +02:00
  • 8ec3aaed7d Merge branch 'master' into pkoller-patch-1 Kim Kulling 2019-06-13 09:04:53 +02:00
  • 8d0567f727 Merge pull request #2510 from assimp/issue_2431 Kim Kulling 2019-06-13 09:04:37 +02:00