v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,064 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

6064 Commits (c788fff2b0c8491916eaac09c90fbb8ba80a89e9)

Author SHA1 Message Date
BuildTools 0c37ef55be IFCLoader.h fix 2018-01-15 19:23:13 -08:00
BuildTools f88572f572 fix includes 2018-01-15 19:14:44 -08:00
Christian Meurin 2f687ab91f
Merge branch 'master' into master 2018-01-15 19:11:53 -08:00
Christian Meurin 86fa0f4524
Merge branch 'master' into master 2018-01-15 19:10:14 -08:00
BuildTools d0c92e30be conflict resolution again, temp. move LogAux.h 2018-01-15 19:07:33 -08:00
BuildTools 68db518696 Fix IFC branch merge conflict 2018-01-15 19:00:56 -08:00
Kim Kulling d0bf5c10f9
Merge pull request #1704 from mesilliac/better_fbx_material_import 
Improve FBX material import
 2018-01-15 22:03:14 +01:00
Kim Kulling c07069821d
Merge branch 'master' into better_fbx_material_import 2018-01-14 22:04:20 +01:00
Kim Kulling fa321aba71
Merge pull request #1701 from mesilliac/document_material_reflectivity 
Document AI_MATKEY_REFLECTIVITY and AI_MATKEY_COLOR_REFLECTIVE.
 2018-01-14 22:03:41 +01:00
Kim Kulling 3820365a90
Merge branch 'master' into document_material_reflectivity 2018-01-14 12:22:19 +01:00
Kim Kulling 90978ef681
Merge pull request #1707 from assimp/ifc_40 
IFC: introduce new namespace fpr IFC-schema2x3
 2018-01-13 17:27:14 +01:00
Kim Kulling 03b43ee9c3
Merge branch 'master' into ifc_40 2018-01-13 14:40:50 +01:00
Kim Kulling 5e339d0ff0 fix case-sensitive typo in include. 2018-01-13 10:54:38 +01:00
Kim Kulling cecab969c6 IFC: introduce new namespace fpr IFC-schema2x3 2018-01-13 10:27:45 +01:00
Christian Meurin 6566dcaf34
Merge branch 'master' into master 2018-01-12 13:14:05 -08:00
Kim Kulling d360532667
Merge branch 'master' into document_material_reflectivity 2018-01-12 14:57:04 +01:00
Kim Kulling ee54e9a38e
Merge pull request #1700 from rspencer01/master 
Add pyassimp code generation script for materials
 2018-01-12 14:55:29 +01:00
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
BuildTools 4cb4d59682 revert problematic unit test models to last upstream commits 2018-01-11 16:13:13 -08:00
BuildTools dda91094f2 I want to see what GetErrorString() blurts out on the Travis failure real quick 2018-01-11 15:47:07 -08:00
BuildTools 4410de1c44 correct header path for new process 2018-01-11 13:21:40 -08:00
Christian Meurin 925be5e983
Merge branch 'master' into master 2018-01-11 13:13:46 -08: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
Tommy aba8383283 Add unit test for correct FBX phong material import. 2018-01-11 17:49:17 +01:00
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 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
Christian Meurin 538bc95499
Merge branch 'master' into master 2018-01-10 20:10:54 -08: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
Marco Di Benedetto 978c156c2a added import of material properties (double sided and transparency) in glTF 1.0 importer. 2018-01-10 20:02:41 +01:00
Tommy 909c0a820a Document AI_MATKEY_REFLECTIVITY and AI_MATKEY_COLOR_REFLECTIVE. 2018-01-10 19:22:56 +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