Commit Graph

88 Commits

Author SHA1 Message Date
246790b3b9 ENABLE_THUMBNAIL_GENERATOR -> Add file Metadata/thumbnail.png into 3mf output 2019-10-24 09:20:33 +02:00
5cfcfb62db ENABLE_THUMBNAIL_GENERATOR -> WIP: Refactoring and preparation for adding thumbnails to exported gcode and 3mf files 2019-10-23 13:31:24 +02:00
de4a16048f #3075 - Fixed Reload from disk command for .amf files 2019-10-21 08:48:38 +02:00
d3c337b69a Fixed conflicts after merging with master 2019-10-09 11:17:48 +02:00
1661765d8d Make loading of obj files into TriangleMesh possible. 2019-10-01 14:58:37 +02:00
f7bd47c845 PRUS.cpp: Fixed an always-true condition in extract_model_from_archive
SupportMaterial.cpp: Simplified one condition (also solves a -Wmaybe-uninitialized warning on gcc)
2019-09-24 18:09:48 +02:00
2fbc4c37fc Fixed memsetting non-trivially-copyable types
Types stl_stats, stl_normal and SurfaceFillParams should not be zeroed by memset
This is not correct and also triggered warnings on gcc
2019-09-24 17:09:07 +02:00
a34a1341c5 Whitespace changes to supress misleading indentation warnings
These appear in newer gcc when spaces and tabs are mixed
2019-09-24 16:01:01 +02:00
03507f9b7d ENABLE_ENHANCED_RELOAD_FROM_DISK set as default 2019-09-23 15:35:49 +02:00
c9a6461b03 ENABLE_ENHANCED_RELOAD_FROM_DISK -> Fixed export/import to/from .amf to keep compatibility with 3rd part software. 2019-09-23 13:54:49 +02:00
4ea782deb0 ENABLE_ENHANCED_RELOAD_FROM_DISK -> Fixed export/import to/from .3mf to keep compatibility with 3rd part software. 2019-09-23 12:33:21 +02:00
5918bbf2b6 ENABLE_ENHANCED_RELOAD_FROM_DISK
1) Modified .zip.amf import/export to save/load volume matrices and source data

2) Incremented .zip.amf version to 3
2019-09-19 12:39:59 +02:00
0c461f6db6 Added tech ENABLE_ENHANCED_RELOAD_FROM_DISK
1) Reworked void Plater::priv::reload_from_disk() to be more general

2) Added source data to class ModelVolume

3) Modified .3mf import/export to save/load volume matrices and source data

