[GSoC 2017] Support 3MF Format Read/Write. #4046

Samir55 · 2017-06-24T16:13:58Z

3MF is generally smaller than other comparable 3D formats where transforms and object references are supported. 3MF has an advantage over the STL format since STL doesn’t contain color or material/property and also it doesn’t have mesh topology which in turn results in larger file size.
This topic was discussed in this original issue: #2811

Features:

Import/Export to 3MF files command line options.
Export plate with modifiers and print configs in .3MF (GUI).
Export selected objects with modifiers print configs in .3MF (GUI).

The test suite is found in 23_3mf.t in xs/t/.
The code is documented using Doxygen syntax.

Other Pull Requests:

Undo/Redo to rotate, miror, split, cut, etc (PR # 4100, Merged)
Documentation for Slic3r::Model. PR # 3958 (Merged)

…n slic3r.cpp Fix miniz.c error: * Miniz source functions were included more than once (once during TMF.cpp and once during compiling miniz.c in /xs/src/miniz. * Miniz is a header file library. * Solution was to add #define MINIZ_HEADER_FILE_ONLY to include the header part of the single header library miniz.c.

…sic string. - Remove #define #define MINIZ_HEADER_FILE_ONLY in the previous commit ( It's not the solution)

…use #define MINIZ_HEADER_FILE_ONLY before including it.

Add zip lib to target_link_libraries.

I think this makes TMF read/write more modular.

fix some typos and variable names.

* Write types in "[Content_Types].xml" at / * Create "_rels" folder at /

* write <triangles> element representing the volumes of each object.

* Adding ModelObject part number attribute (Specific to the new 3MF format).

* xmlns schema link added to < Types > element.

* Write ModelMaterials custom config data.

* Some Refactoring.

…roblem was that 3MF 3d matrices were row major matrices.

* Add namspaces as constant map<string, string> carrying name of namspace and the link to the namespace.

…alues but according to c++11 I must use .at(key) to compile.

…ume in TMFEditor::write() Some refactoring.

…tor clear() function.

…rs as 3MF options to Slic3r GUI.

Samir55 · 2017-08-19T02:51:49Z

@alexrj, @lordofhyphens I have updated the code according to the link you have provided in IRC and I have used also -Weffc++ and -Wextra flags to see warnings. There were only warnings about TMFEditor and TMFParserContext not having their override versions of copy constructor and =operator overloading. I will implement them when I wake up, I don't see any need for them in our case, however.

Samir55 · 2017-08-19T03:00:09Z

@alexrj @lordofhyphens If there are any improvements I should do please tell me :)

* Add Slic3r::ZipArchive class to handle creating zip files.

* Improvements in ZipArchive.

…we are using now ofstream.

* Add Doxygen documentation to ZipArchive class. * Update MANIFEST file/ * Update CMakeLists.txt file

…anipulated on windows as \r\n

lordofhyphens · 2017-09-03T13:12:19Z

Not in MANIFEST: t/23_3mf.t
Not in MANIFEST: t/models/3mf/box.3mf
Not in MANIFEST: t/models/3mf/chess.3mf
Not in MANIFEST: t/models/3mf/FaceColors.3mf
Not in MANIFEST: t/models/3mf/gimblekeychain.3mf
Not in MANIFEST: t/models/3mf/SplitPyramid.3mf
Not in MANIFEST: t/models/amf/FaceColors.amf.xml
Not in MANIFEST: t/models/stl/gimblekeychainExtended.stl
Not in MANIFEST: t/models/stl/spikey_top.stl
MANIFEST appears to be out of sync with the distribution

@Samir55 probably should add these files to the MANIFEST file.

Samir55 · 2017-09-03T13:41:16Z

I've added the test files to the MANIFEST But these files should be removed from the repo (they are no longer used)

t/models/3mf/FaceColors.3mf
t/models/3mf/SplitPyramid.3mf
t/models/stl/gimblekeychainExtended.stl

@lordofhyphens sorry I forgot to add them :)

lordofhyphens · 2017-09-03T13:48:41Z

@Samir55 Then you should git rm everything that shouldn't be in the repo and remove from MANIFEST.

Samir55 · 2017-09-03T14:33:24Z

t/models/3mf/FaceColors.3mf It was removed using unlink() function I've added in this commit . It is generated only when the test is run.
t/models/3mf/SplitPyramid.3mf this file was generated during a test I deleted later at this commit .
t/models/stl/gimblekeychainExtended.stl was a file generated also by 3mf test (conversion from gimblekeychainExtended.3mf to STL) and I've removed that file in that commit
@lordofhyphens I mean they are only on your branch.

lordofhyphens · 2017-09-03T15:24:06Z

Well, that would do it ;)

Samir55 and others added 30 commits May 30, 2017 20:00

Include Miniz library in xs/src/miniz and update CMakeLists.txt in /src

3c8aa93

Save porgress before merging from Slic3r upstream

9f634c4

Merge https://github.com/alexrj/Slic3r into gsoc-3mf

0980b3b

Add CLI --export-3mf option.

c99c461

Create the TMF Class.

f690cd8

- Create a Zip archive contating a 3dmodel.model file conatining a ba…

f166d30

…sic string. - Remove #define #define MINIZ_HEADER_FILE_ONLY in the previous commit ( It's not the solution)

Write Model metadata element to the 3MF zip file.

5cc834c

Renaming miniz.c to miniz.h, if you want to include it in other file …

bc703b8

