Commit Graph

1251 Commits

Author SHA1 Message Date
YuSanka
136e5156bc Fixed colot_print issues:
* Disabled color change information for the SLA and FFF-multimaterial presets
* Corrected switch between "color print" and "feature type" on Preview
2019-07-02 14:06:58 +02:00
tamasmeszaros
914bf63228 Unify AutoArranger subclasses 2019-07-02 12:15:53 +02:00
Vojtech Kral
f09fb92b61 Fix build against system-provided qhull 2019-07-02 11:43:07 +02:00
tamasmeszaros
ba82cbe007 Fix broken partial arrange 2019-07-02 10:32:01 +02:00
tamasmeszaros
253ec07cb2 Still WIP 2019-07-01 18:22:07 +02:00
YuSanka
125f474f02 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-29 12:38:03 +02:00
tamasmeszaros
cb3a586deb Adapt find_new_position is WIP. Cleaning up comments. 2019-06-28 18:27:15 +02:00
tamasmeszaros
299e4f74c7 Arranging with new structure. 2019-06-28 17:03:50 +02:00
tamasmeszaros
f0ac54ba32 Merge branch 'master' into tm_builtin_pad 2019-06-28 16:51:55 +02:00
tamasmeszaros
548f19462a Fix formatting 2019-06-28 15:42:59 +02:00
tamasmeszaros
4c69a855a1 Merge branch 'master' into tm_builtin_pad 2019-06-28 15:29:26 +02:00
Vojtech Kral
61080bcff6 Merge branch 'bugfixes': avrdude warnings cleanup 2019-06-28 15:21:45 +02:00
tamasmeszaros
19e6bf58dd WIP on structuring arrange inputs 2019-06-27 21:13:44 +02:00
YuSanka
0b940ec089 Some code improvements 2019-06-27 16:07:32 +02:00
YuSanka
37b37cdf25 Fixed small typo 2019-06-27 14:13:07 +02:00
YuSanka
dd1fb286c3 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-27 14:01:50 +02:00
YuSanka
cecc134550 Rewrote layers information export/import to/from 3mf using Boost Property Tree (xml_parser) 2019-06-27 13:55:24 +02:00
Enrico Turri
75b0f65d79 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-27 11:25:13 +02:00
Enrico Turri
90d1ac2c8f Tech ENABLE_RENDER_PICKING_PASS extended so that user can switch between picking pass texture rendering and regular rendering by pressing [T] key 2019-06-27 11:25:04 +02:00
bubnikv
27ee68d2f9 WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase 2019-06-27 11:02:45 +02:00
bubnikv
71d1255219 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-27 09:48:31 +02:00
bubnikv
da3583b1db Fix of https://github.com/prusa3d/PrusaSlicer/issues/2516 2019-06-27 09:48:19 +02:00
enricoturri1966
d16c670ed1
Merge pull request #2569 from BeldrothTheGold/master
Add debug preprocessor directive in Technologies.hpp to render picking pass to window.
2019-06-27 09:44:48 +02:00
tamasmeszaros
96f6fd2d9f Merge branch 'master' into tm_arrange_selection 2019-06-27 09:33:32 +02:00
tamasmeszaros
e1d612d05f work in progress on new ModelArrange interface 2019-06-26 17:09:26 +02:00
bubnikv
d99e932ee8 WIP Undo / Redo: Serialization of the Model / ModelObject / Model instance
using the cereal framework.
2019-06-26 16:29:12 +02:00
tamasmeszaros
dd108f4513 Hotfix for inconsistent slice index 2019-06-26 14:59:39 +02:00
Lukas Matena
4b9e366f00 Multimaterial print - making sure that temperatures will be changed with SE printer without the wipe tower 2019-06-26 14:50:12 +02:00
YuSanka
1525a864c5 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-26 13:33:05 +02:00
bubnikv
624a6aefb4 Fixed crashes after loading some AMFs. 2019-06-26 13:29:49 +02:00
bubnikv
a710e7e7e4 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
tamasmeszaros
f4ed0d8137 Working on arrange selection only feature.
revert changes related to scale/unscale
2019-06-26 12:24:30 +02:00
tamasmeszaros
f93e7496f7 Merge branch 'tm_scales' 2019-06-26 11:33:42 +02:00
tamasmeszaros
6ff434aba3 Fixes some ModelArrange warnings 2019-06-26 11:10:41 +02:00
tamasmeszaros
14b32c4f16 Make an order in using scale and unscale, remove some warnings. 2019-06-26 10:34:27 +02:00
BeldrothTheGold
d818d1b429 Add debug option to display picking pass to screen 2019-06-25 19:25:03 -06:00
Vojtech Kral
85575e5615 Fix: IsTriviallyCopyable on clang 2019-06-25 18:16:53 +02:00
Lukas Matena
cb916c4dda Fixed warnings in libslic3r 2019-06-25 16:04:29 +02:00
YuSanka
daac165a44 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-24 13:56:35 +02:00
tamasmeszaros
75ed542686 Reformatted MTUtils with some refined directives.
Only whitespace changes in MTUtils.hpp !
2019-06-24 13:03:46 +02:00
tamasmeszaros
121b6c078b Print bed not considered as object in arrange anymore. 2019-06-24 13:01:52 +02:00
Enrico Turri
fab3634931 #2395 - Reworked logic of method Model::convert_multipart_object() 2019-06-24 12:43:18 +02:00
Enrico Turri
1459ad65c6 #2433 - Time Estimator: clamp accelerate/decelerate distances to avoid them to become negative 2019-06-24 12:35:20 +02:00
Enrico Turri
6b0d75127b #2428
1) Reworked logic for pasting volumes

