Commit Graph

  • b5350899b2 Merge branch 'master' into master Kim Kulling 2021-06-24 16:15:51 +02:00
  • 28ca0d13d3 Merge pull request #3966 from jerstlouis/master Kim Kulling 2021-06-24 16:15:21 +02:00
  • 00bf757688 Update material.h Kim Kulling 2021-06-24 13:28:49 +02:00
  • 170063643c include/material.h: Fixed broken C support - The aiGetMaterialFloat() and aiGetMaterialInteger() C preprocessor definitions were broken because: - They had a space before the opening parenthesis - Using material key definitions expanding 1 to argument into 3 breaks the invocation of macros expecting 5 parameters Jerome St-Louis 2021-06-23 18:11:52 -04:00
  • 8e3a159141 Merge branch 'master' into clang-tidy-perf-fixes Aaron Gokaslan 2021-06-23 10:10:28 -04:00
  • 6170c49155 Fixed: Pankaj Tyagi 2021-06-23 16:49:09 +05:30
  • e736538df3 Merge branch 'master' into master Evangel63 2021-06-23 13:45:23 +10:00
  • bf82caba18 Merge pull request #3954 from ihsinme/patch-1 Kim Kulling 2021-06-23 01:20:00 +02:00
  • c447fc6892 Merge branch 'master' into patch-1 Kim Kulling 2021-06-23 01:08:40 +02:00
  • 1faedc136a Merge pull request #3952 from RichardTea/clean_gltf_pbr_brdf Kim Kulling 2021-06-23 01:07:53 +02:00
  • 24d4be958d Merge branch 'master' into clang-tidy-perf-fixes Aaron Gokaslan 2021-06-22 14:42:51 -04:00
  • 544148a626 Fix code insertion duplication Aaron Gokaslan 2021-06-22 14:28:46 -04:00
  • 760953c834 Merge branch 'master' into clean_gltf_pbr_brdf Kim Kulling 2021-06-22 20:10:03 +02:00
  • 36815b014b Update FBXExporter.h Kim Kulling 2021-06-22 20:05:16 +02:00
  • 53d2cf975a Merge pull request #3961 from andreasbuhr/patch-1 Kim Kulling 2021-06-22 20:03:47 +02:00
  • b17c2f29e9 Replace noexcept with proper macro Aaron Gokaslan 2021-06-22 12:44:36 -04:00
  • 1650868701 Remove redundant include Aaron Gokaslan 2021-06-22 12:32:58 -04:00
  • 94c3abd841 Apply various performance fixes from clang-tidy Aaron Gokaslan 2021-06-22 12:27:15 -04:00
  • 951d5158c5 Merge branch 'master' into patch-1 Kim Kulling 2021-06-22 09:42:30 +02:00
  • d699e7b56e Merge branch 'master' into patch-1 ihsinme 2021-06-22 09:48:25 +03:00
  • 43a5c6c8e3 Merge pull request #3946 from mahiuchun/safe Kim Kulling 2021-06-21 19:02:43 +02:00
  • 9512e9ac1e Merge branch 'master' into safe Kim Kulling 2021-06-21 17:53:17 +02:00
  • 376b3b2eff Merge pull request #3945 from mahiuchun/embed Kim Kulling 2021-06-17 22:21:03 +02:00
  • a8c75c34a1 Update scene.h Kim Kulling 2021-06-17 21:31:28 +02:00
  • 089375bd63 Merge branch 'master' into embed Kim Kulling 2021-06-17 21:22:36 +02:00
  • fe8c4ebd8c Merge branch 'master' into zero Hill Ma 2021-06-16 10:18:41 -07:00
  • e27074594f Replace swear words in IFCBoolean.cpp Andreas Buhr 2021-06-16 18:58:41 +02:00
  • fdb9ce6445 Merge pull request #3958 from mahiuchun/iosys Kim Kulling 2021-06-16 14:22:02 +02:00
  • a34b9d1c95 Fix review findings Kim Kulling 2021-06-16 11:21:31 +02:00
  • 148b8c66a8 glTF2: zero out extra space created by padding. Hill Ma 2021-06-15 15:18:20 -07:00
  • af748755e1 Fix issue #2873 Hill Ma 2021-06-15 13:20:12 -07:00
  • a6558ca249 Merge branch 'master' into embed Kim Kulling 2021-06-15 13:32:09 +02:00
  • 6a78ef5652 Merge branch 'master' into patch-1 ihsinme 2021-06-15 09:42:05 +03:00
  • a909341767 Merge remote-tracking branch 'origin/clean_gltf_pbr_brdf' into clean_gltf_pbr_brdf RichardTea 2021-06-14 15:11:51 +01:00
  • f412595887 Fix typo RichardTea 2021-06-11 15:25:02 +01:00
  • 985f3ee665 Fix glTFv2 texcoord/uv mapping RichardTea 2021-06-11 15:17:25 +01:00
  • fb039bb9eb Add glTFv2 Clearcoat import/export tests RichardTea 2021-06-11 14:34:42 +01:00
  • 4a66ec25d0 Standardise Clearcoat, Sheen and Transmission RichardTea 2021-06-11 13:44:52 +01:00
  • 4476352882 First pass at simplifying glTFv2 PBR RichardTea 2021-06-10 18:13:46 +01:00
  • a9b29abee6 Merge pull request #3938 from BaldricS/Fix_SceneCombiner_Texture_Reindexing Kim Kulling 2021-06-14 15:40:25 +02:00
  • 9a851cac7b Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing Kim Kulling 2021-06-14 14:47:15 +02:00
  • a0388b1727 Merge pull request #3918 from Nodrev/fbx-lights-export Kim Kulling 2021-06-14 14:46:36 +02:00
  • 064ffc625b Const qualify aiMetadata::HasKey Evangel 2021-06-14 12:21:29 +10:00
  • 3de20af3cc Renamed glTF2::Object::extensions to customExtensions to avoid shadowing in other subclasses. Evangel 2021-06-12 13:16:53 +10:00
  • a7a30baf27 Renamed local variable to avoid shadowing member variable. Evangel 2021-06-12 13:08:14 +10:00
  • 7f0efa0866 Added ReadExtensions to glTF2::Object, so all objects now have their extensions read. Importer is the only place that needs to be modified to make them available on the Assimp side now. Evangel 2021-06-12 12:50:44 +10:00
  • 5be2330fbb Added CustomExtension to glTF2::Object so that all subclasses have it instead of doing it piecemeal. Evangel 2021-06-12 12:20:40 +10:00
  • 6d413444b5 Merge branch 'master' of https://github.com/Evangel63/assimp Evangel 2021-06-12 11:46:20 +10:00
  • 36c8cdf3de Add scene metadata for glTF2 files as allowed by the glTF2 specification. Evangel 2021-06-12 11:44:28 +10:00
  • fbf75963dc Fix typo RichardTea 2021-06-11 15:25:02 +01:00
  • 230f367ef9 Fix glTFv2 texcoord/uv mapping RichardTea 2021-06-11 15:17:25 +01:00
  • c86522e552 Add glTFv2 Clearcoat import/export tests RichardTea 2021-06-11 14:34:42 +01:00
  • 4b4d6b1326 Standardise Clearcoat, Sheen and Transmission RichardTea 2021-06-11 13:44:52 +01:00
  • 6dd9ab062c the expression does not throw an exception. ihsinme 2021-06-11 10:56:45 +03:00
  • 6db142ee51 Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration Kim Kulling 2021-06-10 23:36:47 +02:00
  • ebb9b1b2af Next iteration Kim Kulling 2021-06-10 23:36:07 +02:00
  • 9f9d77f882 First pass at simplifying glTFv2 PBR RichardTea 2021-06-10 18:13:46 +01:00
  • 391d3195df Merge branch 'master' into fbx-lights-export Kim Kulling 2021-06-10 12:27:14 +02:00
  • 1deacf32be Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing Scott Baldric 2021-06-09 15:27:20 -05:00
  • 199aa5dd66 Merge pull request #3911 from RichardTea/update_draco Kim Kulling 2021-06-09 16:34:53 +02:00
  • fc4ebefaa4 Merge branch 'master' into update_draco Kim Kulling 2021-06-08 23:30:01 +02:00
  • ef739c1703 glTF2: Make handling of embedded textures safer. Hill Ma 2021-06-08 12:53:18 -07:00
  • ca1ab8b11b Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing Scott Baldric 2021-06-08 08:18:15 -05:00
  • c58fe0c98f Merge pull request #3873 from krishty/improve-msvc-switches Kim Kulling 2021-06-08 15:09:28 +02:00
  • 121c0e7d0c Add GetEmbeddedTextureAndIndex() to aiScene. Hill Ma 2021-06-07 21:53:28 -07:00
  • 790203ee9d Merge branch 'master' into improve-msvc-switches Kim Kulling 2021-06-07 21:21:20 +02:00
  • cdc1bf8e10 Merge pull request #3916 from jagoon/fix-fbx-exporter2 Kim Kulling 2021-06-07 21:20:18 +02:00
  • 8039351a67 Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing Scott Baldric 2021-06-07 11:44:10 -05:00
  • a8ddc74426 Merge branch 'master' into fix-fbx-exporter2 Kim Kulling 2021-06-07 18:26:59 +02:00
  • 1126fa5218 Merge pull request #3934 from assimp/fix_dxf_viewer Kim Kulling 2021-06-07 18:24:52 +02:00
  • d33cf1dc0c Merge branch 'master' into x3d_pugi_migration Kim Kulling 2021-06-06 16:06:08 +02:00
  • 444fc9c373 Increasing length of mDataLength if rewriting the texture index increases magnitutde of index. Scott Baldric 2021-06-01 17:08:26 -05:00
  • 84db4d3a08 Update CMakeLists.txt Kim Kulling 2021-06-03 23:56:52 +02:00
  • b0e7271449 Merge branch 'master' into stb-image-updated Kim Kulling 2021-06-03 23:46:43 +02:00
  • e6b83feb9f Update CMakeLists.txt Kim Kulling 2021-06-03 23:45:48 +02:00
  • 1a493613c1 Merge branch 'master' into fix_dxf_viewer Kim Kulling 2021-06-03 23:43:39 +02:00
  • a3b3ab1d44 Merge pull request #3941 from assimp/issue_3767 Kim Kulling 2021-06-03 23:42:08 +02:00
  • 742250c5fb Update CMakeLists.txt Kim Kulling 2021-06-03 23:42:07 +02:00
  • a716f741d8 fix the include Kim Kulling 2021-06-03 23:35:12 +02:00
  • bf0f8d4c1b Update pugiconfig.hpp Kim Kulling 2021-06-03 23:29:53 +02:00
  • cc912f09f7 update pugi_xml to 1.11 Kim Kulling 2021-06-03 23:16:20 +02:00
  • 22b49efbd0 Merge branch 'master' into stb-image-updated Kim Kulling 2021-06-03 23:07:48 +02:00
  • d2da600d08 Merge pull request #3940 from assimp/kimkulling-issue_3887 Kim Kulling 2021-06-03 23:07:40 +02:00
  • e0d1a36523 Merge branch 'master' into stb-image-updated Kim Kulling 2021-06-03 23:07:38 +02:00
  • b4fc41bc09 Use corret attribute name Kim Kulling 2021-06-03 22:52:10 +02:00
  • d600b45cd2 Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration Kim Kulling 2021-06-03 22:21:10 +02:00
  • f28331b202 Merge pull request #3939 from assimp/kimkulling-issue_3872 Kim Kulling 2021-06-03 20:58:21 +02:00
  • 3a32612b71 Add skipping of unused nodes. Kim Kulling 2021-06-03 20:55:31 +02:00
  • 84a2e1fc92 Update unity plugin to trilib2 Kim Kulling 2021-06-03 20:43:37 +02:00
  • c8510a1a82 Merge branch 'master' into fix-fbx-exporter2 Kim Kulling 2021-06-03 11:05:07 +02:00
  • d4199ee968 Merge pull request #3903 from ogjamesfranco/cached_output_directory_vars Kim Kulling 2021-06-03 10:47:15 +02:00
  • dd3d03a4ae Merge branch 'master' into cached_output_directory_vars Kim Kulling 2021-06-03 10:31:57 +02:00
  • 35c506fcf8 Merge branch 'master' into fix_dxf_viewer Kim Kulling 2021-05-30 21:56:15 +02:00
  • 77ce4080b6 fix viewer in case of unknown primitives. Kim Kulling 2021-05-30 21:54:04 +02:00
  • 3b565444c3 Merge branch 'Q1MDLgroup' of https://github.com/Garux/assimp into Q1MDLgroup Garux 2021-05-30 11:55:45 +03:00
  • c776924adf fix -Waddress-of-packed-member Garux 2021-05-30 11:45:50 +03:00
  • c04759ccc4 Merge pull request #3922 from Evangel63/master Kim Kulling 2021-05-29 16:06:43 +02:00
  • 8f18820bb2 Merge branch 'master' into master Kim Kulling 2021-05-29 15:47:24 +02:00
  • 9be76c1ba5 Merge pull request #3929 from TinyTinni/issue_3711 Kim Kulling 2021-05-29 09:29:16 +02:00
  • 09bb79c68a Merge branch 'master' into issue_3711 Kim Kulling 2021-05-29 08:39:18 +02:00