Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 2fbeb9e455 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-23 15:46:36 +02:00
enricoturri1966 90d5cf1735 Fix to previous commit 2020-04-23 15:46:21 +02:00
enricoturri1966 66964c44c1 GCodeViewer -> Refactoring and code cleanup 2020-04-23 15:12:40 +02:00
Enrico Turri 4bdd8b9681 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-23 14:03:08 +02:00
enricoturri1966 6e2307f56d GCodeViewer -> Refactoring 2020-04-23 14:02:47 +02:00
Enrico Turri e39c1fbd6a Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-23 13:56:43 +02:00
enricoturri1966 7be12e8f1e GCodeViewer -> Completed extrusion toolpaths colored by color print 2020-04-23 10:24:03 +02:00
enricoturri1966 7a0df4bcb4 GCodeViewer -> Extrusion toolpaths colored by color print (wip) + visualization of tool changes, color changes, pause prints, custom gcodes + refactoring 2020-04-22 16:29:07 +02:00
enricoturri1966 603f128568 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-21 15:56:35 +02:00
Enrico Turri 7bfdd0d48b Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-21 15:56:26 +02:00
enricoturri1966 4c4485a9b5 GCodeViewer -> Extrusion toolpaths colored by tool 2020-04-21 15:55:26 +02:00
Enrico Turri 692b0e293b Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-21 12:52:25 +02:00
enricoturri1966 61db595f53 GCodeViewer -> Refactoring 2020-04-21 12:51:58 +02:00
Enrico Turri b4d10c2350 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-21 12:39:46 +02:00
enricoturri1966 443a511420 GCodeViewer -> Extrusion toolpaths colored by volumetric rate 2020-04-21 11:38:42 +02:00
Enrico Turri 8442e120f2 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-21 09:42:49 +02:00
enricoturri1966 53d758639f GCodeViewer -> Extrusion toolpaths colored by fan speed 2020-04-21 09:06:43 +02:00
Enrico Turri 04691cbcb1 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-20 16:34:45 +02:00
enricoturri1966 4493b512d5 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-20 16:05:20 +02:00
enricoturri1966 3ba6ac7836 GCodeViewer -> Extrusion toolpaths colored by feedrate and ranges calculations dependent on travel paths visibility 2020-04-20 16:04:59 +02:00
enricoturri1966 dc3c5db9fe GCodeViewer -> Use rgb instead of rgba colors 2020-04-20 13:44:14 +02:00
enricoturri1966 aee80dbd01 GCodeViewer -> Extrusion toolpaths colored by width 2020-04-20 13:24:25 +02:00
enricoturri1966 6e5a6f3b43 GCodeViewer -> Extrusion toolpaths colored by height 2020-04-20 10:52:16 +02:00
enricoturri1966 179dbc7d0e Tech ENABLE_GCODE_VIEWER -> removed legend texture from GLCanvas3D 2020-04-18 11:49:20 +02:00
enricoturri1966 3a07e8730f GCodeViewer -> Basic legend using imgui 2020-04-18 10:41:37 +02:00
enricoturri1966 a74fa7f019 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-17 16:48:56 +02:00
enricoturri1966 83816afb3f GCodeViewer -> Added bounding box to fix camera frustum tighting 2020-04-17 13:28:25 +02:00
Enrico Turri f4f845999c Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-17 10:50:59 +02:00
enricoturri1966 9776d7c5a1 GCodeViewer -> Toggle visibility of extrusions roles 2020-04-17 10:43:29 +02:00
Enrico Turri cb9e48cadc Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-17 09:56:48 +02:00
enricoturri1966 9c68abfb35 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-17 08:18:20 +02:00
enricoturri1966 7b0e35e70d GCodeViewer -> Selection of extrusions view type 2020-04-16 15:59:36 +02:00
enricoturri1966 75d1e8373d GCodeViewer -> extrusion paths colored by extrusion role 2020-04-16 15:09:04 +02:00
enricoturri1966 61ab7bbebf GCodeViewer -> Basic indexed rendering 2020-04-15 16:29:11 +02:00
enricoturri1966 cc774dece7 GCodeViewer -> Toggle visibility of shells 2020-04-15 14:31:39 +02:00
enricoturri1966 bc05ab985c GCodeViewer -> Toggle visibility of travel paths, retractions and uretractions 2020-04-14 16:40:08 +02:00
enricoturri1966 c3eb65c461 Added class GCodeViewer -> basic render of gcode toolpaths using dedicated shaders 2020-04-14 10:02:08 +02:00
enricoturri1966 bac10311bc Follow-up of c887ecfefa -> Removed unneded assignements from shaders 2020-04-08 09:00:08 +02:00
enricoturri1966 c887ecfefa Removed unneeded branching from shaders 2020-04-08 08:22:02 +02:00
enricoturri1966 4df141815b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-08 08:10:03 +02:00
enricoturri1966 0e2fba6d6f Fixed bug in calculating the specular component of the color in shaders 2020-04-08 08:07:36 +02:00
enricoturri1966 22cf0396fc Added missing include 2020-04-06 17:32:35 +02:00
enricoturri1966 2c69d96239 Reduced size of GCodeProcessor::MoveVertex 2020-04-06 17:24:11 +02:00
enricoturri1966 57dad5dfd2 GCodeProcessor additions:
process color change comment tag

process pause print comment tag

process custom code comment tag

process end pause print or custom code comment tag
2020-04-06 11:53:15 +02:00
enricoturri1966 1caac17b02 GCodeProcessor additions:
process M108 lines

process M132 lines

process M135 lines

process M401 lines

process M402 lines
2020-04-06 08:55:48 +02:00
enricoturri1966 dce1f24ad8 GCodeProcessor additions:
process G10 lines

process G11 lines

process G22 lines

process G23 lines

process M106 lines

process M107 lines

process mm3_per_mm comment tag
2020-04-03 10:15:46 +02:00
enricoturri1966 824e436058 Hopefully last missing include 2020-04-02 16:07:54 +02:00
enricoturri1966 f05de150c5 Added another missing include 2020-04-02 15:52:42 +02:00
enricoturri1966 d0ce17656f Added missing includes 2020-04-02 13:19:42 +02:00
enricoturri1966 ece4f10bf7 Updated Print.xsp 2020-04-02 12:30:54 +02:00
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