0e99f1f587
Build fix for 1684
...
Requires cast from size_t to uint64 like in other places, otherwise the call to the constructor for GenericValue() is ambiguous.
Fixes #1684
2018-01-11 10:15:05 -08:00
aba8383283
Add unit test for correct FBX phong material import.
2018-01-11 17:49:17 +01:00
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
3b77703b51
Merge branch 'master' into patch-2
2018-01-11 14:10:49 +01:00
c5101b185d
Merge pull request #1696 from awefers/issue_1605
...
glTF: Always check signature
2018-01-11 14:10:12 +01:00
88df886bcc
Merge branch 'master' into issue_1605
2018-01-11 11:39:14 +01:00
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
538bc95499
Merge branch 'master' into master
2018-01-10 20:10:54 -08:00
8fd944a609
Merge branch 'issue_1693' of https://github.com/awefers/assimp into issue_1693
2018-01-10 16:47:36 -08:00
3e127bebff
glTF 2.0: Import scale for normal textures and strength for occlusion textures
...
resolves #1693
2018-01-10 16:45:17 -08:00
936eb26dde
Merge branch 'master' into issue_1605
2018-01-11 00:54:35 +01:00
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
bb71f2ba64
Merge branch 'master' into issue_1605
2018-01-10 12:04:41 -08:00
d1ed5db84d
Merge branch 'master' into issue_1693
2018-01-10 12:04:17 -08:00
45d5f2eec8
Merge branch 'master' into issue_1691
2018-01-10 20:50:37 +01:00
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
978c156c2a
added import of material properties (double sided and transparency) in glTF 1.0 importer.
2018-01-10 20:02:41 +01:00
909c0a820a
Document AI_MATKEY_REFLECTIVITY and AI_MATKEY_COLOR_REFLECTIVE.
2018-01-10 19:22:56 +01:00
9f8e1945ea
Merge branch 'master' into issue_1605
2018-01-10 09:26:49 -08:00
735eb33a2b
Merge branch 'master' into issue_1693
2018-01-10 09:26:33 -08:00
7d4e144e05
Merge branch 'master' into issue_1691
2018-01-10 09:26:04 -08:00
d33cc8ac5a
Merge branch 'master' of https://github.com/assimp/assimp
2018-01-10 17:36:43 +01:00
17af5e127a
Merge branch 'master' into issue_1689
2018-01-10 17:14:47 +01:00
c036a3b840
Add pyassimp code generation script for materials
...
In the style of gen/structsgen.py, we construct a similar method for
keeping the constants in materials.py up to date.
2018-01-10 12:33:44 +02:00
4a033e9767
Removed a stray semicolon
2018-01-09 23:48:08 +01:00
8fe2ba31a9
Clarify the matrix layout
...
The columns of the matrix are the images of the standard base vectors rather than the base vectors themselves. Added some
description of the row-major storage format.
2018-01-09 23:46:36 +01:00
ab9f3c254e
Merge branch 'master' into master
2018-01-09 14:11:04 -08:00
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
e5e67ffd83
Fix typos and ease description of coordinate frame
2018-01-09 19:50:07 +01:00
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
0eacddc5bf
glTF 2.0: Import scale for normal textures and strength for occlusion textures
...
resolves #1693
2018-01-08 15:19:27 -08:00
dc79b572cf
glTF 2.0: Assign default material to meshes with no material reference.
...
fixes #1691
2018-01-08 14:57:55 -08:00
4235765856
glTF 2.0: Set camera "look at" to (0.0, 0.0, -1.0).
2018-01-08 14:19:30 -08:00
0fff3b1232
Merge branch 'master' into master
2018-01-08 15:36:03 +01:00
89a62edb9a
Merge pull request #1688 from wanadev/import-postprocess-embedimages
...
Added post-process to embed images
2018-01-08 15:35:31 +01:00
559bc38e5d
Embedding images post-process
2018-01-08 09:26:52 +01:00
5ef13e7b38
Merge branch 'master' into master
2018-01-07 11:34:18 -08:00
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
dd7a323103
Merge branch 'master' into issue_1574
2018-01-07 11:30:03 +01:00
0a5aa69f21
Merge pull request #1677 from assimp/remove_ctest
...
remove ctest to make workspace more readable.
2018-01-07 10:54:25 +01:00
6a76959f5b
"s, <s, and >s oh my...
2018-01-06 21:20:45 -08:00
0c4c66be50
I assume too much about header paths...
2018-01-06 21:00:11 -08:00
123fb1d009
../../code header path oversight fixed
2018-01-06 20:50:01 -08:00
7b5c543b82
Merge branch 'master' into master
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.
2018-01-06 21:52:58 +01:00
b2bfb40859
Merge branch 'master' into remove_ctest
2018-01-06 21:31:22 +01:00
e8fffb7815
Merge pull request #1681 from wanadev/1674-buffer-relative-uri
...
[glTF2] Using relative buffers URI
2018-01-06 21:30:57 +01:00
3896f3ffce
Merge branch 'master' into 1674-buffer-relative-uri
2018-01-06 20:40:27 +01:00
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
527a5ea5f6
Merge branch 'master' into 1674-buffer-relative-uri
2018-01-06 18:06:26 +01:00
Axel Wefers
Tommy
Kim Kulling
Christian Meurin
Marco Di Benedetto
Robert Spencer
Manuel Freiberger
Alexis Breust
BuildTools
Kim Kulling