Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,475 Commits 19 Branches 43 Tags
e53fdf365e5b1c5f01acaedea38994028cebcb9c
Commit Graph

5475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
e53fdf365e Merge branch 'master' into master 2018-01-12 13:14:32 +01:00
Kim Kulling
fe4da15d07 Merge pull request #1699 from ombre5733/patch-3 
Removed a stray semicolon
 2018-01-12 13:14:11 +01:00
Kim Kulling
843c658a33 Merge branch 'master' into patch-3 2018-01-12 09:40:35 +01:00
Kim Kulling
7c16a589e7 Merge pull request #1698 from ombre5733/patch-2 
Clarify the matrix layout in the documentation
 2018-01-12 09:40:08 +01:00
Manuel Freiberger
d64d5f762f Merge branch 'master' into patch-3 2018-01-11 21:07:31 +01:00
Manuel Freiberger
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
Kim Kulling
47c8971b52 Merge branch 'master' into patch-2 2018-01-11 20:30:17 +01:00
Kim Kulling
b128cb9c4c Merge pull request #1705 from awefers/issue_1684 
macOS build fix
 2018-01-11 20:19:37 +01:00
awefers
193165fb43 Merge branch 'master' into issue_1684 2018-01-11 10:16:20 -08:00
Axel Wefers
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
Kim Kulling
3b77703b51 Merge branch 'master' into patch-2 2018-01-11 14:10:49 +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
Robert Spencer
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
Manuel Freiberger
4a033e9767 Removed a stray semicolon 2018-01-09 23:48:08 +01:00
Manuel Freiberger
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
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