Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 131193a682 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-18 08:23:05 +01:00
Enrico Turri 7554c9862d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-15 13:24:58 +01:00
Enrico Turri bc3036d777 Follow-up to previous commits on gizmo grabbers picking (use of centralized static constant for ids and added comments) 2019-03-15 12:07:25 +01:00
Enrico Turri dd309c9dfc GLGizmoBase::picking_color_component modified to return all the three components of the picking color 2019-03-15 10:05:14 +01:00
Enrico Turri 6ab0a526b3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-15 09:15:11 +01:00
Enrico Turri 5b01eb3004 2nd fix for x position of gizmos' imgui dialogs 2019-03-15 09:13:15 +01:00
Enrico Turri 5018089351 Toolbar refactoring
1) toolbar items define 3 callback functions for setting the visibility, setting the enabling state and defining their action which are set while adding a new item to the toolbar

2) the toolbar takes care to update all its items visibility and enabled states through a new update method to be called by the parent idle event handler

3) the toolbar handles mouse events by calling its on_mouse method
2019-03-14 13:54:05 +01:00
Enrico Turri 973fafab2f Removed unused members from View3D and unused parameters from Preview::Init() 2019-03-13 14:35:09 +01:00
Enrico Turri 77964de9f2 Update of ModelVolume::m_is_splittable moved inside ModelVolume itself 2019-03-13 14:04:59 +01:00
Enrico Turri f5b5e48ad7 Added cancel mechanism to GCodeAnalyzer::calc_gcode_preview_data() 2019-03-12 11:57:39 +01:00
Enrico Turri b89e95aea7 Fixed rotation of multiple instances selection 2019-03-08 14:52:32 +01:00
Enrico Turri 172daa8989 Top toolbar icon size set to 40px 2019-03-08 14:35:33 +01:00
Enrico Turri 862700ab46 Added change removed by mistale in 02163f7f9648b81ad1dc59a4ad6c1a5c55c02a50 2019-03-08 12:04:06 +01:00
Enrico Turri 513256649e Final version of fix to prevent showing old framebuffer when switching between views on Mac 2019-03-08 12:04:01 +01:00
Enrico Turri 81820fa77f 3rd attempt to prevent showing old framebuffer when switching between views on Mac 2019-03-08 12:03:55 +01:00
Enrico Turri 628a868cfd 2nd attempt to prevent showing old framebuffer when switching between views on Mac 2019-03-08 12:03:49 +01:00
Enrico Turri 2f6a5e4af3 1st attempt to prevent showing old framebuffer when switching between views on Mac 2019-03-08 12:03:43 +01:00
Enrico Turri fc70b73f45 Refactoring - Shared members of GLCanvas3D as references instead of pointers 2019-03-08 12:03:37 +01:00
Enrico Turri b5217918cf Code cleanup 2019-03-08 12:03:31 +01:00
Enrico Turri 72239732e4 Fixed build on Mac 2019-03-08 12:03:25 +01:00
Enrico Turri aa4c44dbea Use unique camera shared by 3d view and preview (experimental) 2019-03-08 12:03:17 +01:00
Enrico Turri af72d781ad Fixed GLCanvas3D::Selection::is_single_full_instance() 2019-03-08 10:36:12 +01:00
Enrico Turri 2a6de99f06 Fixed rotation of multiple volumes selection 2019-03-06 15:22:17 +01:00
Enrico Turri 809ffedcb5 Gizmos' grabbers size proportional to the average of the bounding box edges lengths 2019-03-06 14:41:09 +01:00
Enrico Turri 2c99fd35d3 Force canvas resize when switching between views 2019-03-06 13:37:20 +01:00
Enrico Turri de06db7989 Allow dragging of objects also along world Z axis in side views 2019-03-06 12:09:20 +01:00
Enrico Turri 1bb5630eaa Fixed gizmos' imgui dialog x position 2019-03-06 10:47:48 +01:00
Enrico Turri 219ea04c23 Fix of #1812 (GCode Anayzer take in account extruder offsets for multiextruder printers) 2019-03-06 10:22:10 +01:00
Enrico Turri a6ec3ea883 Reverted 8a29ec2204 by disabling the tech ENABLE_ANALYZER_EXTRUDER_OFFSET 2019-03-05 15:35:43 +01:00
Enrico Turri 8a29ec2204 GCode Anayzer take in account extruder offsets 2019-03-05 15:03:56 +01:00
Enrico Turri 925378ba90 Added background to legend texture 2019-03-05 13:57:41 +01:00
Enrico Turri 822bd92bd1 Fixed conflicts after merge with master 2019-03-05 08:27:21 +01:00
Enrico Turri 826a3cdbd2 Technology for svg icons moved to next alpha (8) 2019-03-04 16:05:29 +01:00
Enrico Turri 319a48f42d Added svg icons for view toolbar and gismos 2019-03-04 14:21:52 +01:00
Enrico Turri 5ddf45806b Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-03-04 13:47:34 +01:00
Enrico Turri 06c2b4bdf3 Allow to drag object's subparts once selected using the sidebar table 2019-03-04 11:00:52 +01:00
Enrico Turri 12c91f4283 Removed reset of gcode preview from schedule_background_process() 2019-03-04 10:44:40 +01:00
Enrico Turri 3c7ec5f7c6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-03-04 08:33:52 +01:00
Enrico Turri 3a1dcedaff Prevent camera rotation when clicking and dragging on toolbars 2019-03-01 12:23:33 +01:00
Enrico Turri 8c3df91f2e Code cleanup 2019-03-01 10:46:28 +01:00
Enrico Turri 058468d371 Do not regenerate existing gcode preview toolpaths when switching to Preview 2019-03-01 10:42:46 +01:00
Enrico Turri e03199d989 Allow selection of subparts only from sidebar table 2019-03-01 10:40:10 +01:00
Enrico Turri 8a6d29f7d8 Workaround to fix inconsistencies of width of gcode preview extrusion paths 2019-03-01 09:55:43 +01:00
Enrico Turri e5a2c0a8c8 ENABLE_MODE_AWARE_TOOLBAR_ITEMS set as default 2019-02-28 12:21:36 +01:00
Enrico Turri 9ff8cd01b3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-28 11:45:11 +01:00
Enrico Turri f88cc6a5c1 Merge branch 'et_multivolume_models' of https://github.com/prusa3d/Slic3r 2019-02-28 11:24:35 +01:00
Enrico Turri 4b6ab84dbc Code cleanup 2019-02-28 09:37:55 +01:00
Enrico Turri 44b2ca8182 2nd attempt to fix rendering of printbed svg textures on Mac 2019-02-28 09:04:17 +01:00
Enrico Turri 806eff2325 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-28 08:23:44 +01:00
Enrico Turri 7a522fbbca Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-28 08:22:18 +01:00
Enrico Turri 16e1d3c816 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-27 15:19:22 +01:00
Enrico Turri 68805fc63a Small refactoring in Bed3D and GLShader 2019-02-27 15:19:03 +01:00
Enrico Turri 922224541b Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-27 11:16:28 +01:00
Enrico Turri 6e9c030f17 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-27 11:09:58 +01:00
Enrico Turri 3c39e1a618 Attempt to fix rendering of printbed svg textures on Mac 2019-02-27 10:46:52 +01:00
Enrico Turri 2d77f89360 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-27 10:42:30 +01:00
Enrico Turri 5e9067d652 Fixed build on Linux 2019-02-27 10:28:36 +01:00
Enrico Turri 8cc1486cab Fixed uv in gizmos overlay 2019-02-27 10:03:58 +01:00
Enrico Turri 72c58fbdb4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-27 09:56:34 +01:00
Enrico Turri 76ee51fe8a Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-27 08:27:00 +01:00
Enrico Turri f84591e570 Fixed build on Mac and Linux 2019-02-26 13:27:41 +01:00
Enrico Turri e1eff8fa5c Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-26 12:56:43 +01:00
Enrico Turri a8610f990e Automatic generation of variants of icons for toolbars and gizmos 2019-02-26 12:56:13 +01:00
Enrico Turri 2f205dd77b Fix of #1853 (Translation of volumes in side view) 2019-02-26 12:31:49 +01:00
Enrico Turri 987a83bb0c Fixed build when ENABLE_SVG_ICONS is disabled 2019-02-26 10:57:37 +01:00
Enrico Turri f47fe861ac Allow non-squared textures for toolbars and gizmo icons 2019-02-26 10:40:00 +01:00
Enrico Turri 0f683a6a1e 1st installment of svg icons for toolbars and gizmos 2019-02-26 09:56:23 +01:00
Enrico Turri fab87ff1d9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-25 09:32:02 +01:00
Enrico Turri 03022ce124 Code cleanup 2019-02-22 12:06:56 +01:00
Enrico Turri c6607bcd27 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-22 11:40:04 +01:00
Enrico Turri a36896e4c9 Fixed conflicts after merge with master 2019-02-22 10:18:15 +01:00
Enrico Turri aa9994fa35 Gizmos overlay using a single png texture 2019-02-22 10:01:34 +01:00
Enrico Turri eb0b3aea09 Fixed conflicts after merge with master 2019-02-22 09:11:49 +01:00
Enrico Turri bfdd702134 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-21 11:44:15 +01:00
Enrico Turri 2eb0b6d1b4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-21 08:20:44 +01:00
Enrico Turri 82337d9295 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-20 15:31:55 +01:00
Enrico Turri 11fc849b1a Printbed textures generated from svg files 2019-02-20 15:23:23 +01:00
Enrico Turri 0b0457186b ENABLE_ANISOTROPIC_FILTER_ON_BED_TEXTURES set as default 2019-02-20 13:53:33 +01:00
Enrico Turri e2731416bf Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-20 13:50:54 +01:00
Enrico Turri cb1ef36ceb ENABLE_UNIQUE_BED set as default 2019-02-20 13:50:35 +01:00
Enrico Turri 7443868e87 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-20 13:16:39 +01:00
Enrico Turri 4a9f6ba06a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-20 08:25:34 +01:00
Enrico Turri 7121a1177a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-19 15:19:49 +01:00
Enrico Turri 75df722fee Bed and Axes classes moved from GLCanva3d to Plater to have a unique instance of them shared by all views 2019-02-19 15:15:27 +01:00
Enrico Turri 94c529a118 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-19 14:17:08 +01:00
Enrico Turri d81b957968 Tech ENABLE_REWORKED_BED_SHAPE_CHANGE set as default 2019-02-19 10:28:32 +01:00
Enrico Turri e861f5a243 Tech ENABLE_PRINT_BED_MODELS set as default 2019-02-19 10:07:37 +01:00
Enrico Turri 644794233f Code cleanup 2019-02-18 15:41:12 +01:00
Enrico Turri 8635756b02 Added debug output to investigate further #1788 2019-02-18 15:41:04 +01:00
Enrico Turri 362f6a069c 2nd attempt to fix #1788 2019-02-18 15:40:58 +01:00
Enrico Turri 022b573bae 1st attempt to fix #1788 2019-02-18 15:40:51 +01:00
Enrico Turri 296b1aa7c5 Partial fix of #1786 - Fixed synchronization of Configuration/Mode menu 2019-02-18 11:40:33 +01:00
Enrico Turri 7662fa9a5b Temporary disable transparent bed and higher resolution bed textures 2019-02-08 16:45:03 +01:00
Enrico Turri 29137d1b3c Fixed z offset of printbed models 2019-02-08 10:19:07 +01:00
Enrico Turri c038bc2933 Printbed model rendered with 50% transparency 2019-02-07 09:59:57 +01:00
Enrico Turri 21a7fa6af2 Fix of #1782 2019-02-07 09:22:04 +01:00
Enrico Turri 7c59c218c1 Restored old sl1 printbed model 2019-02-07 09:15:20 +01:00
Enrico Turri a2478b7faa Fixed print bed UV mapping 2019-02-06 15:11:58 +01:00
Enrico Turri 8100f562da Selection of bed texture resolution in dependence of graphic card capabilities 2019-02-06 14:55:36 +01:00
Enrico Turri 63e4fa3862 New model for sl1 print bed 2019-02-06 14:53:52 +01:00