Commit Graph

701 Commits

Author SHA1 Message Date
tamasmeszaros
124aa9a8ef Merge branch 'master' into tm_arrange_selection 2019-07-19 18:17:58 +02:00
bubnikv
83d6589be1 Fix of OSX Imgui Undo / Redo pull down list scaling issue. 2019-07-19 17:16:20 +02:00
bubnikv
d99da4b01b Simplified loading of the SLA support structures into the scene.
Fixed referesh of SLA support structures after Undo / Redo
and when moving an object outside / inside the build volume.
2019-07-19 17:14:37 +02:00
bubnikv
8eba63c697 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-19 15:59:35 +02:00
bubnikv
2824a1531e Undo / Redo pull down menu scaling fix on OSX Retina 2019-07-19 15:59:23 +02:00
Enrico Turri
53dc2efea5 Undo/Redo buttons moved into their own toolbar 2019-07-19 15:36:55 +02:00
tamasmeszaros
3202db0943 Merge branch 'master' into tm_arrange_selection 2019-07-18 12:59:40 +02:00
Enrico Turri
3869be533f Fixed rendering of toolbars' textures with prespective camera 2019-07-18 11:36:17 +02:00
tamasmeszaros
af93cc0e20 Fixes after merge with master. 2019-07-17 18:10:08 +02:00
tamasmeszaros
d55dbf437c Merge branch 'master' into tm_arrange_selection 2019-07-17 17:25:31 +02:00
Enrico Turri
459dd8f1af Fixed use of translate macros 2019-07-17 14:13:50 +02:00
Enrico Turri
e4ca9488ce Another refactoring of GLGizmosManager 2019-07-17 12:43:27 +02:00
Enrico Turri
9949bb1c1d Added undo/redo snapshot for layers height editing 2019-07-17 10:03:00 +02:00
Enrico Turri
96681151a9 Framework to serialize gizmos into undo/redo stack
Serialization into undo/redo of Cut gizmo

Refactoring of GLGizmosManager
2019-07-17 08:38:48 +02:00
tamasmeszaros
b3217c191d Priority for wipe tower, Increased safety distance from bed edges.
* WipeTowerInfo class extended in plater (WipeTower) instead of GLCanvas3D
* Bed origin support in ModelInstance and WipeTower
2019-07-16 18:33:42 +02:00
tamasmeszaros
b68d5950ac Arrange cache in ModeInstance and logical bed remembered. 2019-07-15 17:30:44 +02:00
bubnikv
f2cc464319 Fix of the SLA Undo 2019-07-15 15:51:25 +02:00
bubnikv
d37b8faa52 Fix of the merge - missing Undo / Redo toolbar buttons. 2019-07-15 11:59:54 +02:00
bubnikv
e8e35579dd Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +02:00
Lukas Matena
ff69c030d7 Merge branch 'lm_improving_wipe_tower'. Summary of changes:
- wipe tower respects max volumetric flow, slowing down with PVA etc is not hardcoded anymore
- wipe tower is now allowed for multiple-extruder printers. single extruder stuff is not used in that case (ramming, cooling, etc.)
- start/end filament and toolchange custom gcodes are now inserted differently than before - see 41164a9
- some refactoring, e.g. the abstract WipeTower class was eradicated
2019-07-15 10:25:38 +02:00
tamasmeszaros
9539a4860c Not handling logical beds in arrange() 2019-07-12 21:17:11 +02:00
Enrico Turri
2f43e228f3 Tech ENABLE_SVG_ICONS set as default 2019-07-12 10:13:35 +02:00
Enrico Turri
cbf50ccdca Follow-up of 4c6c608342 -> refactoring 2019-07-12 09:26:19 +02:00
Enrico Turri
9c184f5112 GLToolbar and GLToolbarItem refactored to allow two different actions when left/right clicking on items.
Stack dialog for undo and redo items is now shown on right click only
2019-07-11 15:29:46 +02:00
Enrico Turri
b5624ca76f Deactivate undo/redo toolbar items by pressing Esc key 2019-07-11 07:54:33 +02:00
Enrico Turri
747900c308 Deactivate undo/redo toolbar items when leaving the 3D scene or clicking into it 2019-07-11 07:46:40 +02:00
Enrico Turri
7ad87de236 GLToolbar::m_imgui_hovered_pos replaced with GLCanvas3D::m_imgui_undo_redo_hovered_pos 2019-07-10 14:08:14 +02:00
Enrico Turri
107d3c0c82 Imgui dialogs for undo/redo centered on their toolbar item icon 2019-07-10 13:45:25 +02:00
YuSanka
c5a27bf798 Fixed redo_to() function and code cleaning from redundant options 2019-07-10 10:15:07 +02:00
YuSanka
237a46e311 Completed undo/redo from a toolbar 2019-07-09 20:45:00 +02:00
YuSanka
7b0d9169ba Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo 2019-07-09 19:41:37 +02:00
YuSanka
0af1af0ae2 Next improvements of an undo/redo from a toolbar 2019-07-09 19:39:36 +02:00
Enrico Turri
3bd9bb360e Modified logic to add snapshots to undo/redo stack using GLCanvas::do_xxxxxx() methods 2019-07-09 10:18:57 +02:00
YuSanka
8cfe03033f Added undo/redo icons. Fist step to implementation Undo/Redo list for toolbar 2019-07-08 18:01:14 +02:00
Enrico Turri
eb4aba5365 Refactoring of functions thick_lines_to_indexed_vertex_array() to reduce the amount of produced vertices while reducing visual artifacts in gcode toolpaths due to averaged normals 2019-07-08 15:30:59 +02:00
Enrico Turri
85e9318081 Fixed conflicts after merge with master 2019-07-08 09:23:37 +02:00
bubnikv
445cd20919 Undo / Redo fixes 2019-07-05 19:06:19 +02:00
bubnikv
d98aa0f91d Merge remote-tracking branch 'origin/master' into vb_undo_redo 2019-07-04 20:22:15 +02:00
YuSanka
f0beb6511c Merge remote-tracking branch 'origin/master' into ys_new_features 2019-07-04 14:26:05 +02:00
bubnikv
2bde3e12f2 WIP Undo / Redo: First Undo in the history of PrusaSlicer! 2019-07-04 10:45:41 +02:00
tamasmeszaros
b475a174d7 WIP still with arrange return value. 2019-07-03 19:24:41 +02:00
YuSanka
2db15c620b 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
Enrico Turri
c1491920ae GLVolume and GLIndexedVertexArray refactored to send data to gpu at the first render call 2019-07-02 12:55:55 +02:00
Enrico Turri
e22181e2c1 Added member BoundingBoxf3 m_bounding_box to GLIndexedVertexArray and removed member BoundingBoxf3 bounding_box from GLVolume 2019-07-01 13:26:06 +02:00
Enrico Turri
e9909eb95e Removed GLVolume non-VBO rendering 2019-07-01 12:28:16 +02:00
tamasmeszaros
00beee9dee Arranging with new structure. 2019-06-28 17:03:50 +02:00
tamasmeszaros
373d266a0d WIP on structuring arrange inputs 2019-06-27 21:13:44 +02:00
YuSanka
14aa7b0c33 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-27 14:01:50 +02:00
Enrico Turri
f89e573037 Added visual hints in 3D scene for layers editing 2019-06-27 13:42:50 +02:00
Enrico Turri
f1d285c7b3 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