2) Fixed paste of volumes into different objects

3) Do not apply offset when pasting into the copied object

4) Keep source transformation matrix and relative positions when copy/pasting volumes into another object
2019-06-24 12:26:11 +02:00
Enrico Turri
38d5817bc9 Disabled ENABLE_CAMERA_STATISTICS 2019-06-24 11:23:25 +02:00
Enrico Turri
5766e9e915 Fixed conflicts after merge with branch et_perpsective_camera 2019-06-24 11:08:42 +02:00
Enrico Turri
00b9a3ad32 ENABLE_COMPRESSED_TEXTURES set as default 2019-06-24 09:54:58 +02:00
Enrico Turri
301eda7369 ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default 2019-06-24 09:27:19 +02:00
Enrico Turri
96276394d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-24 08:15:41 +02:00
Lukas Matena
743a08f0cf WipeTower - fixed a crash in extrude_explicit when called from finish_layer before the first toolchange 2019-06-21 10:58:20 +02:00
bubnikv
7de5a42df3 Fixed compilation on clang / OSX (missing float.h) 2019-06-20 21:07:26 +02:00
bubnikv
b7a949a53e Fix for C++11 2019-06-20 20:40:17 +02:00
bubnikv
ac6969c992 Reworked the Perl unit / integration tests to use the same Print
interface that the application is using. Old interface used just
for the integration tests was removed.
2019-06-20 20:23:05 +02:00
bubnikv
27459a9072 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-20 16:15:26 +02:00
bubnikv
35b3fd3176 Integrated the new layer height spans with configs into the backend.
Fixed some compiler warnings.
2019-06-20 16:15:09 +02:00
tamasmeszaros
3b0e0aaed4 Fixes for degenerate cases. 2019-06-20 13:01:48 +02:00
tamasmeszaros
c82fd692c3 Merge branch 'master' into tm_builtin_pad 2019-06-20 10:04:17 +02:00
tamasmeszaros
2ae2672ee9 Building igl statically and moving to the dep scripts
Fixing dep build script on Windows and removing some warnings.

Use bundled igl by default.

