Commit Graph

3043 Commits

Author SHA1 Message Date
Kim Kulling
46caecdf35 enable compiler switch test for no exporter requested. 2017-11-29 21:02:52 +01:00
Kim Kulling
b5e79c3cb6 fix invalid include 2017-11-29 16:11:33 +01:00
Kim Kulling
ddd23fad3f Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf 2017-11-28 19:05:00 +01:00
Kim Kulling
6a2cd1c91d Update D3MFExporter.cpp
Fix the build
2017-11-28 10:14:23 +01:00
Kim Kulling
9bd9b3d99c Merge branch 'master' into export_3mf 2017-11-28 09:24:02 +01:00
Kim Kulling
4b6e49ca7b Update D3MFExporter.h
Fix review findings.
2017-11-28 09:09:04 +01:00
Kim Kulling
4f972661e8 Update D3MFExporter.cpp
Fix review findings.
2017-11-28 09:08:16 +01:00
Kim Kulling
7a395e274f Merge branch 'master' into fix/gltf2-transforms 2017-11-28 08:48:19 +01:00
Kim Kulling
8ce5985aa0 Merge branch 'master' into fix/gltf2-preserve-node-names 2017-11-28 00:50:07 +01:00
Kim Kulling
09f7769820 remove unused attribute. 2017-11-27 23:36:32 +01:00
Kim Kulling
8e413ac1e3 Merge branch 'master' into export_3mf 2017-11-27 22:50:17 +01:00
Kim Kulling
7280dec838 fix unittest. 2017-11-27 22:46:57 +01:00
Kim Kulling
3dfca3bc84 3MF: add export to a given archive. 2017-11-27 21:48:33 +01:00
awefers
0031165789 Add support for tangents in glTF2.0 import
Closes #1562
2017-11-27 13:45:40 -05:00
awefers
0b04ae1d91 Preserve node names when importing glTF2.0
Closes #1522
2017-11-27 11:58:19 -05:00
awefers
e53d4735b0 Fix transform matrices multiplication order per glTF2.0 spec
Closes #1568
2017-11-27 11:32:05 -05:00
Kim Kulling
623b5a515a Merge branch 'master' into fix-typo-gltf 2017-11-25 20:11:49 +01:00
Alexandre Avenel
eb452b28a2 Fix warning on MSVC14 2017-11-25 11:38:12 +01:00
Alexandre Avenel
d529dd17f9 Fix warning cast double to float 2017-11-24 22:29:58 +01:00
Alexandre Avenel
273f6b0267 Fix MSVC14 warning cast double to real 2017-11-24 22:13:38 +01:00
Alexandre Avenel
f80e8b39a1 Fix warning C4138: '*/' found outside of comment on MSVC14 2017-11-24 22:08:50 +01:00
Alexandre Avenel
c63263b025 Fix typo on gltf2 camera parameters 2017-11-24 22:02:47 +01:00
Kim Kulling
0bdb375804 Add missing file export into archive. 2017-11-24 18:59:37 +01:00
Kim Kulling
09a5946dbd Prepare archive structure. 2017-11-23 22:47:18 +01:00
Kim Kulling
d180cfcba5 Merge branch 'master' into master 2017-11-22 16:01:16 +01:00
Kim Kulling
e35f789ace Merge branch 'master' into scene_combiner_crash 2017-11-22 13:46:14 +01:00
Kim Kulling
454b8919b0 use one header for all xml-tags. 2017-11-21 21:34:25 +01:00
Kim Kulling
b474e75e29 3Mf-Export: add prototypes for relations and rest of 3MF-document. 2017-11-21 18:41:16 +01:00
Kim Kulling
a7be5b527f add missing return statement. 2017-11-20 23:53:53 +01:00
Kim Kulling
9ca7b00280 Merge branch 'master' into export_3mf 2017-11-20 22:36:50 +01:00
Kim Kulling
c22b4acd47 3MF: Export initial commit. 2017-11-20 22:36:17 +01:00
Kim Kulling
70d9df868d Merge branch 'master' into patch-12 2017-11-20 22:23:47 +01:00
Kim Kulling
ba3acd7459 Merge branch 'master' into patch-12 2017-11-20 19:56:14 +01:00
Patrick Dähne
a05d74a281 [glTF2] Moved byteStride from accessor to bufferView 2017-11-20 19:01:28 +01:00
Kim Kulling
beff88228d Merge branch 'master' into master 2017-11-20 18:56:10 +01:00
Patrick Dähne
6cbfd5b977 [glTF2] Implemented reading binary glTF2 (glb) files 2017-11-20 14:59:05 +01:00
Mika Rautio
9f1dce8e57 Merge branch 'master' into master 2017-11-20 10:27:11 +02:00
Mika Rautio
4fb5038fb1 Add support for building Mac OS X Framework bundles 2017-11-20 00:10:05 +02:00
Kim Kulling
2a9f79f958 check for 0 properties before copy them 2017-11-19 19:05:51 +01:00
Kim Kulling
55c9761228 Merge branch 'master' into patch-12 2017-11-19 18:25:22 +01:00
Kim Kulling
9707fde709 check for nullptr dereferencing before copying scene data 2017-11-19 17:41:31 +01:00
Kim Kulling
65d6daa414 Merge branch 'master' into patch-13 2017-11-18 20:36:05 +01:00
Kim Kulling
1a1d96d3e2 Merge branch 'master' into fix_android 2017-11-18 18:32:58 +01:00
Kim Kulling
a8e65a1e8a Fix android build. 2017-11-18 18:32:16 +01:00
Turo Lamminen
8ae7231654 Blender: Silence warning about uninitialized member 2017-11-18 16:50:45 +02:00
Turo Lamminen
2c8cc1f732 BlenderDNA: Silence warning about uninitialized member 2017-11-18 16:49:03 +02:00
Turo Lamminen
bcffa28a33 MDLImporter: Don't take address of packed struct member 2017-11-18 16:39:43 +02:00
Turo Lamminen
1067ae4bfa FIReader: Fix strict-aliasing warnings 2017-11-18 15:54:40 +02:00
Turo Lamminen
c1515db56f Blender: Fix strict-aliasing warnings 2017-11-18 15:50:56 +02:00
Giuseppe Barbieri
703d046fd9 Update ValidateDataStructure.cpp 2017-11-18 00:34:00 +01:00