6566dcaf34
Merge branch 'master' into master
2018-01-12 13:14:05 -08:00
d360532667
Merge branch 'master' into document_material_reflectivity
2018-01-12 14:57:04 +01:00
ee54e9a38e
Merge pull request #1700 from rspencer01/master
...
Add pyassimp code generation script for materials
2018-01-12 14:55:29 +01:00
e53fdf365e
Merge branch 'master' into master
2018-01-12 13:14:32 +01:00
fe4da15d07
Merge pull request #1699 from ombre5733/patch-3
...
Removed a stray semicolon
2018-01-12 13:14:11 +01:00
843c658a33
Merge branch 'master' into patch-3
2018-01-12 09:40:35 +01:00
7c16a589e7
Merge pull request #1698 from ombre5733/patch-2
...
Clarify the matrix layout in the documentation
2018-01-12 09:40:08 +01:00
4cb4d59682
revert problematic unit test models to last upstream commits
2018-01-11 16:13:13 -08:00
dda91094f2
I want to see what GetErrorString() blurts out on the Travis failure real quick
2018-01-11 15:47:07 -08:00
4410de1c44
correct header path for new process
2018-01-11 13:21:40 -08:00
925be5e983
Merge branch 'master' into master
2018-01-11 13:13:46 -08:00
d64d5f762f
Merge branch 'master' into patch-3
2018-01-11 21:07:31 +01:00
33ddbf9aa0
Correct matrix layout documentation
...
Actually, both OpenGL and DirectX specify a matrix layout where the base vectors and the translational
part is consecutive in memory.
OpenGL uses post-multiplication of column-vectors and stores the matrix in column-major storage format:
| X1 Y1 Z1 T1 | | a |
| X2 Y2 Z2 T2 | | b |
| X3 Y3 Z3 T3 | | c |
| 0 0 0 1 | | 1 |
DirectX on the other hand uses row-major storage format but also pre-multiplication of
row-vectors
| a b c 1 | | X1 X2 X3 0 |
| Y1 Y2 Y3 0 |
| Z1 Z2 Z3 0 |
| T1 T2 T3 1 |
So a matrix is stored the same way in both frameworks and both times the translational part is consecutive,
which is not the format that Assimp uses.
2018-01-11 20:58:47 +01:00
47c8971b52
Merge branch 'master' into patch-2
2018-01-11 20:30:17 +01:00
b128cb9c4c
Merge pull request #1705 from awefers/issue_1684
...
macOS build fix
2018-01-11 20:19:37 +01:00
193165fb43
Merge branch 'master' into issue_1684
2018-01-11 10:16:20 -08:00
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
Christian Meurin
Kim Kulling
BuildTools
Manuel Freiberger
awefers
Tommy
Marco Di Benedetto
Robert Spencer