Not building with the dependency scripts if not explicitly stated. This way, it will stay in
Fix the libigl patch to include C source files in header only mode.
2019-06-19 14:52:55 +02:00
Enrico Turri
5dcc6c7f36 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 14:33:31 +02:00
tamasmeszaros
89e39e3895 Eliminate magic constant 2019-06-19 13:19:11 +02:00
tamasmeszaros
670a563226 Fix for issue #2536 2019-06-19 12:04:11 +02:00
tamasmeszaros
4a71c42f9b Merge branch 'master' into tm_rotcalipers 2019-06-19 11:07:21 +02:00
Enrico Turri
28dd52d88b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 08:17:58 +02:00
tamasmeszaros
b4ef812d32 Merge branch 'master' into tm_sla_printer_mirror 2019-06-18 17:42:10 +02:00
tamasmeszaros
468516aa31 Apply fixes for the ui jobs.
- Localization
- Mutual exclusion (ExclusiveJobGroup), only one UI job can run at a time, and background processing is stopped
- m_range not used for finalization anymore
- stop_jobs called before Window is closed
2019-06-18 16:24:30 +02:00
tamasmeszaros
d60ecb3788 Merge remote-tracking branch 'origin/master' into tm_ui_jobs 2019-06-18 12:16:24 +02:00
tamasmeszaros
d7684188f9 Removing unused pad parts working 2019-06-18 11:28:52 +02:00
bubnikv
0c95d4e0d9 Merge remote-tracking branch 'remotes/origin/ys_new_features' 2019-06-18 10:01:29 +02:00
bubnikv
c95a324c3f Merge branch 'vb_admesh_fix' 2019-06-18 08:54:50 +02:00
tamasmeszaros
778b2cf293 WIP on removing unused parts of pad 2019-06-17 18:06:52 +02:00
YuSanka
7fe8965c53 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-17 13:50:12 +02:00
tamasmeszaros
90a854f704 Fix levitation when supports are disabled. 2019-06-17 13:02:49 +02:00
Lukas Matena
95ad76a0dc Wipe tower - fixed a long existent bug that sometimes resulted in inexact feedrate on the loading moves 2019-06-17 12:59:30 +02:00
tamasmeszaros
80fddb7aaf Merge branch 'master' into tm_builtin_pad 2019-06-17 12:17:01 +02:00
Lukas Matena
1152bd5a09 Fixup of 41164a9
The WipeTowerWriter did not now which tool is being used, so it limited the volumetric flow based on different filament settings
2019-06-17 11:22:17 +02:00
Lukas Matena
a643a22151 Wipe tower - renaming files (to conclude work from previous commit and not lose history of those files) 2019-06-17 10:26:33 +02:00
Lukas Matena
05e6dbbe4b Wipe tower - refactoring (removed the abstract WipeTower class)
- abstract class WipeTower and its descendant WipeTowerPrusaMM were merged into a single (non-abstract) WipeTower class
- all uses of WipeTower::xy struct were replaced by Eigen Vec2f (it is no longer necessary to be independent on libraries that PrusaSlicer uses)
- the WipeTowerPrusaMM.hpp/.cpp will be renamed in the next commit (hopefully it will retain its git history that way)
2019-06-17 10:16:07 +02:00
tamasmeszaros
ce22251707 Warning hunt session followup 2019-06-17 10:05:46 +02:00
Enrico Turri
ddb4c1ff3f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-17 09:34:25 +02:00
Enrico Turri
9ffd294f07 Fixed functions declaration template<class Tf> inline constexpr coord_t scaled(Tf val) and template<class Tf> inline constexpr Tf unscaled(coord_t val) to use constexpr on versions of Visual Studio which support it 2019-06-17 09:28:41 +02:00
tamasmeszaros
c5037540e9 Warning hunt session. 2019-06-14 18:17:17 +02:00
bubnikv
f8c5570155 Removed unnecessary copy / move constructors / assignment operators. 2019-06-14 15:47:40 +02:00
Lukas Matena
0eecfc6604 Wipe tower - removed the obsolete material_type enum
no longer necessary because the speed overrides that the enum controlled were recently removed
the comment in gcode is now just about appending the config string
2019-06-14 14:44:22 +02:00
Lukas Matena
678d0e18a7 WipeTowerIntegration class: print_z is not passed around, ToolChangeResult objects are aware of it 2019-06-14 14:43:40 +02:00
Lukas Matena
aee376762e Changed handling of priming extrusions to allow injection of filament and toolchange custom gcodes
The priming extrusions were handled separately from the rest of the wipe tower toolchanges. In order to be able to use the logic from previous commit for them (custom toolchange gcodes etc), some unpleasant code shuffling was needed
2019-06-14 14:42:07 +02:00
Lukas Matena
41164a9cb3 Multimaterial printing: Changed the way how custom gcodes are inserted
Each toolchange now emits:
- end filament custom gcode
- toolchange custom gcode; if not provided, a standard Tn command is inserted
- start filament gcode

Hopefully it is now consistent for SE/ME printers with/without the wipe tower
The priming line does not work - will be fixed in the next commit
2019-06-14 14:38:58 +02:00
Lukas Matena
9df93c0125 Mostly refactoring of the wipe tower improvements
- setting of the wipe tower parameters based od whether SE MM printer is selected is done in the WipeTowerPrusaMM constructor, so it does not distract in Print.cpp
- WipeTowerPrusaMM.cpp conditions checking for SE MM printer are now using a more descriptive const member variable, not the loading/unloading speeds (hopefully the functionality is the same)
2019-06-14 14:35:50 +02:00
Thomas Moore
da1aea889f Enable wipe tower for all multi-extruder configurations 2019-06-14 12:28:52 +02:00
Lukas Matena
079e63e190 The wipe tower now respects filament max volumetric flow
The odd commands that lowered the speed override values for PVA, FLEX etc. were removed

