Commit Graph
100 Commits
Author SHA1 Message Date
enricoturri1966 ab1e90ec0d Fixed conflicts after merge with master 2020-04-02 12:29:30 +02:00
enricoturri1966 956f7a4593 GCodeProcessor additions:
process G90 lines

process G91 lines

process G92 lines

process M82 lines

process M83 lines

process T lines

process extrusion role/width/height comment tags

debug output
2020-04-02 12:03:18 +02:00
enricoturri1966 a6fe16c612 3rd attempt to fix build on AppleClang 2020-04-02 08:11:25 +02:00
enricoturri1966 f27999e136 Follow-up of cfb6ac76fc - Another attempt to fix the build on AppleClang (std::array in lambdas) 2020-04-01 16:47:35 +02:00
enricoturri1966 cfb6ac76fc Fixed build on AppleClang 2020-04-01 15:54:25 +02:00
enricoturri1966 87ba9f251b Merge remote-tracking branch 'origin/et_lower_ram_footprint' 2020-04-01 15:11:25 +02:00
enricoturri1966 f598c2d5d8 Fixed conflicts after merge with master 2020-04-01 15:06:30 +02:00
enricoturri1966 8a03d5642d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-04-01 09:58:48 +02:00
enricoturri1966 1f3046f65d #3964 - Attempt to fix crash when closing on Linux (Debian unstable) 2020-04-01 09:58:31 +02:00
enricoturri1966 daa6dd0a25 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-31 18:05:12 +02:00
enricoturri1966 e886475fe7 Fixed build when tech ENABLE_NON_STATIC_CANVAS_MANAGER is disabled 2020-03-31 18:04:49 +02:00
Enrico Turri 081a24abf3 Follow-up of 095062e371 -> 3DConnexion settings dialog (Ctrl+M) shown only on Linux (not Mac) 2020-03-31 15:30:24 +02:00
Enrico Turri 095062e371 3DConnexion settings dialog (Ctrl+M) shown only on Mac 2020-03-31 14:16:53 +02:00
Enrico Turri f1ccd38258 Fixed shaders on Intel Cards - not allowed use of 'active' word 2020-03-31 12:51:50 +02:00
enricoturri1966 29cbfa7c9e Fixed conflicts after merge with master 2020-03-30 09:36:37 +02:00
enricoturri1966 35e963a566 Small refactoring 2020-03-30 09:01:50 +02:00
enricoturri1966 a8f6f295e4 Merge remote-tracking branch 'origin/et_canvas_manager' 2020-03-25 15:40:44 +01:00
enricoturri1966 dd34aef643 Follow-up of bfbcd45209 -> completed fix 2020-03-25 15:30:25 +01:00
enricoturri1966 bfbcd45209 Fixed build on Mac 2020-03-25 15:15:20 +01:00
enricoturri1966 a54d77699b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-25 14:54:10 +01:00
enricoturri1966 f12b39be25 Fixed conflicts after merge with master 2020-03-25 14:41:47 +01:00
enricoturri1966 ed0f3b3406 Small refactoring 2020-03-25 13:55:17 +01:00
enricoturri1966 06006e664a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-03-25 12:27:44 +01:00
enricoturri1966 a1a4d49f15 Fixed conflicts after merge with master 2020-03-25 12:07:59 +01:00
enricoturri1966 24992e3e50 Merge remote-tracking branch 'origin/et_bug_fixes' 2020-03-25 10:39:45 +01:00
enricoturri1966 10eb954c7e ENABLE_AUTO_CONSTRAINED_CAMERA set as default 2020-03-25 10:24:52 +01:00
enricoturri1966 3d6c9e54e9 ENABLE_THUMBNAIL_GENERATOR set as default 2020-03-25 10:15:02 +01:00
enricoturri1966 fac28ea27a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-25 09:34:17 +01:00
enricoturri1966 3990598f01 Fixed build when ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX is disabled 2020-03-25 09:33:59 +01:00
enricoturri1966 df8def7545 Fixed build when ENABLE_CANVAS_TOOLTIP_USING_IMGUI is disabled 2020-03-25 09:22:37 +01:00
enricoturri1966 c300b66b7e ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 09:05:35 +01:00
enricoturri1966 69ca14a695 ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:52:57 +01:00
enricoturri1966 6f1c99db34 ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:43:18 +01:00
enricoturri1966 36041ced26 ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:31:15 +01:00
enricoturri1966 7c72231fcd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-24 12:26:48 +01:00
enricoturri1966 c6d5ad1517 Refactoring of toolbars' tooltip generation 2020-03-24 12:26:30 +01:00
enricoturri1966 a1ec38a7fb Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-24 08:08:12 +01:00
enricoturri1966 4c1d867ba0 #3897 - Small optimisation in GCodePreviewData::RangeBase::get_color_at (thanks to rongith) 2020-03-23 16:12:52 +01:00
enricoturri1966 c480041487 Close undo/redo windows when an item in the list is selected 2020-03-23 16:00:56 +01:00
enricoturri1966 b8c4369c4f ImGui upgraded to version 1.75 + fixes required by upgrade 2020-03-23 12:41:16 +01:00
Enrico Turri 7c56cc9f22 Follow-up of f912fecad5 -> option to swap y/z axes extended to rotations 2020-03-20 16:13:08 +01:00
Enrico Turri f912fecad5 3DConnexion devices: added option to swap y/z translations 2020-03-20 13:09:42 +01:00
enricoturri1966 5b24a0fb91 Fixed conflicts after merge with master 2020-03-20 10:55:37 +01:00
enricoturri1966 cd5154b8e1 Fixed tooltip reappering after leaving imgui dialog 2020-03-19 15:12:18 +01:00
enricoturri1966 5b3ca3e4b7 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-19 14:06:49 +01:00
enricoturri1966 2501cf64c0 Modified mouse events handling for gizmobar
The gizmobar was consuming the mouse up event preventing the gizmos to update their tooltip

