Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

6877 Commits

Author SHA1 Message Date
Marco Di Benedetto
5f38bd01ec restored gltf checks. 2018-01-18 22:28:44 +01:00
Marco Di Benedetto
c749594e9d gltf instant ok on valid extension. 2018-01-18 19:12:51 +01:00
Marco Di Benedetto
55ca48e838 Merge branch 'master' of https://github.com/assimp/assimp 2018-01-18 19:08:54 +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
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
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
Christian Meurin
5ef13e7b38 Merge branch 'master' into master 2018-01-07 11:34:18 -08:00
Kim Kulling
dd7a323103 Merge branch 'master' into issue_1574 2018-01-07 11:30:03 +01:00
Christian Meurin
7b5c543b82 Merge branch 'master' into master 2018-01-06 14:48:23 -08: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
3896f3ffce Merge branch 'master' into 1674-buffer-relative-uri 2018-01-06 20:40:27 +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
6bbdb669e1 Merge branch 'master' into master 2018-01-06 09:30:13 +01:00
A. Breust
ca152f41e2 Merge branch 'master' into 1674-buffer-relative-uri 2018-01-06 09:19:48 +01:00
BuildTools
66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Alexis Breust
9b5df71150 Not using external bin file for glb2 2018-01-05 10:28:12 +01:00
Alexis Breust
988acd00f1 Using relative buffers URI 2018-01-05 10:08:17 +01:00
Kim Kulling
f376a3e8cd move data declaration after test if elements are in current scope. 2018-01-04 13:09:43 +01:00
Kim Kulling
9efa4282fe closes https://github.com/assimp/assimp/issues/1460: skip uv- and color-components if these are not defined. 2018-01-04 12:37:35 +01:00
Kim Kulling
2f6dab53f4 Merge branch 'master' into remove_ctest 2018-01-04 00:28:04 +01:00
Kim Kulling
c66c7d7ae6 remove ctest to make workspace more readable. 2018-01-03 17:22:07 +01:00