Now the wipe tower backups user speed override, sets it to 100%, does what is needed
and restores the old value when finished. There are no special cases - lowering
the speed for certain materials can be achieved by lowering the volumetric flow.
2019-06-14 12:28:52 +02:00
Lukas Matena
6f7051c3b1 GCode preview shows correct volumetric flow for the wipe tower
The neccessary annotations for the GCodeAnalyzer were missing
2019-06-14 12:28:52 +02:00
Enrico Turri
541f58c656 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-14 10:57:29 +02:00
bubnikv
9b7bb41db5 ModelObject::add_volume(const ModelVolume &other)
shall not re-center the volume as it will share meshes
(object mesh, convex hull mesh) of the source,
which may be in use by the background processing.
2019-06-13 17:24:37 +02:00
bubnikv
9379fedd43 Further C++isation of the admesh library & TriangleMesh
(copy & move constructors / operators)
2019-06-13 16:33:50 +02:00
YuSanka
7da9d2f66d Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-13 16:18:39 +02:00
tamasmeszaros
821ca0e36a Build fix when boost is not in prefix/boost 2019-06-13 14:19:24 +02:00
tamasmeszaros
e4cb75edde Fix build on Mac 2019-06-12 17:33:04 +02:00
tamasmeszaros
d1ed3d40c1 Fix build on windows.
This issue is annoying.
2019-06-12 17:23:12 +02:00
tamasmeszaros
4ffe3278be Hotfix for pad shape deduction. 2019-06-12 17:09:40 +02:00
tamasmeszaros
10897524df Fixes for gap detection and case with no pad, but zero elevation. 2019-06-12 15:29:24 +02:00
tamasmeszaros
12396c3051 Fine tuning parameters and fixing pad wings when greater gaps are used. 2019-06-12 13:15:42 +02:00
Enrico Turri
428cc4e7c9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-12 11:45:57 +02:00
tamasmeszaros
c80aae1bdb Fixes for the parameter layer
- Elevation value satisfied with no supports as well
- Removed debug svg writing
- Gap and sticks made optional in zero elevation pad.
2019-06-11 18:19:58 +02:00
tamasmeszaros
6877c075dc SPE-742: Parameter layer for zero elevation feature. 2019-06-11 18:17:20 +02:00
bubnikv
0bb8ee149e Sharing TriangleMesh objects between the front end (UI) and back end
(background processing)
2019-06-11 17:08:47 +02:00
tamasmeszaros
b7e3ee0709 Refactor, fix wall normals and gap detection. 2019-06-11 16:17:51 +02:00
YuSanka
26fb68ba45 Added missed include for the OSX build 2019-06-11 14:54:31 +02:00
YuSanka
4e0eb12ef6 Import/export of the Layers information to/from 3MF 2019-06-11 14:39:41 +02:00
tamasmeszaros
ddd0a9abb6 SPE-742: Builtin pad feature in zero elevation mode. 2019-06-11 12:40:07 +02:00
YuSanka
16c5a87997 Import/export of the Layers information to/from AMF 2019-06-11 09:50:58 +02:00
bubnikv
af5017c46c admesh refactoring: Use Eigen vec3i for indexed triangles. 2019-06-10 21:14:58 +02:00
bubnikv
6defabea53 admesh refactoring: separation of the shared vertices / indices
into an indexed_triangle_set structure
2019-06-10 18:30:54 +02:00
bubnikv
65238a89b1 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
bubnikv
a1c38794fb Refactored admesh to get rid of the error and fp members of stl_file. 2019-06-10 17:17:36 +02:00
bubnikv
40b27e8332 admesh refactoring: Move the hashing structure out of stl_file 2019-06-10 16:53:08 +02:00
bubnikv
025f86ca3f Fix of the previous refactoring. 2019-06-10 11:04:09 +02:00
YuSanka
819a4506fa Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-07 12:35:16 +02:00
bubnikv
7dd842b294 Merge remote-tracking branch 'remotes/origin/master' into vb_admesh_fix 2019-06-06 21:01:19 +02:00
tamasmeszaros
d4fe7b5a96 Adding rotating calipers algorithm for minimum are bounding box rotation.
Cleanup, fix build on windows and add test for rotcalipers.

Try to fix compilation on windows