The gizmobar was also consuming the mouse dragging event transforming a gizmo manipulation into a scene rotation
2020-03-19 14:05:49 +01:00
Enrico Turri 5a4e80fdb2 Added readme.md file for imgui 2020-03-19 10:43:48 +01:00
enricoturri1966 739d8131ab Modified mouse events handling for toolbar
The toolbar was consuming the mouse up event preventing the gizmos to update their tooltip
2020-03-18 16:59:30 +01:00
enricoturri1966 9da16aeaa9 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 14:27:02 +01:00
enricoturri1966 61f3b53ef8 Fixed conflicts after merge with master 2020-03-18 14:26:44 +01:00
enricoturri1966 cd55b235ad Canvas tooltip constrained inside canvas 2020-03-18 14:13:50 +01:00
enricoturri1966 c5552843ab Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 13:36:01 +01:00
enricoturri1966 8a824bb8c2 Refactoring 2020-03-18 13:35:46 +01:00
enricoturri1966 1c1a6b933a Fixed interference between tooltips and imgui dialogs 2020-03-18 10:46:46 +01:00
enricoturri1966 f4aa9c5b0e #3858 - Added missing reset for fan speed visualization 2020-03-18 08:10:05 +01:00
enricoturri1966 a85a2b2e2a Attempt to fix build on Linux 2020-03-17 15:47:49 +01:00
enricoturri1966 166389e6a8 Initial delay for ImGUI-based tooltip 2020-03-17 14:35:56 +01:00
enricoturri1966 7a1fa3d847 Canvas' tooltip using ImGUI 2020-03-17 13:01:38 +01:00
enricoturri1966 12c0170e3c Attempt to fix gizmos tooltip on Mac 2020-03-17 11:02:32 +01:00
enricoturri1966 df6170b9bd Fixed gizmos' tooltips 2020-03-17 09:41:54 +01:00
enricoturri1966 2ab8a474c2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-17 07:59:10 +01:00
enricoturri1966 a0ed240af1 Generate gizmos' tooltip on demand 2020-03-16 16:37:22 +01:00
enricoturri1966 505181ddfd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-16 14:19:30 +01:00
enricoturri1966 abcd01d64a ENABLE_SLOPE_RENDERING - Do not apply slope shading to modifiers and small refactoring 2020-03-16 14:17:19 +01:00
enricoturri1966 19d93b3b01 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-16 13:35:15 +01:00
enricoturri1966 350a85cf43 #3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview 2020-03-16 13:34:53 +01:00
enricoturri1966 ffe404fc5b Fixed gizmos' tooltips 2020-03-16 12:45:39 +01:00
enricoturri1966 5378b18f18 ENABLE_SLOPE_RENDERING - Fixed fragment shader when the thresholds are identical 2020-03-16 08:35:13 +01:00
enricoturri1966 ac4d9ea172 Fixed conflicts after merge with master 2020-03-16 08:09:52 +01:00
enricoturri1966 b36051af82 New tech ENABLE_SLOPE_RENDERING - 1st installment of rendering objects colored by facets slope 2020-03-13 15:09:07 +01:00
Enrico Turri 3684eea53d Follow-up of 4a59a45d51 -> missed cleanup 2020-03-13 13:20:38 +01:00
Enrico Turri 3fd6c8a2ff #2922 - Fan speed for gcode visualization modified as proposed by rongith 2020-03-13 08:25:48 +01:00
Enrico Turri 4c16ce442f #3816 - Use constrained camera when navigating the 3D scene with regular mouse, if free camera is not selected 2020-03-12 09:29:24 +01:00
Enrico Turri 9aa5c13c15 Fixed initial position of top toolbars 2020-03-11 14:15:36 +01:00
Enrico Turri 4d39050dcd Fixed conflict after merge with master 2020-03-11 13:16:15 +01:00
Enrico Turri 2c9bd86a70 Fix of crash and/or assert when changing language 2020-03-11 12:19:52 +01:00
Enrico Turri 591c73a4dd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-10 13:45:36 +01:00
Enrico Turri 1d337b0e24 #3791 - Linear zoom for 3DConnexion devices 2020-03-10 13:43:49 +01:00
Enrico Turri a8dff7038f Fixed conflicts after merge with master 2020-03-10 13:09:32 +01:00
Enrico Turri a6a9ab9dc7 Follow-up of 6c36577e8e -> World Z axis set to vertical when disconnecting 3d mouse 2020-03-10 13:02:39 +01:00
Enrico Turri 33470f7f6d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-10 12:03:26 +01:00
Enrico Turri 4ca03c3f8a #3802 - Fixed objects list's context menu showing up when moving mouse after changing selection 2020-03-10 12:03:08 +01:00
Enrico Turri 5693545d15 Fixed conflicts after merge with master 2020-03-09 16:03:15 +01:00
Enrico Turri 56fa84c9d9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-09 15:23:38 +01:00
Enrico Turri 6c36577e8e #3782 - World Z axis always vertical for non-free camera 2020-03-09 15:23:29 +01:00
Enrico Turri d9d5722bf7 Reduced ram used by GCodeTimeEstimator by removing unused data from GCodeTimeEstimator::Block 2020-03-05 14:58:03 +01:00
Enrico Turri da86472bf1 Reduced ram used by GCodeTimeEstimator by removing unused redundant data from GCodeTimeEstimator::Block::Trapezoid 2020-03-05 12:16:58 +01:00
Enrico Turri de7a09f833 Fixed conflicts after merge with master 2020-03-05 10:41:11 +01:00
Enrico Turri dc3df3aec7 Removed temporary debug output and clean up 2020-03-05 10:14:12 +01:00
Enrico Turri dcf3565426 Attempt to fix crash on MAC when closing using Command+Q 2020-03-04 15:19:48 +01:00
Enrico Turri 1bff1f7460 Added temporary debug output to investigate crash on MAC when closing using Command+Q 2020-03-04 14:19:15 +01:00
Enrico Turri bf3888fc49 Reduced ram used by GCodeAnalyzer by replacing doubles with floats into GCodeAnalyzer::GCodeMove 2020-03-04 13:21:03 +01:00
Enrico Turri 436a055b39 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-04 09:39:00 +01:00
Enrico Turri 96f5430cee Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-03 11:10:59 +01:00
Enrico Turri 0f90b44e3d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-03 08:34:11 +01:00
Enrico Turri d12cc6cb77 Removed temporary debug output 2020-03-03 08:34:03 +01:00
Enrico Turri a14fe518be Fixed detection of OSX version 2020-03-02 15:55:36 +01:00
Enrico Turri 8b5a08a64a Added temporary debug output 2020-03-02 15:22:41 +01:00
Enrico Turri 3b6d334d7b ENABLE_GCODE_VIEWER - Basic framework for new gcode viewer 2020-03-02 15:13:23 +01:00
Enrico Turri 0a3555f73b Reintroduced tech ENABLE_HACK_CLOSING_ON_OSX_10_9_5 2020-03-02 14:37:01 +01:00