…use #define MINIZ_HEADER_FILE_ONLY before including it.

Adding zip lib as a wrapper

a5e287a

Adding zip lib files

d818448

Fix CMakeLists.txt zip library error:

adce598

Add zip lib to target_link_libraries.

Add 3MF Read/Write Structure.

d9c1efc

I think this makes TMF read/write more modular.

Fix some errors in TMF.cpp

f82556d

Write ModelMaterial according to 3MF core specification.

81c32b9

fix some typos and variable names.

Add 3MF Types and OPC relationships.

2a1f397

* Write types in "[Content_Types].xml" at / * Create "_rels" folder at /

Write for each Object its mesh vertices element in 3MF Document.

945e99a

Write Model Volumes of each object in the 3MF Document.

1f07e6b

* write <triangles> element representing the volumes of each object.

* Refactoring removed Camel Case style.

3716372

* Adding ModelObject part number attribute (Specific to the new 3MF format).

Write 3MF Relationships in the zip archive.

49e67b2

* Remove the first extension from the exported file name.

874a6dd

Add partnumber to the constructor.

b89cbe3

Fix ContentTypes.xml file causing 3D Builder not to load the file.

e0ce716

* xmlns schema link added to < Types > element.

* Write Slic3r metadata version.

37acac8

* Write ModelMaterials custom config data.

* Write ModelObject Slic3r custom configs data.

5a331d1

* Some Refactoring.

* Write ModelVolume Sli3r custom configs to the 3MF Document.

6d335f6

* Write ModelInstances to the 3MF Document and small refactoring

d01981c

* Fix ModelInstance transformation matrix in < build > element. The p…

0dff154

…roblem was that 3MF 3d matrices were row major matrices.

Some Refactoring:

459b018

* Add namspaces as constant map<string, string> carrying name of namspace and the link to the namespace.

*Fix std::map namespaces. I was using [] operator to access the map v…

a067c94

…alues but according to c++11 I must use .at(key) to compile.

Samir55 added 10 commits August 12, 2017 21:13

Remove hardcoded Slic3r version & some enhancements.

2c5b2e2

Add another test to 3mf and some enhancements.

92d7ba1

Remove models which became not used in 3mf tests.

dacb426

Small change in apply_transformation for model instance in tmf.cpp.

f3c7c37

Some Refactoring to TMF.cpp

3646f06

Remove size_t in for loops and use const auto ModelObject or ModelVol…

7fc6e4e

…ume in TMFEditor::write() Some refactoring.

Use nullptr instead of NULL in TMFEditor.

150426f

Initialize TMFParserContext data memebers instead of calling std::vec…

8983147

…tor clear() function.

Fix a typo caused by refactoring

5b0d69f

Add Export plate with modifiers as 3MF and Export object with modifie…

974c8da

…rs as 3MF options to Slic3r GUI.

Samir55 changed the title ~~GSoC Support 3MF Format Read/Write.~~ [GSoC 2017] Support 3MF Format Read/Write. Aug 21, 2017

Samir55 added 7 commits August 21, 2017 16:28

* Remove zip library.

8fbf7dc

* Add Slic3r::ZipArchive class to handle creating zip files.

Add extract_entry function to ZipArchive class

f339f5e

* Modify TMF::write to adapt the new zip wrapper.

5c7ee9b

* Improvements in ZipArchive.

* Improve TMFEditor:write by removing to_string template function aw …

c02fdda

…we are using now ofstream.

* Split ZipArchive class to .cpp and .hpp

bf28d75

* Add Doxygen documentation to ZipArchive class. * Update MANIFEST file/ * Update CMakeLists.txt file

* Some improvements to ZipArchive.

26a560d

Fix the failing 3MF test on windows.The problem was the end line is m…

53e3b7d

…anipulated on windows as \r\n

lordofhyphens approved these changes Sep 3, 2017

View reviewed changes

Add 3mf test files to MANIFEST file.

92c8a8f

alranel approved these changes Sep 4, 2017

View reviewed changes

alranel merged commit 5cd9ecb into slic3r:master Sep 4, 2017

ghost mentioned this pull request May 9, 2018

Support 3MF specification #2811

Closed

[GSoC 2017] Support 3MF Format Read/Write. #4046

[GSoC 2017] Support 3MF Format Read/Write. #4046

Samir55 commented Jun 24, 2017 •

edited

Samir55 commented Aug 19, 2017

Samir55 commented Aug 19, 2017

lordofhyphens commented Sep 3, 2017 •

edited

Samir55 commented Sep 3, 2017

lordofhyphens commented Sep 3, 2017

Samir55 commented Sep 3, 2017 •

edited

lordofhyphens commented Sep 3, 2017

[GSoC 2017] Support 3MF Format Read/Write. #4046

[GSoC 2017] Support 3MF Format Read/Write. #4046

Conversation

Samir55 commented Jun 24, 2017 • edited

Features:

Related Links:

Other Pull Requests:

Samir55 commented Aug 19, 2017

Samir55 commented Aug 19, 2017

lordofhyphens commented Sep 3, 2017 • edited

Samir55 commented Sep 3, 2017

lordofhyphens commented Sep 3, 2017

Samir55 commented Sep 3, 2017 • edited

lordofhyphens commented Sep 3, 2017

Samir55 commented Jun 24, 2017 •

edited

lordofhyphens commented Sep 3, 2017 •

edited

Samir55 commented Sep 3, 2017 •

edited