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

3192 Commits

Author SHA1 Message Date
Turo Lamminen
a8fd9f668f ASE: Explicitly write out Material move constructor and assignment operator 
Because MSVC doesn't support defaulting them
 2018-01-24 12:25:30 +02:00
Turo Lamminen
cbd7916ced 3DS: Explicitly write out Material move constructor and assignment operator 
Because MSVC doesn't support defaulting them
 2018-01-24 12:11:19 +02:00
Turo Lamminen
e6ff15d201 3DS: Initialize Material name in initializer list 2018-01-23 20:41:26 +02:00
Turo Lamminen
4acd96d405 3DS: Remove Material default constructor 2018-01-23 20:36:51 +02:00
Turo Lamminen
dd7035372d 3DS: Pass default material name to constructor instead of changing after the fact 2018-01-23 20:36:05 +02:00
Turo Lamminen
10246bf052 3DS: Pass default material name to Material constructor 2018-01-23 20:29:46 +02:00
Turo Lamminen
f2ec3eeeb8 ASE: Delete Material default constructor 2018-01-23 20:20:37 +02:00
Turo Lamminen
209966ef35 ASE: Pass default material name to constructor 2018-01-23 20:15:21 +02:00
Turo Lamminen
1b28124f21 ASE: Pass a default material name when resizing submaterials buffer 2018-01-23 19:54:16 +02:00
Turo Lamminen
4b1b5f1b59 ASE: Pass a default material name when resizing materials buffer 2018-01-23 19:50:20 +02:00
Turo Lamminen
60d78f1701 ASE: Add Material constructor which takes material name 2018-01-23 19:43:15 +02:00
Turo Lamminen
d49996d8a6 3DS: Add Material constructor which takes material name 2018-01-23 19:38:38 +02:00
Turo Lamminen
024aade208 ASE: Add explicit default constructors and assignment operators to Material 2018-01-23 19:33:50 +02:00
Turo Lamminen
9e7b21f83d 3DS: Add explicit default constructors and assignment operators to Material 2018-01-23 19:24:22 +02:00
Turo Lamminen
4d946d9e31 ASE: Reformat another initializer list 2018-01-23 19:10:00 +02:00
Turo Lamminen
6c4e3bce53 3DS: Reformat initializer list 2018-01-23 18:58:23 +02:00
Turo Lamminen
70ae30f26a ASE: Reformat initializer list 2018-01-23 18:58:19 +02:00
kim kulling
88a0bb1b6d FBX: store UnitScaleFactor for fbx-files. 2018-01-23 15:13:23 +01:00
kim kulling
8ac1de3287 closes https://github.com/assimp/assimp/issues/1390: aiScene now stores metadata as well. 2018-01-23 15:12:57 +01:00
Kim Kulling
f0d03ec6b8 closes https://github.com/assimp/assimp/issues/1722: use a const reference to fix issue with ppc. 2018-01-22 14:35:06 +01:00
Kim Kulling
8b9b770f9f Merge branch 'master' into gltf2-fixes 2018-01-16 21:50:48 +01:00
Kim Kulling
81fbe2c7d3 Merge branch 'master' into issue_1660 2018-01-16 17:13:02 +01:00
Kim Kulling
d230635ff6 STLLoader: closes https://github.com/assimp/assimp/issues/1660: use memcpy instead of a c-style dynamic cast to parse a aiVector3D 2018-01-16 16:31:15 +01:00
Alexis Breust
5e6cae3094 Force normalized normals 2018-01-16 09:56:44 +01:00
Alexis Breust
0f4189c77e Forced 4-bits alignment for glTF buffers 2018-01-16 09:26:18 +01:00
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
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
c07069821d Merge branch 'master' into better_fbx_material_import 2018-01-14 22:04:20 +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
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
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
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
88df886bcc Merge branch 'master' into issue_1605 2018-01-11 11:39:14 +01:00
Christian Meurin
538bc95499 Merge branch 'master' into master 2018-01-10 20:10:54 -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
awefers
bb71f2ba64 Merge branch 'master' into issue_1605 2018-01-10 12:04:41 -08:00
Kim Kulling
45d5f2eec8 Merge branch 'master' into issue_1691 2018-01-10 20:50:37 +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
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
0fff3b1232 Merge branch 'master' into master 2018-01-08 15:36:03 +01:00
Alexis Breust
559bc38e5d Embedding images post-process 2018-01-08 09:26:52 +01:00