Commit Graph

  • f0d03ec6b8 closes https://github.com/assimp/assimp/issues/1722: use a const reference to fix issue with ppc. Kim Kulling 2018-01-22 14:35:06 +01:00
  • 5f38bd01ec restored gltf checks. Marco Di Benedetto 2018-01-18 22:28:44 +01:00
  • 8358d585b0 Merge pull request #1712 from wanadev/gltf2-fixes Kim Kulling 2018-01-18 19:21:22 +01:00
  • c749594e9d gltf instant ok on valid extension. Marco Di Benedetto 2018-01-18 19:12:51 +01:00
  • 55ca48e838 Merge branch 'master' of https://github.com/assimp/assimp Marco Di Benedetto 2018-01-18 19:08:54 +01:00
  • 8b9b770f9f Merge branch 'master' into gltf2-fixes Kim Kulling 2018-01-16 21:50:48 +01:00
  • bedf506c0a Merge pull request #1715 from assimp/issue_1660 Kim Kulling 2018-01-16 17:47:22 +01:00
  • 81fbe2c7d3 Merge branch 'master' into issue_1660 Kim Kulling 2018-01-16 17:13:02 +01:00
  • d230635ff6 STLLoader: closes https://github.com/assimp/assimp/issues/1660: use memcpy instead of a c-style dynamic cast to parse a aiVector3D Kim Kulling 2018-01-16 16:31:15 +01:00
  • 48d6006fea Merge pull request #1683 from NebuHiiEjamu/master Kim Kulling 2018-01-16 10:14:19 +01:00
  • 5e6cae3094 Force normalized normals Alexis Breust 2018-01-16 09:56:44 +01:00
  • 0f4189c77e Forced 4-bits alignment for glTF buffers Alexis Breust 2018-01-16 09:26:00 +01:00
  • 0c37ef55be IFCLoader.h fix BuildTools 2018-01-15 19:23:13 -08:00
  • f88572f572 fix includes BuildTools 2018-01-15 19:14:44 -08:00
  • 2f687ab91f Merge branch 'master' into master Christian Meurin 2018-01-15 19:11:53 -08:00
  • 86fa0f4524 Merge branch 'master' into master Christian Meurin 2018-01-15 19:10:14 -08:00
  • d0c92e30be conflict resolution again, temp. move LogAux.h BuildTools 2018-01-15 19:07:33 -08:00
  • 68db518696 Fix IFC branch merge conflict BuildTools 2018-01-15 19:00:56 -08:00
  • d0bf5c10f9 Merge pull request #1704 from mesilliac/better_fbx_material_import Kim Kulling 2018-01-15 22:03:14 +01:00
  • c07069821d Merge branch 'master' into better_fbx_material_import Kim Kulling 2018-01-14 22:04:20 +01:00
  • fa321aba71 Merge pull request #1701 from mesilliac/document_material_reflectivity Kim Kulling 2018-01-14 22:03:41 +01:00
  • 3820365a90 Merge branch 'master' into document_material_reflectivity Kim Kulling 2018-01-14 12:22:19 +01:00
  • 90978ef681 Merge pull request #1707 from assimp/ifc_40 Kim Kulling 2018-01-13 17:27:14 +01:00
  • 03b43ee9c3 Merge branch 'master' into ifc_40 Kim Kulling 2018-01-13 14:40:50 +01:00
  • 5e339d0ff0 fix case-sensitive typo in include. Kim Kulling 2018-01-13 10:54:38 +01:00
  • cecab969c6 IFC: introduce new namespace fpr IFC-schema2x3 Kim Kulling 2018-01-13 10:27:45 +01:00
  • 6566dcaf34 Merge branch 'master' into master Christian Meurin 2018-01-12 13:14:05 -08:00
  • d360532667 Merge branch 'master' into document_material_reflectivity Kim Kulling 2018-01-12 14:57:04 +01:00
  • ee54e9a38e Merge pull request #1700 from rspencer01/master Kim Kulling 2018-01-12 14:55:29 +01:00
  • e53fdf365e Merge branch 'master' into master Kim Kulling 2018-01-12 13:14:32 +01:00
  • fe4da15d07 Merge pull request #1699 from ombre5733/patch-3 Kim Kulling 2018-01-12 13:14:11 +01:00
  • 843c658a33 Merge branch 'master' into patch-3 Kim Kulling 2018-01-12 09:40:35 +01:00
  • 7c16a589e7 Merge pull request #1698 from ombre5733/patch-2 Kim Kulling 2018-01-12 09:40:08 +01:00
  • 4cb4d59682 revert problematic unit test models to last upstream commits BuildTools 2018-01-11 16:13:13 -08:00
  • dda91094f2 I want to see what GetErrorString() blurts out on the Travis failure real quick BuildTools 2018-01-11 15:47:07 -08:00
  • 4410de1c44 correct header path for new process BuildTools 2018-01-11 13:21:40 -08:00
  • 925be5e983 Merge branch 'master' into master Christian Meurin 2018-01-11 13:13:46 -08:00
  • d64d5f762f Merge branch 'master' into patch-3 Manuel Freiberger 2018-01-11 21:07:31 +01:00
  • 33ddbf9aa0 Correct matrix layout documentation Manuel Freiberger 2018-01-11 20:58:47 +01:00
  • 47c8971b52 Merge branch 'master' into patch-2 Kim Kulling 2018-01-11 20:30:17 +01:00
  • b128cb9c4c Merge pull request #1705 from awefers/issue_1684 Kim Kulling 2018-01-11 20:19:37 +01:00
  • 193165fb43 Merge branch 'master' into issue_1684 awefers 2018-01-11 10:16:20 -08:00
  • 0e99f1f587 Build fix for 1684 Axel Wefers 2018-01-11 10:15:05 -08:00
  • aba8383283 Add unit test for correct FBX phong material import. Tommy 2018-01-10 19:18:11 +01:00
  • fb4a67d4fe Improve FBX material import. Tommy 2018-01-11 17:30:17 +01:00
  • 3b77703b51 Merge branch 'master' into patch-2 Kim Kulling 2018-01-11 14:10:49 +01:00
  • c5101b185d Merge pull request #1696 from awefers/issue_1605 Kim Kulling 2018-01-11 14:10:12 +01:00
  • 88df886bcc Merge branch 'master' into issue_1605 Kim Kulling 2018-01-11 11:39:14 +01:00
  • 32b15f1cbd Merge pull request #1694 from awefers/issue_1693 Kim Kulling 2018-01-11 11:38:50 +01:00
  • 538bc95499 Merge branch 'master' into master Christian Meurin 2018-01-10 20:10:54 -08:00
  • 8fd944a609 Merge branch 'issue_1693' of https://github.com/awefers/assimp into issue_1693 Axel Wefers 2018-01-10 16:47:36 -08:00
  • 3e127bebff glTF 2.0: Import scale for normal textures and strength for occlusion textures Axel Wefers 2018-01-08 15:19:27 -08:00
  • 936eb26dde Merge branch 'master' into issue_1605 Kim Kulling 2018-01-11 00:54:35 +01:00
  • 7d7d7cd9ec Merge pull request #1692 from awefers/issue_1691 Kim Kulling 2018-01-11 00:53:54 +01:00
  • bb71f2ba64 Merge branch 'master' into issue_1605 awefers 2018-01-10 12:04:41 -08:00
  • d1ed5db84d Merge branch 'master' into issue_1693 awefers 2018-01-10 12:04:17 -08:00
  • 45d5f2eec8 Merge branch 'master' into issue_1691 Kim Kulling 2018-01-10 20:50:37 +01:00
  • de8cc09a09 Merge pull request #1690 from awefers/issue_1689 Kim Kulling 2018-01-10 20:50:11 +01:00
  • 978c156c2a added import of material properties (double sided and transparency) in glTF 1.0 importer. Marco Di Benedetto 2018-01-10 20:02:41 +01:00
  • 909c0a820a Document AI_MATKEY_REFLECTIVITY and AI_MATKEY_COLOR_REFLECTIVE. Tommy 2018-01-10 19:22:56 +01:00
  • 9f8e1945ea Merge branch 'master' into issue_1605 awefers 2018-01-10 09:26:49 -08:00
  • 735eb33a2b Merge branch 'master' into issue_1693 awefers 2018-01-10 09:26:33 -08:00
  • 7d4e144e05 Merge branch 'master' into issue_1691 awefers 2018-01-10 09:26:04 -08:00
  • d33cc8ac5a Merge branch 'master' of https://github.com/assimp/assimp Marco Di Benedetto 2018-01-10 17:36:43 +01:00
  • 17af5e127a Merge branch 'master' into issue_1689 Kim Kulling 2018-01-10 17:14:47 +01:00
  • c036a3b840 Add pyassimp code generation script for materials Robert Spencer 2018-01-10 12:33:44 +02:00
  • 4a033e9767 Removed a stray semicolon Manuel Freiberger 2018-01-09 23:48:08 +01:00
  • 8fe2ba31a9 Clarify the matrix layout Manuel Freiberger 2018-01-09 23:46:36 +01:00
  • ab9f3c254e Merge branch 'master' into master Christian Meurin 2018-01-09 14:11:04 -08:00
  • 923f2b6e45 Merge pull request #1697 from ombre5733/patch-1 Kim Kulling 2018-01-09 22:03:39 +01:00
  • e5e67ffd83 Fix typos and ease description of coordinate frame Manuel Freiberger 2018-01-09 19:50:07 +01:00
  • 901b981260 glTF: Always check signature Axel Wefers 2018-01-09 09:37:57 -08:00
  • 0eacddc5bf glTF 2.0: Import scale for normal textures and strength for occlusion textures Axel Wefers 2018-01-08 15:19:27 -08:00
  • dc79b572cf glTF 2.0: Assign default material to meshes with no material reference. Axel Wefers 2018-01-08 14:57:55 -08:00
  • 4235765856 glTF 2.0: Set camera "look at" to (0.0, 0.0, -1.0). Axel Wefers 2018-01-08 14:19:30 -08:00
  • 0fff3b1232 Merge branch 'master' into master Kim Kulling 2018-01-08 15:36:03 +01:00
  • 89a62edb9a Merge pull request #1688 from wanadev/import-postprocess-embedimages Kim Kulling 2018-01-08 15:35:31 +01:00
  • 559bc38e5d Embedding images post-process Alexis Breust 2018-01-08 09:26:26 +01:00
  • 5ef13e7b38 Merge branch 'master' into master Christian Meurin 2018-01-07 11:34:18 -08:00
  • 2aa68d7519 Merge pull request #1687 from assimp/issue_1574 Kim Kulling 2018-01-07 12:33:43 +01:00
  • dd7a323103 Merge branch 'master' into issue_1574 Kim Kulling 2018-01-07 11:30:03 +01:00
  • 0a5aa69f21 Merge pull request #1677 from assimp/remove_ctest Kim Kulling 2018-01-07 10:54:25 +01:00
  • 6a76959f5b "s, <s, and >s oh my... BuildTools 2018-01-06 21:20:45 -08:00
  • 0c4c66be50 I assume too much about header paths... BuildTools 2018-01-06 21:00:11 -08:00
  • 123fb1d009 ../../code header path oversight fixed BuildTools 2018-01-06 20:50:01 -08:00
  • 7b5c543b82 Merge branch 'master' into master Christian Meurin 2018-01-06 14:48:23 -08:00
  • abc01bcdf0 closes https://github.com/assimp/assimp/issues/1574: add API to get name of current branch. Kim Kulling 2018-01-06 21:52:58 +01:00
  • b2bfb40859 Merge branch 'master' into remove_ctest Kim Kulling 2018-01-06 21:31:22 +01:00
  • e8fffb7815 Merge pull request #1681 from wanadev/1674-buffer-relative-uri Kim Kulling 2018-01-06 21:30:57 +01:00
  • 3896f3ffce Merge branch 'master' into 1674-buffer-relative-uri Kim Kulling 2018-01-06 20:40:27 +01:00
  • 84453cb3b4 Merge pull request #1686 from assimp/issue_1638 Kim Kulling 2018-01-06 18:46:42 +01:00
  • 527a5ea5f6 Merge branch 'master' into 1674-buffer-relative-uri Kim Kulling 2018-01-06 18:06:26 +01:00
  • 01081765ad closes https://github.com/assimp/assimp/issues/1638: use memcpy instead of dynamic_cast. Kim Kulling 2018-01-06 18:03:27 +01:00
  • e0e1b17881 Merge pull request #1685 from rspencer01/master Kim Kulling 2018-01-06 16:11:02 +01:00
  • f149a2641b Add compiled python files to the ignore list Robert Spencer 2018-01-06 15:17:56 +02:00
  • ce5b78f6c0 Remove check for 'assimp' in name of directories to be searched for library in python port Robert Spencer 2018-01-06 15:17:03 +02:00
  • 6bbdb669e1 Merge branch 'master' into master Kim Kulling 2018-01-06 09:30:13 +01:00
  • ca152f41e2 Merge branch 'master' into 1674-buffer-relative-uri A. Breust 2018-01-06 09:19:48 +01:00
  • d91d10f694 Merge pull request #1682 from wanadev/glb2-no-bin-file Kim Kulling 2018-01-06 09:18:52 +01:00
  • a8a1ca9894 header paths adjusted for unit tests and samples BuildTools 2018-01-05 23:12:40 -08:00