Enrico Turri
2c9521c6d2
Model::convert_multipart_object() modified to keep original object position on the bed
2019-08-22 13:29:21 +02:00
Enrico Turri
56080bee8d
Merge branch 'et_colorprint_no_m600' of https://github.com/prusa3d/PrusaSlicer
2019-08-22 11:51:00 +02:00
Enrico Turri
42b8176e9b
Temporary human readable form for print color change tag for time estimate
2019-08-21 16:06:56 +02:00
Enrico Turri
c1d8fa377e
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_colorprint_no_m600
2019-08-21 15:21:23 +02:00
Enrico Turri
9cabb03f72
GCodeTimeEstimator uses annotated gcode in place of processing m600 lines to detect color print changes.
...
WARNING -> After this commit the exported gcode will contain the extra lines used by the time estimator. They will be removed by a future commit when a new post-process method will be implemented.
2019-08-21 14:43:14 +02:00
Enrico Turri
b79457b723
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_colorprint_no_m600
2019-08-21 14:09:45 +02:00
Enrico Turri
85ed363951
GCodeAnalyzer uses annotated gcode in place of processing m600 lines to detect color print changes
2019-08-21 14:09:20 +02:00
Enrico Turri
6e522cea15
Added missing include
2019-08-20 14:58:27 +02:00
Enrico Turri
403e2c7003
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_toolpaths_export
2019-08-20 14:35:39 +02:00
Enrico Turri
1b6490af4c
Export materials file for gcode toolpaths when exported to obj file
2019-08-20 14:35:23 +02:00
Enrico Turri
2e3c71baaf
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_toolpaths_export
2019-08-20 12:10:50 +02:00
Enrico Turri
f63b3ba600
Fixed gcode toolpaths data for export to obj file when taken from cpu
2019-08-20 12:10:15 +02:00
Enrico Turri
da00b7bfa5
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_toolpaths_export
2019-08-20 11:34:18 +02:00
Enrico Turri
58473f84ee
Check for existence of gcode toolpaths that can be exported to obj file
2019-08-20 11:33:58 +02:00
Enrico Turri
a99a89a831
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_toolpaths_export
2019-08-20 09:51:44 +02:00
Enrico Turri
730283a9e9
Export to obj file only toolpaths visible in 3D scene
2019-08-20 09:51:25 +02:00
Enrico Turri
1f6aab312b
1st installment of export of gcode toolpaths to obj file
2019-08-20 09:01:09 +02:00
Enrico Turri
0becfa0a04
Fix of #2739
2019-08-19 15:44:22 +02:00
Enrico Turri
8078e00c13
Fixed automatic update of perspective camera
2019-08-03 09:07:38 +02:00
Enrico Turri
77df54947b
Follow-up of c791ba776f -> Estimated times for color print layed-out as 'time for color (remaining time at color start)'
2019-08-03 08:51:03 +02:00
Enrico Turri
be72e23dec
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-02 15:30:59 +02:00
Enrico Turri
1cdc3e0493
Workaround for gizmos being clipped by the perspective camera
2019-08-02 15:30:37 +02:00
Enrico Turri
c791ba776f
Added absolute time to estimated time for color print and fixed a bug in showing estimated times for print color for silent mode
2019-08-02 12:05:02 +02:00
Enrico Turri
28cc595350
#2593 - Fixed loading of .zip.amf files when running from command line
2019-08-02 09:43:41 +02:00
Enrico Turri
5f89414501
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-01 11:01:26 +02:00
Enrico Turri
299739eeda
Refactoring into GLTexture::Compressor
2019-08-01 11:01:18 +02:00
Enrico Turri
f913bbf8ef
Reverted order of items in recent projects list
2019-08-01 09:03:06 +02:00
Enrico Turri
12a98bea94
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-31 15:30:16 +02:00
Enrico Turri
4a3d7cfb0f
Follow-up of https://github.com/prusa3d/PrusaSlicer/commit/9548dfd88f00a6d0c8d94faf4ef36fafd3dfc84f -> an hopefully smarter fix
2019-07-31 15:30:03 +02:00
Enrico Turri
9548dfd88f
Fixed selection of full object from objects list
2019-07-31 11:52:24 +02:00
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