Tommy
|
fb4a67d4fe
|
Improve FBX material import.
Some properties were being incorrectly interpreted,
and by default it was relying on a legacy system.
|
2018-01-11 17:30:21 +01:00 |
Kim Kulling
|
c5101b185d
|
Merge pull request #1696 from awefers/issue_1605
glTF: Always check signature
|
2018-01-11 14:10:12 +01:00 |
|
Kim Kulling
|
88df886bcc
|
Merge branch 'master' into issue_1605
|
2018-01-11 11:39:14 +01:00 |
|
Kim Kulling
|
32b15f1cbd
|
Merge pull request #1694 from awefers/issue_1693
glTF 2.0: Import scale for normal textures and strength for occlusion…
|
2018-01-11 11:38:50 +01:00 |
Axel Wefers
|
8fd944a609
|
Merge branch 'issue_1693' of https://github.com/awefers/assimp into issue_1693
|
2018-01-10 16:47:36 -08:00 |
|
Axel Wefers
|
3e127bebff
|
glTF 2.0: Import scale for normal textures and strength for occlusion textures
resolves #1693
|
2018-01-10 16:45:17 -08:00 |
|
Kim Kulling
|
936eb26dde
|
Merge branch 'master' into issue_1605
|
2018-01-11 00:54:35 +01:00 |
|
Kim Kulling
|
7d7d7cd9ec
|
Merge pull request #1692 from awefers/issue_1691
glTF 2.0: Assign default material to meshes with no material reference.
|
2018-01-11 00:53:54 +01:00 |
|
awefers
|
bb71f2ba64
|
Merge branch 'master' into issue_1605
|
2018-01-10 12:04:41 -08:00 |
|
awefers
|
d1ed5db84d
|
Merge branch 'master' into issue_1693
|
2018-01-10 12:04:17 -08:00 |
|
Kim Kulling
|
45d5f2eec8
|
Merge branch 'master' into issue_1691
|
2018-01-10 20:50:37 +01:00 |
|
Kim Kulling
|
de8cc09a09
|
Merge pull request #1690 from awefers/issue_1689
glTF 2.0: Set camera "look at" to (0.0, 0.0, -1.0).
|
2018-01-10 20:50:11 +01:00 |
|
awefers
|
9f8e1945ea
|
Merge branch 'master' into issue_1605
|
2018-01-10 09:26:49 -08:00 |
|
awefers
|
735eb33a2b
|
Merge branch 'master' into issue_1693
|
2018-01-10 09:26:33 -08:00 |
|
awefers
|
7d4e144e05
|
Merge branch 'master' into issue_1691
|
2018-01-10 09:26:04 -08:00 |
|
Kim Kulling
|
17af5e127a
|
Merge branch 'master' into issue_1689
|
2018-01-10 17:14:47 +01:00 |
|
Kim Kulling
|
923f2b6e45
|
Merge pull request #1697 from ombre5733/patch-1
Fix typos and ease description of coordinate frame
|
2018-01-09 22:03:39 +01:00 |
Manuel Freiberger
|
e5e67ffd83
|
Fix typos and ease description of coordinate frame
|
2018-01-09 19:50:07 +01:00 |
|
Axel Wefers
|
901b981260
|
glTF: Always check signature
Always check signature for glTF 1.0 and glTF 2.0 files to select the correct importer. Fixes #1605
|
2018-01-09 09:37:57 -08:00 |
|
Axel Wefers
|
0eacddc5bf
|
glTF 2.0: Import scale for normal textures and strength for occlusion textures
resolves #1693
|
2018-01-08 15:19:27 -08:00 |
|
Axel Wefers
|
dc79b572cf
|
glTF 2.0: Assign default material to meshes with no material reference.
fixes #1691
|
2018-01-08 14:57:55 -08:00 |
|
Axel Wefers
|
4235765856
|
glTF 2.0: Set camera "look at" to (0.0, 0.0, -1.0).
|
2018-01-08 14:19:30 -08:00 |
|
Kim Kulling
|
89a62edb9a
|
Merge pull request #1688 from wanadev/import-postprocess-embedimages
Added post-process to embed images
|
2018-01-08 15:35:31 +01:00 |
Alexis Breust
|
559bc38e5d
|
Embedding images post-process
|
2018-01-08 09:26:52 +01:00 |
|
Kim Kulling
|
2aa68d7519
|
Merge pull request #1687 from assimp/issue_1574
closes https://github.com/assimp/assimp/issues/1574: add API to get n…
|
2018-01-07 12:33:43 +01:00 |
|
Kim Kulling
|
dd7a323103
|
Merge branch 'master' into issue_1574
|
2018-01-07 11:30:03 +01:00 |
|
Kim Kulling
|
0a5aa69f21
|
Merge pull request #1677 from assimp/remove_ctest
remove ctest to make workspace more readable.
|
2018-01-07 10:54:25 +01:00 |
Kim Kulling
|
abc01bcdf0
|
closes https://github.com/assimp/assimp/issues/1574: add API to get name of current branch.
|
2018-01-06 21:52:58 +01:00 |
|
Kim Kulling
|
b2bfb40859
|
Merge branch 'master' into remove_ctest
|
2018-01-06 21:31:22 +01:00 |
|
Kim Kulling
|
e8fffb7815
|
Merge pull request #1681 from wanadev/1674-buffer-relative-uri
[glTF2] Using relative buffers URI
|
2018-01-06 21:30:57 +01:00 |
|
Kim Kulling
|
3896f3ffce
|
Merge branch 'master' into 1674-buffer-relative-uri
|
2018-01-06 20:40:27 +01:00 |
|
Kim Kulling
|
84453cb3b4
|
Merge pull request #1686 from assimp/issue_1638
closes https://github.com/assimp/assimp/issues/1638: use memcpy inste…
|
2018-01-06 18:46:42 +01:00 |
|
Kim Kulling
|
527a5ea5f6
|
Merge branch 'master' into 1674-buffer-relative-uri
|
2018-01-06 18:06:26 +01:00 |
|
Kim Kulling
|
01081765ad
|
closes https://github.com/assimp/assimp/issues/1638: use memcpy instead of dynamic_cast.
|
2018-01-06 18:03:27 +01:00 |
|
Kim Kulling
|
e0e1b17881
|
Merge pull request #1685 from rspencer01/master
Remove check for 'assimp' in pyassimp search path
|
2018-01-06 16:11:02 +01:00 |
Robert Spencer
|
f149a2641b
|
Add compiled python files to the ignore list
|
2018-01-06 15:17:56 +02:00 |
|
Robert Spencer
|
ce5b78f6c0
|
Remove check for 'assimp' in name of directories to be searched for library in python port
|
2018-01-06 15:17:29 +02:00 |
A. Breust
|
ca152f41e2
|
Merge branch 'master' into 1674-buffer-relative-uri
|
2018-01-06 09:19:48 +01:00 |
|
Kim Kulling
|
d91d10f694
|
Merge pull request #1682 from wanadev/glb2-no-bin-file
[glTF2] Correctly export images with bufferView
|
2018-01-06 09:18:52 +01:00 |
|
Alexis Breust
|
9b5df71150
|
Not using external bin file for glb2
|
2018-01-05 10:28:12 +01:00 |
|
Alexis Breust
|
988acd00f1
|
Using relative buffers URI
|
2018-01-05 10:08:17 +01:00 |
|
Kim Kulling
|
abb09cc1d8
|
Merge pull request #1679 from assimp/issue_1460
closes https://github.com/assimp/assimp/issues/1460: skip uv- and col…
|
2018-01-04 13:45:43 +01:00 |
|
Kim Kulling
|
96b9626601
|
FBX: add missing test file.
|
2018-01-04 13:17:42 +01:00 |
|
Kim Kulling
|
a5e2a40d75
|
FBX: add simple unittest with a simple box.
|
2018-01-04 13:10:13 +01:00 |
|
Kim Kulling
|
f376a3e8cd
|
move data declaration after test if elements are in current scope.
|
2018-01-04 13:09:43 +01:00 |
|
Kim Kulling
|
9efa4282fe
|
closes https://github.com/assimp/assimp/issues/1460: skip uv- and color-components if these are not defined.
|
2018-01-04 12:37:35 +01:00 |
|
Kim Kulling
|
2f6dab53f4
|
Merge branch 'master' into remove_ctest
|
2018-01-04 00:28:04 +01:00 |
|
Kim Kulling
|
840416831d
|
Merge pull request #1676 from terziman/master
Bug fixes for IFC
|
2018-01-04 00:27:17 +01:00 |
|
Kim Kulling
|
c66c7d7ae6
|
remove ctest to make workspace more readable.
|
2018-01-03 17:22:07 +01:00 |
Leo Terziman
|
d0bee866c0
|
Merge remote-tracking branch 'github/master' into contrib
|
2018-01-03 16:15:07 +01:00 |