Commit Graph

5247 Commits

Author SHA1 Message Date
Kim Kulling
fd2da59427 fix unaligned memory access. 2017-11-29 16:23:12 +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
e442f5838f Merge branch 'master' into export_3mf 2017-11-28 15:41:33 +01:00
Kim Kulling
e17f7010d1 Merge pull request #1599 from assimp/kimkulling-verbose-analyze
Update .travis.sh
2017-11-28 15:41:22 +01:00
Kim Kulling
ef4842e128 Update .travis.sh
Make check more verbose.
2017-11-28 15:15:43 +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
e6381b7616 Merge pull request #1594 from Matter-and-Form/fix/gltf2-transforms
[glTF2] Fix transform matrices multiplication order
2017-11-28 09:22:01 +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
3e9bb23688 Merge pull request #1595 from Matter-and-Form/fix/gltf2-preserve-node-names
[glTF2] Preserve node names when importing
2017-11-28 08:47:49 +01:00
Kim Kulling
8ce5985aa0 Merge branch 'master' into fix/gltf2-preserve-node-names 2017-11-28 00:50:07 +01:00
Kim Kulling
890920110c Merge pull request #1596 from Matter-and-Form/feature/gltf2-tangents
[glTF2] Add support for tangents in import
2017-11-28 00:49:42 +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
0ce3641deb Merge pull request #1589 from aavenel/fix-typo-gltf
Fix typo on gltf2 camera parameters
2017-11-26 20:52:49 +01:00
Kim Kulling
623b5a515a Merge branch 'master' into fix-typo-gltf 2017-11-25 20:11:49 +01:00
Kim Kulling
44b38263a5 Merge pull request #1590 from aavenel/fix-cmake-unit-win
Copy assimp dll to unit folder on windows
2017-11-25 20:11:22 +01:00
Kim Kulling
b9845285ca Merge branch 'master' into fix-cmake-unit-win 2017-11-25 16:51:37 +01:00
Kim Kulling
a41bef0d54 Merge pull request #1591 from aavenel/fix-warnings-win
Fix all warnings on MSVC14
2017-11-25 12:28:51 +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
Alexandre Avenel
d8d5cf1a2d Copy assimp dll to unit folder on windows 2017-11-24 19:50:25 +01:00
Kim Kulling
6c59c83e0f add missing include 2017-11-24 19:48:21 +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
35819340aa Merge pull request #1588 from elect86/patch-15
Update jvm port supported formats
2017-11-23 14:20:48 +01:00
Kim Kulling
ad2223f1c5 Merge branch 'master' into patch-15 2017-11-23 13:31:39 +01:00
Kim Kulling
a1c1ad74bd Merge pull request #1582 from mrautio/master
Add support for building Mac OS X Framework bundles
2017-11-23 13:31:00 +01:00
Giuseppe Barbieri
fdb52723c4 Update Readme.md 2017-11-22 16:11:46 +01:00
Kim Kulling
d180cfcba5 Merge branch 'master' into master 2017-11-22 16:01:16 +01:00
Kim Kulling
ed4e6b0db0 Merge pull request #1580 from assimp/scene_combiner_crash
check for nullptr dereferencing before copying scene data
2017-11-22 16:00:46 +01:00
Kim Kulling
e35f789ace Merge branch 'master' into scene_combiner_crash 2017-11-22 13:46:14 +01:00
Kim Kulling
ac37977230 Merge pull request #1575 from elect86/patch-12
Update ValidateDataStructure.h, typo
2017-11-22 13:30:07 +01:00
Kim Kulling
454b8919b0 use one header for all xml-tags. 2017-11-21 21:34:25 +01:00
Kim Kulling
6da4258206 Merge branch 'master' into patch-12 2017-11-21 20:03:09 +01:00
Kim Kulling
a2ba3d630d Merge pull request #1586 from turol/validate
Enable data structure validation in cases where it doesn't cause failures
2017-11-21 20:02:28 +01:00
Kim Kulling
b474e75e29 3Mf-Export: add prototypes for relations and rest of 3MF-document. 2017-11-21 18:41:16 +01:00
Turo Lamminen
127705d347 Unit tests: Enable data structure validation in cases where it doesn't cause failures 2017-11-21 18:04:22 +02:00
Kim Kulling
a7be5b527f add missing return statement. 2017-11-20 23:53:53 +01:00