With updates from libnest2d
Another build fix.


Clean up and add comments.


adding rotcalipers test  and some cleanup


Trying to fix on OSX


Fix rotcalipers array indexing


Get rid of boost convex hull.


Adding helper function 'remove_collinear_points'


Importing new libnest2d upgrades.


Disable using __int128 in NFP on OSX
2019-06-06 14:27:07 +02:00
tamasmeszaros
6136fe7d92 Future-proof qhull dependency handling 2019-06-05 19:19:49 +02:00
tamasmeszaros
12797f2aa8 Re-adding missing file 2019-06-05 15:50:27 +02:00
tamasmeszaros
97cbb5344e Merge branch 'master' into tm_sla_printer_mirror 2019-06-05 15:10:02 +02:00
YuSanka
1090105b68 Experiments with updating layer_config_ranges from UI
+ Fixed OSX build
2019-06-05 11:50:59 +02:00
YuSanka
4b3df010ab Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-05 11:16:25 +02:00
Enrico Turri
a9ea9b3e0a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-05 07:48:32 +02:00
bubnikv
8da54139c4 WIP: Admesh - replacement of C memory allocation with std vectors 2019-06-04 22:06:42 +02:00
bubnikv
3ab886b747 Fix of mesh decimation (the admesh library).
Fixes "Unable to save project (#2445)"
2019-06-04 18:25:53 +02:00
tamasmeszaros
7a5d3de1c4 Move cstdint to Zipper header.
The declarations already contain specific integers.
2019-06-04 09:26:33 +02:00
Vojtech Kral
053a0af374 Add missing header 2019-06-03 17:41:02 +02:00
Enrico Turri
273c30c8ce Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-03 15:47:33 +02:00
YuSanka
51b18fddeb Changed data types 2019-06-03 15:35:21 +02:00
tamasmeszaros
8376d14267 Fix for opening issues with archive files. 2019-06-03 15:27:46 +02:00
Bryan Smith
3d8bd85187 Add new [total_layer_count] placeholder everywhere [layer_num] is avalible.
Missed adding [total_layer_count] to layer_gcode


Revert "Add new [total_layer_count] placeholder everywhere [layer_num] is avalible."

This reverts commit e29e766224a14e1f237908c3e5507ac5586ca5b7.

Revert "Missed adding [total_layer_count] to layer_gcode"

This reverts commit f07907a8acc450e9ae1220c6a9fe4f7c7e6d896c.

Better way to add [total_layer_count]
2019-06-03 14:47:18 +02:00
Enrico Turri
4a4deef420 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-03 12:16:38 +02:00
tamasmeszaros
460887cdde Adjust miniz usage to use nowide FILE streams everywhere. 2019-06-02 22:27:35 +02:00
tamasmeszaros
15620a2fc2 Fix unclosed file after export. 2019-06-02 20:02:27 +02:00
tamasmeszaros
916016f2d4 Use nowide fopen in Zipper instead of patching miniz. 2019-06-02 19:10:13 +02:00
Enrico Turri
545c013acd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-02 09:39:11 +02:00
tamasmeszaros
34663a3514 Merge branch 'tm_minz_update' 2019-05-31 18:34:59 +02:00
Enrico Turri
58adeb01d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-31 07:41:22 +02:00
tamasmeszaros
96380180f4 Build system tweaks to get rid of cmake and boost warnings. 2019-05-30 17:48:32 +02:00
Enrico Turri
e0da08906b Disabled debug render statistics dialog 2019-05-27 09:20:48 +02:00
Enrico Turri
efe29b3c2d Fixed conflicts after merge with master 2019-05-24 15:29:22 +02:00
Enrico Turri
bf9740188a Code cleanup 2019-05-24 15:22:27 +02:00
Enrico Turri
c92940c985 Fixed conflicts after cherry-picking 844e99f84e 2019-05-24 14:42:46 +02:00
bubnikv
209f1e3b99 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
Enrico Turri
302ac3a849 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-24 08:22:53 +02:00
bubnikv
343d2ea16d Fixed update of the SLA back end object properties, leading to
the "disable supports" and "disable pad" flags being ignored
after the project was loaded.
2019-05-23 15:43:16 +02:00
Enrico Turri
3aa14bddf5 Max texture size dependent on OpenGL version on Win and Linux and on retina monitors on Mac 2019-05-23 13:49:57 +02:00
tamasmeszaros
902bf682c0 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
Enrico Turri
763576fbc2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-23 08:29:43 +02:00