Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 0647d3ac1e Code cleanup 2019-07-31 11:12:50 +02:00
Enrico Turri 03820a38cf Render non printable instances with a darker color 2019-07-31 11:01:50 +02:00
Enrico Turri b1a1ed6394 Toggle instance printable member by 3D scene context menu 2019-07-31 10:12:13 +02:00
Enrico Turri bdd694ddcb Added member bool printable to ModelObject and ModelInstance 2019-07-31 08:36:08 +02:00
Enrico Turri 9593da2613 Take a single undo/redo snapshot when pasting from clipboard 2019-07-26 13:06:49 +02:00
Enrico Turri eefd950e16 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-26 11:34:05 +02:00
Enrico Turri 10b27968d1 Code cleanup 2019-07-26 11:32:44 +02:00
Enrico Turri e8c38a93fc Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-26 09:45:42 +02:00
Enrico Turri 77857f7292 Refactoring into rendering pipeline 2019-07-26 09:45:22 +02:00
Enrico Turri f4209dce0b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-25 15:29:58 +02:00
Enrico Turri 9bcdb2ebd0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-25 15:29:25 +02:00
Enrico Turri 4e4bdb5edd Removed obsolete code 2019-07-25 15:28:34 +02:00
Enrico Turri e5b108b26e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-25 13:44:02 +02:00
Enrico Turri e23dbfa3fb Added missing include (OsX build) 2019-07-25 13:42:42 +02:00
Enrico Turri 0745a94a98 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-25 13:11:17 +02:00
Enrico Turri d27d3257f7 Added tooltip to filename fields for custom texture and model into bed shape dialog to show the full path of the file 2019-07-25 13:10:57 +02:00
Enrico Turri e86d40fe98 Modified bundled bed models 2019-07-25 11:35:16 +02:00
Enrico Turri d6f03a2f52 Bed model placed into the scene so that its origin goes into shape center 2019-07-25 11:34:42 +02:00
Enrico Turri bc680b8376 Draw lighter gridlines when rendering default procedural texture on print bed when seen from above and custom model is present 2019-07-25 10:38:18 +02:00
Enrico Turri 9625fe8f5b Render custom bed model on custom beds 2019-07-25 09:45:43 +02:00
Enrico Turri 48dc2bb762 Fixed positioning of bed model into the scene and changed bundled bed models 2019-07-25 08:43:21 +02:00
Enrico Turri 1483a7fd51 Render custom bed model on prusa beds 2019-07-24 14:02:36 +02:00
Enrico Turri 0a04a6d92a Add remove all from selection command to undo/redo stack only when the redo stack is empty 2019-07-24 13:51:39 +02:00
Enrico Turri 395e794b9e Refactoring in Bed3D 2019-07-24 11:04:04 +02:00
Enrico Turri f7d238cb2d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-24 10:11:28 +02:00
Enrico Turri 7e7550b416 Custom bed texture applied to custom bed shapes 2019-07-24 10:11:17 +02:00
Enrico Turri 1f083ac1ee Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-24 09:47:11 +02:00
Enrico Turri 18965f5c22 Do not store into undo/redo stack remove all from selection command 2019-07-24 09:47:01 +02:00
Enrico Turri 1b5ba6c823 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-23 15:36:39 +02:00
Enrico Turri 1f24e82690 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-23 15:34:38 +02:00
Enrico Turri 9a127ed016 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-23 15:14:19 +02:00
Enrico Turri 0d10d8aba7 1st installment for selection's undo/redo snapshots 2019-07-23 15:14:08 +02:00
Enrico Turri 3fe355509c Fixed undo/redo snapshot when opening a project using the recent files list 2019-07-23 12:57:58 +02:00
Enrico Turri 7749677b27 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 11:57:17 +02:00
Enrico Turri ced853bff0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-22 11:47:40 +02:00
Enrico Turri dcedb9e3d3 Follow-up of 699319cd86 -> Fixed build on Mac 2019-07-22 11:47:23 +02:00
Enrico Turri c1dee0e87d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 11:26:02 +02:00
Enrico Turri 996b227391 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-22 11:23:52 +02:00
Enrico Turri 699319cd86 #2663 - Added handling of gcode lines M401 and M402 for Repetier flavour to GCodeAnalyzer 2019-07-22 11:23:42 +02:00
Enrico Turri 9cb1a584e1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 08:21:40 +02:00
enricoturri1966 b60b44ed5e Added additional tooltip to toolbar items and use it for undo/redo items 2019-07-20 14:03:34 +02:00
enricoturri1966 33c0683d11 Reworked rendering of toolbars background texture 2019-07-20 12:02:29 +02:00
Enrico Turri 3285bf7945 Fixed conflicts after pulling from master 2019-07-19 15:47:10 +02:00
Enrico Turri 91d574f8ad Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-19 15:37:10 +02:00
Enrico Turri 81d3669a25 Undo/Redo buttons moved into their own toolbar 2019-07-19 15:36:55 +02:00
Enrico Turri 37f2362aab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-19 11:36:07 +02:00
Enrico Turri 749bb2bfed Refactoring in GLTexture 2019-07-19 11:18:19 +02:00
Enrico Turri 84d61e28fd Tech ENABLE_TEXTURES_FROM_SVG set as default 2019-07-19 09:52:01 +02:00
Enrico Turri 3344650255 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-19 09:18:32 +02:00
Enrico Turri ba4bc8ac82 Render custom bed textures in png format on prusa beds 2019-07-19 09:18:09 +02:00
Enrico Turri 1c5ff3c72d Small refactoring 2019-07-18 15:03:05 +02:00
Enrico Turri f61d43de07 Render custom bed textures in svg format on prusa beds 2019-07-18 14:39:19 +02:00
Enrico Turri af3cb890d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-18 12:57:12 +02:00
Enrico Turri de383b1809 Added selection of custom bed model to bed shape dialog 2019-07-18 12:56:52 +02:00
Enrico Turri 44d7462bdb Partially revert 8febd88e80 2019-07-18 12:03:41 +02:00
Enrico Turri 8febd88e80 Fixed rendering of toolbars' textures with prespective camera 2019-07-18 11:36:17 +02:00
Enrico Turri 1e796b82e1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-18 11:12:30 +02:00
Enrico Turri 08d37aad06 Added selection of custom bed texture to bed shape dialog 2019-07-18 11:12:11 +02:00
Enrico Turri 75c53a53b6 Refactoring of BedShapePanel and BedShapeDialog 2019-07-17 14:53:02 +02:00
Enrico Turri ce5618fb27 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-17 14:28:12 +02:00
Enrico Turri f97a61cdcf Fixed use of translate macros 2019-07-17 14:13:50 +02:00
Enrico Turri ba7df2a64e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-17 13:17:50 +02:00
Enrico Turri 401707a6fe Another refactoring of GLGizmosManager 2019-07-17 12:43:27 +02:00
Enrico Turri da1fa0b6e3 Refactoring of GLGizmosXX classes to cleanup their interface 2019-07-17 12:06:23 +02:00
Enrico Turri 0a530ab7bc Added undo/redo snapshot for layers height editing 2019-07-17 10:03:00 +02:00
Enrico Turri 832dada931 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-17 08:38:58 +02:00
Enrico Turri 21624f5305 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
Enrico Turri 610e0f7ee6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-15 08:19:58 +02:00
Enrico Turri 077d4aa3d7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-12 15:36:11 +02:00
Enrico Turri de88db5918 #2616 - Added Recent projects item to File menu 2019-07-12 15:36:01 +02:00
Enrico Turri cc70c8dff9 Tech ENABLE_SVG_ICONS set as default 2019-07-12 10:13:35 +02:00
Enrico Turri 2f57f756e5 Follow-up of 4c6c608342 -> refactoring 2019-07-12 09:26:19 +02:00
Enrico Turri 4c6c608342 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 f964f5e99a Deactivate undo/redo toolbar items by pressing Esc key 2019-07-11 07:54:33 +02:00
Enrico Turri dbf0eacfa7 Deactivate undo/redo toolbar items when leaving the 3D scene or clicking into it 2019-07-11 07:46:40 +02:00
Enrico Turri 1b5ab100bd GLToolbar::m_imgui_hovered_pos replaced with GLCanvas3D::m_imgui_undo_redo_hovered_pos 2019-07-10 14:08:14 +02:00
Enrico Turri 14dad5039a Imgui dialogs for undo/redo centered on their toolbar item icon 2019-07-10 13:45:25 +02:00
Enrico Turri 40a1f31e84 Disable remaining toolbar items when one of them is toggable and pressed 2019-07-10 11:59:25 +02:00
Enrico Turri 46e295407b Modified toolbar to call RenderCallback only when the item is toggable and pressed 2019-07-10 10:52:12 +02:00
Enrico Turri 1f74d7fdfc Added color number in legend texture for color prints 2019-07-09 15:47:34 +02:00
Enrico Turri 52dc8547ac Reverder order of rendering of color print time estimates 2019-07-09 15:08:34 +02:00
Enrico Turri 29dfa786ff Merge branch 'et_color_print_times' of https://github.com/prusa3d/PrusaSlicer 2019-07-09 14:24:24 +02:00
Enrico Turri e8461f65df Refactoring in class BedShapePanel 2019-07-09 13:33:15 +02:00
Enrico Turri d4914441f3 Modified logic to add snapshots to undo/redo stack using GLCanvas::do_xxxxxx() methods 2019-07-09 10:18:57 +02:00
Enrico Turri 36049788ac Fixed reset of bed 3d model 2019-07-09 08:24:23 +02:00
Enrico Turri 4ba7dfb6dd 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 9ba5568539 Fixed conflicts after merge with master 2019-07-08 09:23:37 +02:00
Enrico Turri ad5329253e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_color_print_times 2019-07-08 08:45:11 +02:00
Enrico Turri 25d916f144 Color change time estimates 2019-07-08 08:40:20 +02:00
Enrico Turri 2c0f0c85a5 Fixed bed shape dialog layout 2019-07-03 10:06:22 +02:00
Enrico Turri 7a7316fcbf Fixed compile warnings in Bed3D 2019-07-03 09:19:07 +02:00
Enrico Turri d101ed709c Button 'Load shape from STL' centered into its panel in bed shape dialog 2019-07-03 08:58:05 +02:00
Enrico Turri 90daffccf2 View dependent order of rendering for layers editing visual hints to keep the correct transparency 2019-07-02 15:49:18 +02:00
Enrico Turri 2a71665de9 Follow-up of d07b3fb08b -> Show current bed shape for custom bed in bed shape dialog 2019-07-02 15:10:59 +02:00
Enrico Turri d15698e21e GLVolume and GLIndexedVertexArray refactored to send data to gpu at the first render call 2019-07-02 12:55:55 +02:00
Enrico Turri b835075fd6 Visual hints for layers editing enabled whenever a layer is selected into the objects list 2019-07-02 10:34:30 +02:00
Enrico Turri 2356fe5a13 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 4269c8b23c Removed GLVolume non-VBO rendering 2019-07-01 12:28:16 +02:00
Enrico Turri d7c418ef84 Modified function thick_lines_to_indexed_vertex_array() to remove visual artifacts on paths in gcode preview 2019-07-01 08:33:40 +02:00
Enrico Turri 6cfb9bec36 Removed memory leaks due to Plater::priv::config not being deleted 2019-06-27 15:23:03 +02:00