Enrico Turri
5d1e851218
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-04-29 08:25:52 +02:00
enricoturri1966
c9bd0840b3
GCodeViewer -> Code cleanup
2020-04-29 08:24:39 +02:00
Enrico Turri
bd9ada6d68
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-04-28 15:52:30 +02:00
enricoturri1966
d8f6a9179f
GCodeViewer -> Use glMultiDrawElements() in place of glDrawElements() to draw all entities
2020-04-28 15:49:01 +02:00
Enrico Turri
32178dd06d
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-04-28 15:09:29 +02:00
enricoturri1966
3267d3368f
GCodeViewer -> Use glMultiDrawElements() in place of glDrawElements() to draw extrude and travel paths
2020-04-28 15:08:36 +02:00
enricoturri1966
d265c84b76
GCodeViewer -> Refactoring
2020-04-28 12:24:03 +02:00
enricoturri1966
a00c391f0f
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-04-28 10:29:44 +02:00
enricoturri1966
1cb0f044db
GCodeProcessor::MoveVertex -> added placeholder for time
2020-04-28 10:29:25 +02:00
Enrico Turri
569b872423
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-04-28 09:19:07 +02:00
enricoturri1966
a77461b467
GCodeViewer -> Fixed synchronization between legend and bottom toolbar
2020-04-28 09:09:24 +02:00
Enrico Turri
6cd6c9ccb1
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-04-28 08:51:53 +02:00
enricoturri1966
2a4d011817
GCodeViewer -> Toggle extrusion role visibility by clicking on legend
2020-04-28 08:50:52 +02:00
Enrico Turri
4921f60707
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-04-27 14:11:18 +02:00
enricoturri1966
eac4b3c15a
GCodeViewer -> Added debug statistics imgui dialog
2020-04-27 14:10:18 +02:00
Enrico Turri
c1ac4ff70a
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-04-27 12:52:14 +02:00
enricoturri1966
c1246f86eb
GCodeViewer -> Refactoring
2020-04-27 12:43:51 +02:00
enricoturri1966
a6ed1d817a
GCodeViewer -> Layers z slider wip
2020-04-27 11:44:29 +02:00
enricoturri1966
c76bf934f7
GCodeViewer -> Shortcut to show/hide legend
2020-04-27 08:19:48 +02:00
enricoturri1966
4ea96340d8
GCodeViewer -> Draw alphed extrusion paths into legend when set as not visible
2020-04-25 12:24:56 +02:00
enricoturri1966
eadad6c1d1
GCodeViewer -> Add travel paths to legend
2020-04-25 11:16:28 +02:00
enricoturri1966
85676af171
Modified wxCheckListBoxComboPopup::GetAdjustedSize() and create_combochecklist() to size the combo control taking in account the items width
2020-04-25 10:36:51 +02:00
Enrico Turri
4787638343
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-04-24 16:13:35 +02:00
enricoturri1966
d8091b7ad7
ENABLE_GCODE_VIEWER -> Preview toolbar checkboxes moved into a new combo
2020-04-24 16:12:38 +02:00
Enrico Turri
8c2231cb30
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-04-24 14:34:46 +02:00
enricoturri1966
e5c45405d4
Fixed conflicts after merge with master
2020-04-24 10:59:03 +02:00
enricoturri1966
81a29169ae
GCodeViewer -> Coloring of travel paths
2020-04-24 08:46:31 +02:00
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