4) Incremented .3mf version to 2
2019-09-19 09:09:11 +02:00
ebd6bc2be5 Follow-up of 9b5edbfa5f -> added comments 2019-09-09 11:50:19 +02:00
81a67836f9 Fixed import from obj files 2019-09-09 09:56:36 +02:00
074d7dfaa9 Fixed typo 2019-09-02 13:02:28 +02:00
5d85e48500 2nd attempt to fix non compatible (newer) .3mf and .amf import error handling on Linux and OsX 2019-09-02 11:55:14 +02:00
4ae89cf291 Attempt to fix non compatible (newer) .3mf and .amf import error handling on Linux and OsX 2019-09-02 09:38:45 +02:00
8fe733f229 Fixed import of .3mf and .amf files. Parse contained XML model file by chunch instead that as a whole 2019-08-28 16:03:26 +02:00
01f41e5b7f Follow-up of c7cdb2fd3e -> Fixed localization of error messages for .3mf and .amf version check 2019-08-26 09:35:04 +02:00
cc2d36dd29 Added version check for .3mf and .amf project files. PrusaSlicer will refuse to import files with newer version numbers. 2019-08-23 13:12:31 +02:00
f1294e7a67 Save/load printable flag to/from 3mf and amf 2019-08-06 16:27:56 +02:00
d2c908ef7f Merge branch 'master' into lm_warnings 2019-07-15 13:26:55 +02:00
8953e0980c Fixed merge issues. 2019-07-04 20:49:46 +02:00
d98aa0f91d Merge remote-tracking branch 'origin/master' into vb_undo_redo 2019-07-04 20:22:15 +02:00
e4efd22731 Some code improvements 2019-06-27 16:07:32 +02:00
605580d4ee Fixed small typo 2019-06-27 14:13:07 +02:00
3a62c342e2 Rewrote layers information export/import to/from 3mf using Boost Property Tree (xml_parser) 2019-06-27 13:55:24 +02:00
490e09b0ac WIP: Undo / Redo stack.
Integration of the "cereal" serialization library.
Serialization / deserialization of the DynamicConfig / DynamicPrintConfig.
DynamicPrintConfig serializes ordinal identifiers instead
of the option key strings to conserve space.
2019-06-26 13:26:49 +02:00
9bbe65c53e Fixed warnings in libslic3r 2019-06-25 16:04:29 +02:00
436b9c40fe Integrated the new layer height spans with configs into the backend.
Fixed some compiler warnings.
2019-06-20 16:15:09 +02:00
0f1b49381b Merge remote-tracking branch 'remotes/origin/ys_new_features' 2019-06-18 10:01:29 +02:00
c1fed74010 Sharing TriangleMesh objects between the front end (UI) and back end
(background processing)
2019-06-11 17:08:47 +02:00
da9ba7f94c Added missed include for the OSX build 2019-06-11 14:54:31 +02:00
3830afd943 Import/export of the Layers information to/from 3MF 2019-06-11 14:39:41 +02:00
6f80baab7a Import/export of the Layers information to/from AMF 2019-06-11 09:50:58 +02:00
9023e0bcba admesh refactoring: Use Eigen vec3i for indexed triangles. 2019-06-10 21:14:58 +02:00
c073749ee1 admesh refactoring: separation of the shared vertices / indices
into an indexed_triangle_set structure
2019-06-10 18:30:54 +02:00
068263a62d admesh refactoring: Removed the shared_vertices counter as it is now
contained inside v_shared std::vector
2019-06-10 17:36:15 +02:00
362c229a5c Refactored admesh to get rid of the error and fp members of stl_file. 2019-06-10 17:17:36 +02:00
0e26eb0aeb WIP: Admesh - replacement of C memory allocation with std vectors 2019-06-04 22:06:42 +02:00
97e04326a1 Fix for opening issues with archive files. 2019-06-03 15:27:46 +02:00
b4cf356198 Adjust miniz usage to use nowide FILE streams everywhere. 2019-06-02 22:27:35 +02:00
a907798534 Merge branch 'tm_minz_update' 2019-05-31 18:34:59 +02:00
e15ab5a0cc Fix of loading the variable layer height profile and the SLA support
points for projects with instances.

3mf does not support a concept of instances, therefore all the instances
of all objects are indexed in a linear fashion. However, the 3mf files
index the layer height profiles and the SLA support points with
the object ID. The loading was fixed to take the different indexing
into account.
2019-05-24 12:17:54 +02:00
a1ef85dde6 Replacing old miniz version with new 2.1.0
#2333: The amalgamated library is used from the 'releases' section of the original upstream https://github.com/richgel999/miniz
2019-05-23 11:52:31 +02:00
a8ceb971a4 Use the correct expat location
expat.h is (in most Linux distributions, at least) located directly in
/usr/include.  Because the compiler is called with the src directory in
the include path, the include of <expat/expat.h> happens to work but
results in the bundled version of the header being used instead of the
system version.
2019-05-22 10:10:58 +02:00
b7691980f1 Fix of #1998 2019-03-25 12:07:43 +01:00
322d2a1fab Reworked the command line interface based on the current state
of the upstream.
Thanks @alexrj, @lordofhyphens for the original code of slic3r.cpp
2019-03-13 15:44:50 +01:00
29d296c938 SLA support points are correctly appointed as user-modified
SLA gizmo point cache is reloaded when appropriate
2019-03-11 15:05:36 +01:00