Commit Graph

6877 Commits

Author SHA1 Message Date
Alexis Breust
31a4ccaebb Added support for generating glb2 (binary glTF 2) 2017-12-14 16:11:12 +01:00
Alexandre Avenel
50bcaf39fd Fix issue #1623 : crash when loading multiple PLY files
Pointer mGeneratedMesh was not reset to nullptr when transfering ownership
to pScene->mMeshes
2017-12-12 20:48:51 +01:00
Turo Lamminen
89afe0780b B3DImporter: Fix double free when reusing Importer 2017-12-12 20:03:16 +02:00
Turo Lamminen
824dfc314b B3DImporter: Store node animations in unique_ptr 2017-12-12 19:46:11 +02:00
Turo Lamminen
08a35d4e1f B3DImporter: Store materials in unique_ptr 2017-12-12 19:46:11 +02:00
Turo Lamminen
f1707e920d B3DImporter: Store meshes in unique_ptr 2017-12-12 19:46:11 +02:00
Turo Lamminen
acab4c327e B3DImporter: Store animations in unique_ptr 2017-12-12 19:46:07 +02:00
Turo Lamminen
30ae14fae9 B3DImporter: Add unique_to_array helper function 2017-12-12 18:40:28 +02:00
Teybeo
99031997bd Fix 3MF define typo 2017-12-11 16:27:27 +01:00
Teybeo
8cd1ede9ba Fix 3MF define typo 2017-12-11 16:26:45 +01:00
Teybeo
7337474b6c Fix 3MF define typo 2017-12-11 16:26:00 +01:00
Kim Kulling
28b01cbdd1 Update to 4.1.0 2017-12-11 13:20:19 +01:00
Daniel Löber
2f93cd77f8 added path conversion code for unicode on windows 2017-12-11 10:28:50 +01:00
Giuseppe Barbieri
3e0b072263 Update FBXBinaryTokenizer.cpp 2017-12-09 23:42:23 +01:00
Kim Kulling
972d8517b5 fix the model xml 2017-12-07 17:50:18 +01:00
Kim Kulling
0588d6cccf FBX: closes https://github.com/assimp/assimp/issues/1619: return correct index for embedded textures. 2017-12-07 09:44:48 +01:00
Kim Kulling
c23c63e821 fix correct folder naming scheme. 2017-12-06 22:15:34 +01:00
Kim Kulling
95e9cd75fa 3MF: fix working test for 3MF-export. 2017-12-06 21:41:48 +01:00
Giuseppe Barbieri
e741e7aec6 Update MD5Loader.h 2017-12-02 23:16:10 +01:00
Kim Kulling
b8ab90ae4b Merge branch 'master' into patch-16 2017-12-02 21:15:54 +01:00
Turo Lamminen
2c3558fdd0 Remove ScopeGuard 2017-12-02 17:24:19 +02:00
Turo Lamminen
b60d84a8a2 C4D: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:23:49 +02:00
Turo Lamminen
bd4f024562 XGLLoader: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:22:19 +02:00
Turo Lamminen
e8eccfa27d FBX: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:19:18 +02:00
Turo Lamminen
6f50be82aa 3MF: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:15:57 +02:00
Turo Lamminen
f35d5952dc BlenderLoader: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:13:43 +02:00
Turo Lamminen
af8e297e0f BaseImporter: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:10:06 +02:00
Giuseppe Barbieri
42c1c733b9 Update MD3Loader.cpp 2017-12-01 15:20:50 +01:00
Kim Kulling
4811c0bdd1 Merge branch 'master' into fix/multibody-binary-stls 2017-11-30 10:13:56 +01:00
Kim Kulling
5822d1920e Update STLLoader.cpp
Retrigger travis + appveyor.
2017-11-30 09:22:55 +01:00
Kim Kulling
c27fda62e5 Merge branch 'master' into export_3mf 2017-11-30 00:32:23 +01:00
Kim Kulling
9be69a90b1 Merge branch 'master' into fix/multibody-binary-stls 2017-11-30 00:28:59 +01:00
Kim Kulling
46caecdf35 enable compiler switch test for no exporter requested. 2017-11-29 21:02:52 +01:00
Daniel Hritzkiv
98e98dc40c Fix node names sharing same name
Uses node name if it is set, and globally unique id otherwise.

This may still break in some models (glTF2 spec doesn’t guaruntee name values to be unique). However, I couldn’t cause it to break any further using gltf2 models on hand.

Closes #1600
2017-11-29 12:20:44 -05:00
Daniel Hritzkiv
67c236647d Restore import of multi mesh binary STLs
Regression introduced in: 9a9f18bbed

This restores the behaviour for binary STLs with multiple bodies.

The code could be improved (to reuse code found at the end of LoadASCIIFile) but for now this is a quick fix
2017-11-29 11:20:09 -05: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