Commit Graph

1616 Commits

Author SHA1 Message Date
Tamás Mészáros
6bf9ff713d fix return value error 2018-11-16 08:46:15 +01:00
tamasmeszaros
58bfd29ea8 Merge branch 'dev_native' of github.com:prusa3d/Slic3r into dev_native 2018-11-15 18:06:10 +01:00
tamasmeszaros
810fcc2221 wip: reorganizing things to support accurate pad creation. Also more accurate progress indication. 2018-11-15 18:05:47 +01:00
Enrico Turri
2299625a63 Hidden camera target 2018-11-15 15:43:24 +01:00
Enrico Turri
9bb04ff15a Modified menu for open/save/save as project (3mf) and import/export 2018-11-15 15:27:39 +01:00
tamasmeszaros
f3d02a5cdf Slicing the supports seems to work fine with the merged mesh. 2018-11-15 15:14:14 +01:00
tamasmeszaros
88648c8214 a small cleanup 2018-11-15 10:47:20 +01:00
tamasmeszaros
95abba5b96 Fix for build error and perhaps the grayed out arrange button 2018-11-15 09:46:55 +01:00
tamasmeszaros
73eb31d43c Merge branch 'dev_native' of github.com:prusa3d/Slic3r into dev_native 2018-11-14 18:04:52 +01:00
tamasmeszaros
e98c83a025 WIP:
* slicing supports
* adding the pad geometry
* rasterizing the support and pad slices
2018-11-14 18:04:43 +01:00
Enrico Turri
a56cee5f60 Gizmos rotate, move and scale rendered on top of geometry 2018-11-14 10:43:52 +01:00
bubnikv
3858fecf0c Fixed merge conflict: Added ModelInstance ID to the SLAPrintObject Instance 2018-11-13 19:22:05 +01:00
bubnikv
fedc78dc91 Merge branch 'dev_native' of https://github.com/Prusa3d/Slic3r into dev_native 2018-11-13 18:44:45 +01:00
bubnikv
88445f98f0 Fixed forward declaration of enums, made volumes with negative ID
directly unselectable.
2018-11-13 18:44:30 +01:00
tamasmeszaros
9a93b1d3e9 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend
# Conflicts:
#	src/libslic3r/SLAPrint.hpp
2018-11-13 17:50:17 +01:00
tamasmeszaros
7d41b9a2d6 add step completeness checks 2018-11-13 17:46:02 +01:00
bubnikv
03875e7d71 GLVolume: split composite_id to object_id, volume_id and instance_id.
WIP: Added creation of GLVolumes for SLA supports.
2018-11-13 17:45:44 +01:00
tamasmeszaros
ffe6862626 Slicing object and rasterization generates output zip. Needs testing. 2018-11-13 17:33:03 +01:00
tamasmeszaros
95419370e1 zip file output dialog and status indication for sla in the statusbar. 2018-11-13 11:53:54 +01:00
Enrico Turri
03390c594f Removed code committed by mistake in previous commit 2018-11-13 11:25:59 +01:00
Enrico Turri
dc8523cac8 Fixed convex hull and volume offset after object split to part 2018-11-13 10:12:42 +01:00
Enrico Turri
3d4e37ceb6 Center volumes after split to parts 2018-11-13 08:36:10 +01:00
tamasmeszaros
90c38daeae trying to get the export dialog for zip files. 2018-11-12 18:09:47 +01:00
tamasmeszaros
c6695538a9 Merge remote-tracking branch 'origin/tm_sla_supports_backend' into dev_native 2018-11-12 17:42:20 +01:00
tamasmeszaros
72a1f36281 Merge branch 'dev_native' of github.com:prusa3d/Slic3r into dev_native 2018-11-12 17:37:53 +01:00
tamasmeszaros
92a2b6161b Merge remote-tracking branch 'origin/tm_sla_supports_backend' into dev_native 2018-11-12 17:36:54 +01:00
tamasmeszaros
31967d0d1d support generation when support point is added or removed. Rendering interface for SLA supports 2018-11-12 17:35:57 +01:00
bubnikv
4f200c5bd5 Merge branch 'dev_native' of https://github.com/Prusa3d/Slic3r into dev_native 2018-11-12 16:28:35 +01:00
bubnikv
48173e2a55 Fixed synchronization of background processing with the front end. 2018-11-12 16:28:27 +01:00
tamasmeszaros
98a640ea06 Getting rid of AppController. 2018-11-12 15:07:41 +01:00
tamasmeszaros
a4e1ab2281 Getting rid of AppController. 2018-11-12 15:02:42 +01:00
tamasmeszaros
33eade5300 SLA backround processing pipeline invisible but runs. 2018-11-12 11:46:38 +01:00
Enrico Turri
22dbcbcd9c Enhanced volumes manipulation - wip 2018-11-12 08:54:22 +01:00
tamasmeszaros
e05063c8b1 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-09 18:35:32 +01:00
tamasmeszaros
5b34e54ce9 Merge remote-tracking branch 'origin/dev_native' into dev_native 2018-11-09 18:33:38 +01:00
tamasmeszaros
cc4c720160 Working on SLAPrint pipeline. 2018-11-09 18:32:35 +01:00
tamasmeszaros
481cba0b7f Fixing sla support parameter names. 2018-11-09 18:31:36 +01:00
bubnikv
a2c702dec5 Merge branch 'dev_native' of https://github.com/Prusa3d/Slic3r into dev_native 2018-11-09 14:25:39 +01:00
bubnikv
3075e7f40f Fixed update of ModelObject / ModelVolume configs on Print,
fixed some compiler warnings.
2018-11-09 14:25:18 +01:00
tamasmeszaros
3722efd8e9 Added parameters to SLAObjectConfig 2018-11-09 13:45:55 +01:00
bubnikv
0555fb4bcc Merge branch 'dev_native' of https://github.com/Prusa3d/Slic3r into dev_native 2018-11-09 12:03:28 +01:00
bubnikv
870c435e1b WIP: SLAPrintObjectConfig, SLAPrint / SLAPrintObject initialization. 2018-11-09 12:02:42 +01:00
Enrico Turri
12ef6913d5 ModelObject::instance_bounding_box() fixed to take in account for volumes' transforms 2018-11-09 10:31:58 +01:00
bubnikv
bbfbe88a5f Integrated SLAPrint into background processing.
Fixed couple of compiler warnings.
2018-11-08 20:18:40 +01:00
tamasmeszaros
dbf6ddd344 Trying to bypass igl in 32 bit MSVC 2018-11-08 17:15:10 +01:00
tamasmeszaros
4a2da3d443 Trying to fix compilation of IGL AABB tree on 32 bit platform.
Removing alignment constraints from Eigen Matrix aliases.
2018-11-08 16:43:33 +01:00
tamasmeszaros
100386c699 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-08 16:20:37 +01:00
tamasmeszaros
4662fd0e73 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-08 16:19:22 +01:00
Vojtech Kral
3e4af381c9 Fix rendering performance on macOS 2018-11-08 15:31:29 +01:00
Vojtech Kral
24b30caf94 Fix clang build / detect standalone size_t 2018-11-08 15:19:50 +01:00
bubnikv
05b1ed3c2a Fixed a compilation issue on OSX 2018-11-08 15:02:47 +01:00
bubnikv
34e525766b Fix of friend declaration on a template parameter, according to C++11 2018-11-08 14:57:42 +01:00
bubnikv
c2e46350f2 Separated Print / PrintObject into PrintBase.cpp/h to support SLAPrint 2018-11-08 14:23:17 +01:00
tamasmeszaros
91a79e0343 Support tree interface extended with mouse event handling and refresh callback. 2018-11-08 10:21:13 +01:00
Enrico Turri
d590661d40 Fixed objects name after 3mf import 2018-11-08 10:18:19 +01:00
tamasmeszaros
f6591f000e slicing the supports WIP 2018-11-07 17:57:02 +01:00
tamasmeszaros
97b3d94760 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports 2018-11-07 15:30:41 +01:00
tamasmeszaros
19b1aa081d SLAPrint concept under its way. 2018-11-07 15:29:13 +01:00
Lukas Matena
377350db33 When iterating over PrintObject regions, use PrintObject::region_volumes (see also yesterday's commit 3eea327) 2018-11-07 15:17:29 +01:00
bubnikv
041de161a9 Fixes to storing and loading configs from AMF/3MF. 2018-11-07 14:57:50 +01:00
Lukas Matena
9ca9e2a545 Merge branch lm_colorprint_integration into dev_native + deleting ticks outside slider range 2018-11-07 14:44:47 +01:00
Enrico Turri
b05aa00089 Fixed update of ModelVolume offset after GLVolume manipulation 2018-11-07 14:01:03 +01:00
bubnikv
e4eec90046 Fixed loading of old 3mf files. 2018-11-06 19:09:54 +01:00
tamasmeszaros
22c9c5ae95 Trying to engage support creation when the gizmo gets disabled. 2018-11-06 18:01:18 +01:00
bubnikv
879a7bb9e4 Fixed a typo 2018-11-06 17:27:08 +01:00
Enrico Turri
f9caa6f7f1 Fixed backend detection of out of print volume 2018-11-06 16:04:30 +01:00
Enrico Turri
57c769b63b Selection of modifiers in 3D scene 2018-11-06 15:51:33 +01:00
bubnikv
3eea327ef0 WIP: When iterating over PrintObject's regions, use the region count
by PrintObject::region_volumes. This is due to the way Print::apply()
works, it does not invalidate an existing PrintObject if a new region
is added to the print.
2018-11-06 15:31:26 +01:00
tamasmeszaros
a49b506121 Trying to fix compilation on linux and mac. 2018-11-06 14:34:20 +01:00
Enrico Turri
0810beae77 Reintroduced instances synchronization 2018-11-06 08:47:21 +01:00
bubnikv
7ffa22191d Fixed some issues with front end / back end synchronization. 2018-11-05 17:52:55 +01:00
Enrico Turri
864bc6ad48 Mirror of ModelVolume as transformation component (without modifying the mesh) 2018-11-05 08:51:00 +01:00
Enrico Turri
fb6a08cfb0 Rotate of ModelVolume as transformation component (without modifying the mesh) 2018-11-05 08:31:54 +01:00
bubnikv
0870f81425 Merge remote-tracking branch 'remotes/origin/vb_modelbase_id_refactor' into dev_native 2018-11-02 20:53:47 +01:00
bubnikv
3b72748489 Removed the STDMOVE macro. 2018-11-02 20:45:23 +01:00
bubnikv
5da83742a3 Some refactoring. 2018-11-02 20:41:49 +01:00
bubnikv
cf5dcfa9ed ModelBase ID refactoring, starting to work.
Now it remains to clean up some of the no more used Model interfaces.
2018-11-02 19:49:40 +01:00
bubnikv
d26d90ac85 ModelBase ID refactoring, WIP 2018-11-02 15:08:08 +01:00
bubnikv
ca32338cea ModelBase ID refactoring, WIP 2018-11-02 14:47:13 +01:00
Enrico Turri
385b0f261d Scale of ModelVolume as transformation component (without modifying the mesh) 2018-11-02 14:41:08 +01:00
Enrico Turri
7114b80882 Use Transform3d in place of Transform3f as parameter of mesh transform functions 2018-11-02 13:47:47 +01:00
Enrico Turri
3aad8b5fd2 Translation of ModelVolume as transformation component (without modifying the mesh) 2018-11-02 12:11:28 +01:00
tamasmeszaros
48bc166d6d Importing the SLA computing module into the native source tree. 2018-11-02 11:57:57 +01:00
bubnikv
259aed3bf3 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-11-01 15:15:59 +01:00
bubnikv
3057014dcf WIP Fixed "below the print bed" issue on arrange.
Still the auto arrange does not take into account the current full
transformation matrix.
2018-11-01 15:15:46 +01:00
Enrico Turri
00ec33ef16 Fixed build when ENABLE_MODELVOLUME_TRANSFORM is disabled 2018-11-01 14:41:18 +01:00
bubnikv
85597a4039 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-11-01 14:26:41 +01:00
bubnikv
66c2f28dcb Fixed print object below bed, fixed associated unit tests. 2018-11-01 14:25:37 +01:00
Enrico Turri
b8168d421c Refactoring 2018-11-01 14:25:10 +01:00
Enrico Turri
26d373a2e2 Added extended functionality to Geometry::Transformation class 2018-11-01 13:42:07 +01:00
Enrico Turri
42d3db9ab1 Fixed typo in Transformation::set_rotation() 2018-11-01 10:25:08 +01:00
Enrico Turri
a15bf7cc25 New selection set as default 2018-11-01 10:06:55 +01:00
Enrico Turri
00222226ed Mirror component of transformations set as default 2018-11-01 08:46:44 +01:00
bubnikv
da37094a09 Bugfix: Slice at the correct height. 2018-10-31 20:02:07 +01:00
bubnikv
e6d78cc063 Print step invalidation: Improvement of readability. 2018-10-31 19:21:00 +01:00
bubnikv
75c097010d Finished (?) switching between the FDM / SLA profiles,
fixed an invalidation bug in Print::apply()
2018-10-31 18:05:25 +01:00
bubnikv
7e71aaffd5 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-31 16:25:55 +01:00
bubnikv
fd1c5dd218 WIP: SL1 profiles, SL1 in wizard, switching between FFF / SLA 2018-10-31 16:22:36 +01:00
Enrico Turri
afa907504f Fixed autolevel on bed with non uniform scaling 2018-10-31 16:13:07 +01:00
Enrico Turri
d6d632d4fc Added Geometry::Transformation class. Use it into ModelInstance, ModelVolume and GLVolume 2018-10-31 14:56:51 +01:00
Enrico Turri
da4903a37f New selection -> Disabled instances synchronization 2018-10-31 09:39:43 +01:00
Enrico Turri
503166a6a4 Automatic placement of instance at bed level 2018-10-30 16:03:03 +01:00
bubnikv
66e97aa4eb Reduced memory leaks in ConfigDef / PrintConfigDef
Deleted unsafe default copy constructors / operators in Model / ModelObject / ModelInstance / ModelVolume
Fixed some issues with copying the Model / ModelObject / ModelInstance / ModelVolume inside Print::apply()
Fixed some invalidation issues in Print::apply()
Temporarily renamed the Slic3rPE profile directory to Slic3rPE-alpha.
2018-10-30 15:24:36 +01:00
bubnikv
f2b0904d12 WIP: Fixed some issues with cancelation & restart of background processing. 2018-10-30 09:27:31 +01:00
bubnikv
c1fb4c0c5e Merge remote-tracking branch 'remotes/origin/dev_native' into vb_precompiled_headers 2018-10-29 16:02:56 +01:00
bubnikv
5377304b0c Precompiled headers on Visual Studio & GCC, with the highest hopes
that it will not break the build server.
2018-10-29 16:01:26 +01:00
Vojtech Kral
d92530b4b8 Fix: PlaceholderParser float comparison 2018-10-29 09:39:55 +01:00
Lukas Matena
7a5acd9628 Merge branch 'dev_native' of http://github.com/prusa3d/Slic3r into dev_native 2018-10-26 15:53:24 +02:00
Lukas Matena
7681d00ee5 Merged branch 'dev_native' into lm_sla_supports_auto
Added igl library files
2018-10-26 15:45:52 +02:00
bubnikv
21caa9de48 Slic3r was split to a Slic3r.dll / Slic3r.exe / Slic3r-console.exe /
Slic3r-noconsole.exe on Windows.
2018-10-26 11:57:52 +02:00
Enrico Turri
f651182101 Rendering of camera target (for debug) and modified camera target behavior 2018-10-26 09:50:28 +02:00
YuSanka
3f9fb575b8 Middle mode is changed to Advanced 2018-10-25 14:55:03 +02:00
bubnikv
806e59facc Fix of Perl unit tests. 2018-10-24 17:20:15 +02:00
bubnikv
f3c9a798dd Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-24 11:48:44 +02:00
bubnikv
197458cf3a Background processing: Fixed rotation & scaling of PrintObjects. 2018-10-24 11:48:39 +02:00
Lukas Matena
481229da97 CancellationCallback is now passed by value, instead of non-const reference (which would require initializing the reference from temporaries) 2018-10-24 11:05:19 +02:00
bubnikv
6c38cb2c32 WIP: Background processing is almost working now.
still PrintObject::_slice_volumes() needs some love to set
the PrintObject matrices correctly.
2018-10-23 22:53:43 +02:00
tamasmeszaros
34e652b985 Fixing nesting crash in debug mode.
Also commented out unnecessary bloat from AppController
2018-10-23 17:20:31 +02:00
bubnikv
bded28f888 WIP: Reconstruction of background processing. 2018-10-23 15:27:31 +02:00
bubnikv
edc79cb922 Merge branch 'dev_native' into vb_dev_native_background_processing 2018-10-23 11:26:15 +02:00
bubnikv
fab4f55e63 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-22 19:55:19 +02:00
bubnikv
0799ca2099 Fixes of the CMake build system to compile Release and Debug builds
on MS Windows.
2018-10-22 19:54:38 +02:00
Enrico Turri
2a2d1d85f8 Added mirror factors to .3mf import and enabled import factors 2018-10-22 13:27:53 +02:00
Enrico Turri
126f0e5073 Added mirroring factors to .amf import/export 2018-10-22 11:45:03 +02:00
YuSanka
70f4ca3f5b Completed settings hiding according to view mode 2018-10-21 23:10:37 +02:00
YuSanka
f47949504e Prototype of the hiding according to view mode
+ Added mode icon near option's label
+ Fixed segmentation fault on Linux
2018-10-21 23:10:36 +02:00
Enrico Turri
0af4de4faa New selection -> Split command 2018-10-19 15:27:19 +02:00
YuSanka
5557ee3cd2 Fixed object adding to list with same object's name
+ Added name for main object for complex objects
+ Fixed incorrect Instances and Settings deleting from ObjectList
2018-10-19 11:08:43 +02:00
bubnikv
a45e9c0a03 WIP: Slicing from GUI. 2018-10-18 18:06:40 +02:00
bubnikv
857863102d Merge branch 'dev_native' into vb_dev_native_background_processing 2018-10-18 18:03:17 +02:00
Enrico Turri
fbbe1325b6 Mirror transform components in ModelInstance and GLvolume - WIP and disabled 2018-10-18 15:50:51 +02:00
bubnikv
bb1dfa3522 WIP: Synchronization of Model / ModelObject with Print / PrintObject 2018-10-18 14:36:46 +02:00
bubnikv
7ed2752b2b WIP: Reconstruction of background processing update timer,
added unique IDs to the Model / ModelObject / ModelVolume objects,
added a copy of Model hierarchy at the Print,
WIP: new Print::apply() method to update the Print's copy of Model,
to update the Print's PrintObjects, to update status of the Print and
PrintObjects, and to possibly stop the background processing.
2018-10-17 11:12:38 +02:00
Enrico Turri
059ab4a05c ModelInstance's full 3D transform set as default 2018-10-16 09:51:30 +02:00
Enrico Turri
adf739cd45 Simplified algorithm for update of gizmo move and scale 2018-10-15 15:21:37 +02:00
Enrico Turri
9bb93cc4f4 Added helper functions to extract euler angles from 3d transforms 2018-10-12 12:19:57 +02:00
Enrico Turri
aa0c3bf2e3 Added helper functions to generate 3d transforms 2018-10-12 10:09:16 +02:00
Vojtech Kral
8337d4675f Plater: increase, decrease, set_number_of_copies, arrange 2018-10-11 12:48:35 +02:00
Vojtech Kral
1f926964ee WIP: Plater, build fixes 2018-10-08 17:41:37 +02:00
Enrico Turri
99fe5761d8 New selection -> removed obsolete parameters from GLVolumeCollection::load_object() 2018-10-08 16:05:55 +02:00
Enrico Turri
9ae6d115a2 New selection -> removed obsolete methods\n+\nFixed a few compile warnings 2018-10-08 15:17:36 +02:00
Enrico Turri
384cfa0e6d 1st installment of new selections (disabled) 2018-10-08 14:02:12 +02:00
Enrico Turri
96745e12d7 Use an unique opengl context 2018-10-04 10:41:11 +02:00
Enrico Turri
2d77d51f84 Merge branch 'dev2' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-03 13:38:57 +02:00
Vojtech Kral
342b584399 WIP: Plater 2018-10-01 09:28:40 +02:00
bubnikv
1f4c758e71 Logging of G-code processing 2018-09-25 16:57:18 +02:00
bubnikv
722fdd7cd5 Fixed CLI --dont-arrange command 2018-09-25 16:22:28 +02:00
bubnikv
47b2d363f0 Fixed a regression bug in admesh: bad hashing.
Also the hash table size for admesh was made adaptive based on the number
of faces.
2018-09-25 16:05:26 +02:00
bubnikv
6260e43f61 Merge remote-tracking branch 'origin/dev2' into dev_native 2018-09-25 15:33:51 +02:00
bubnikv
8945763221 Rewrote .PRUSA file parser from wxWidgets zip to miniz.
Added tracing for mesh repair.
2018-09-25 14:30:57 +02:00
bubnikv
85bc3af88a Yet another fix of next_highest_power_of_2() on clang 2018-09-25 13:19:50 +02:00
bubnikv
1c06a170c4 Fix compilation on clang 2018-09-25 12:48:36 +02:00
bubnikv
c762166974 size_t is not uint32_t or uint64_t on GCC 2018-09-25 12:43:53 +02:00
bubnikv
d00fc9a0a8 Fixed compilation on Linxu 2018-09-25 12:26:14 +02:00
bubnikv
9a3db200a5 Updated AMF/3MF import to pass configuration into a DynamicPrintConfig
instead of PresetBundle.
2018-09-25 11:53:05 +02:00
bubnikv
c3dc562ab0 Resurrected --dont-arrange command line parameter,
fixed command line print parameter validation.
2018-09-25 09:55:15 +02:00
bubnikv
96e035b2f8 Added various manifests,
added auto generation of includes and manifests from version and build
variables,
resurrected SLIC3R_LOGLEVEL env var.
2018-09-24 11:53:05 +02:00
bubnikv
9f2cd347e3 Fix of a set method to make ConfigOptionEnum compatible with
ConfigOptionEnumGeneric.
2018-09-21 23:00:49 +02:00
bubnikv
bb386bb148 Simplified dependencies. 2018-09-21 21:16:09 +02:00
bubnikv
6b2a4ffe03 Paths to resources / icons / images are set. 2018-09-21 11:40:32 +02:00
bubnikv
20d0f046d2 Merge remote-tracking branch 'origin/dev2' into dev_native 2018-09-20 16:48:40 +02:00
bubnikv
add45a8f6e Added C++ command line processing, thanks @alexrj and @loh 2018-09-20 16:48:13 +02:00
bubnikv
d7f1c8670f Removed wrong dependency on wxWidgets from libslic3r.
Added cmake message for WXWIN environment variable.
2018-09-19 17:55:17 +02:00
bubnikv
e8c16c35e5 Meged with dev2 2018-09-19 11:28:30 +02:00
bubnikv
6bd92a8198 Disabling calls from libslic3r to slic3r gui. 2018-09-19 11:27:04 +02:00
bubnikv
0558b53493 WIP: Moved sources int src/, separated most of the source code from Perl.
The XS was left only for the unit / integration tests, and it links
libslic3r only. No wxWidgets are allowed to be used from Perl starting
from now.
2018-09-19 11:02:24 +02:00