Commit Graph

259 Commits

Author SHA1 Message Date
Lukas Matena
f568f93f08 More SLA support points improvements
- unselected objects are hidden when SLA gizmo is active
- support volumes are hidden when editing mode is active
- 3mf support points format versioning
2019-02-01 23:09:02 +01:00
Enrico Turri
e00fb7ba43 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes 2019-02-01 15:14:19 +01:00
Enrico Turri
3e7f76b578 Added debug output to investigate SPE-807 2019-02-01 11:54:18 +01:00
Lukas Matena
21026ec9a8 SLA support points improvements
- semi-intelligent algorithm to place support points
- enhanced ImGui dialog with editing/non-editing mode
- support points can have different head diameter (only implemented in GUI so far)
- autogenerated points supporting emerging islands are annotated and the info is kept
2019-02-01 07:13:08 +01:00
Enrico Turri
5fa5d495bb Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-31 13:32:47 +01:00
Enrico Turri
81c621716b User mode-aware toolbar items 2019-01-31 13:19:26 +01:00
Enrico Turri
883e09fbcd Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-30 12:16:49 +01:00
YuSanka
e291172e24 Implemented "Color Print" for preview mode (without re-slicing) 2019-01-29 15:11:29 +01:00
Enrico Turri
6137cc48eb ENABLE_IMPROVED_SIDEBAR_OBJECTS_MANIPULATION set as default 2019-01-28 16:06:44 +01:00
Enrico Turri
1550ee0e2b Merge branch 'objects_centering' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-28 08:53:46 +01:00
bubnikv
bb0cf221bc WIP synchronization of Z rotation of the instances 2019-01-28 08:52:22 +01:00
bubnikv
241283d956 Merge remote-tracking branch 'remotes/origin/vk-bugfixes' 2019-01-26 13:10:58 +01:00
Enrico Turri
348aa48121 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 11:50:34 +01:00
Enrico Turri
be1d9c693c Free camera rotation for sla printer 2019-01-25 11:35:28 +01:00
Enrico Turri
16bd7325c1 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 08:29:15 +01:00
Vojtech Kral
7d30323f46 Mac: Retina OpenGL: Fix imgui windows, right-click menu, misc 2019-01-24 20:03:12 +01:00
Vojtech Kral
3df1ed8f6b Mac: Retina OpenGL: Fix ImGui font switch, dynamic switching, toolbar fixes 2019-01-24 20:03:12 +01:00
Vojtech Kral
d1c569dd57 Mac: Implement Retina for the 3D scene, fix #97 2019-01-24 20:03:12 +01:00
bubnikv
49487c16e6 Improvements of the triangulation of SLA layer preview. 2019-01-24 19:08:58 +01:00
Enrico Turri
c2c7a3ad8f Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-23 15:56:46 +01:00
bubnikv
0af11c51e3 Fixed update on reset of the variable layer height profile.
Fixed update of the layer height profile on PrintObject when changing profiles.
Fixed crash due to the layer height editing refactoring & wipe tower.
2019-01-23 14:00:03 +01:00
Enrico Turri
9a5d7a98a6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-23 08:26:55 +01:00
bubnikv
6937c21f4b Fixed updates of the variable layer height texture on config change
and when the reset button on the variable layer height bar is pressed.
2019-01-22 12:14:26 +01:00
Enrico Turri
f44510c272 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-22 08:32:05 +01:00
bubnikv
ceb08d6380 Variable layer height editing:
Smarter updates of the SlicingParameters (update on ScheduleBackgroundProcessing
or on object selection change)
2019-01-21 17:02:16 +01:00
Enrico Turri
012c681e67 Sidebar visual hints set as default 2019-01-21 12:36:34 +01:00
Enrico Turri
cceff0c519 Unique OpenGL context set as default 2019-01-21 12:20:53 +01:00
Enrico Turri
060fac5e55 Ensure object on bed while scaling set as default 2019-01-21 11:46:06 +01:00
bubnikv
d64b55d27d WIP Restoration of the layer editing. 2019-01-21 10:06:51 +01:00
Enrico Turri
aa7ff0700b Reworked management of bed shape changes (may fix #1671) 2019-01-17 13:21:33 +01:00
Enrico Turri
e7fad6f3bc Added min displacement threshold for newly selected objects to avoid unwanted displacement when selecting them 2019-01-14 09:29:17 +01:00
Enrico Turri
5f9d36e5b0 Rotate gizmo oriented in the current instance reference system for single volume rotations 2019-01-10 13:13:11 +01:00
Lukas Matena
60926e7be3 Place to bed now rotates all instances the same way, regardless of which one was selected 2019-01-05 08:34:05 +01:00
Enrico Turri
8e001972a9 Added print bed models for mk2 and mk3 printers to 3D scene 2019-01-04 12:56:48 +01:00
Enrico Turri
b099d5c05e Removal of wxNotebook from plater set as default 2019-01-03 12:59:06 +01:00
Enrico Turri
ca6a7ac8d5 Further improvement in objects manipulation using sidebar (multiselection) 2019-01-03 11:24:03 +01:00
Enrico Turri
2adce62643 Background texture for toolbars set as default 2019-01-02 16:26:22 +01:00
Enrico Turri
9b8a68565f Modified camera target behavior set as default 2019-01-02 14:04:26 +01:00
Enrico Turri
611d9aa0d8 Model's volume transform set as default 2019-01-02 10:49:13 +01:00
Enrico Turri
447a51a3c8 Constrained camera target set as default 2019-01-02 08:55:56 +01:00
Lukas Matena
7617b10d6e SLA autosupports including islands 2018-12-21 12:35:20 +01:00
Enrico Turri
68684dd003 Removed obsolete GLCanvas3D::m_shader_enabled 2018-12-20 13:20:21 +01:00
Enrico Turri
54fae97032 Visual hints in the 3D scene when sidebar matrix fields have focus -> Completed VBOs case 2018-12-20 11:14:53 +01:00
Enrico Turri
2548253d59 Another fix on volumes translation 2018-12-19 15:03:49 +01:00
bubnikv
5553d10c1e Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-19 14:47:25 +01:00
bubnikv
e9990ed79e Fix of SPE-691 Slicer crash after extruder change
Added synchronization of GCodePreviewData between the front end / back end
(GCodePreview data is only used if PrintStep psGCodeExport is finished).
Added reset of GCodePreviewData on Print::apply() to conserve RAM.
2018-12-19 14:47:16 +01:00
Enrico Turri
0dcdcf74fc Visual hints in the 3D scene when sidebar matrix fields have focus (wip [position+scale+size] and disabled) 2018-12-19 14:44:37 +01:00
YuSanka
b7c506170d Fixed OSX build
+ Added shortcut (?) for "Keyboard Shortcuts" dialog
2018-12-19 14:01:46 +01:00
Enrico Turri
7077c1e4a1 Sidebar matrix field behavior for multiple volume selection 2018-12-18 14:08:46 +01:00
Enrico Turri
d6b8ed3e3e Sidebar matrix field behavior for single volume selection 2018-12-18 13:07:50 +01:00
Enrico Turri
3f96f6df84 Rendering of selection center (disabled) 2018-12-18 12:35:49 +01:00
Enrico Turri
334f747fa9 Sidebar matrix fields focus handling 2018-12-18 10:40:53 +01:00
Enrico Turri
985cd17265 Axes rendering 2018-12-17 14:09:35 +01:00
Enrico Turri
40f74fe6eb Added background texture to gizmos overlay 2018-12-17 13:20:57 +01:00
Enrico Turri
57e80f896c Small refactoring into gizmos overlay in preparation for background texture 2018-12-17 12:49:47 +01:00
bubnikv
7e8d9c154d WIP: Fix of PrusaControl import.
Now the transformation matrices need to be restored as well.
2018-12-17 12:11:51 +01:00
Enrico Turri
083c626770 Added background texture to toolbars 2018-12-17 10:55:14 +01:00
Enrico Turri
1dad58e60c Fixed rendering of legend texture with new background color 2018-12-13 11:13:58 +01:00
YuSanka
e1cea03cda Added template for the handle of the TextCtrl's focus event 2018-12-11 14:05:56 +01:00
Enrico Turri
9e952c9122 Fixed rendering of caps in sla preview 2018-12-10 12:59:49 +01:00
Enrico Turri
b6bac7824f Fixed volumes translation when instance has a transformation containing mirror 2018-12-10 09:46:01 +01:00
Enrico Turri
198b23283c Camera target constrained to scene bounding box 2018-12-07 16:23:04 +01:00
Enrico Turri
512e9d5bca Fixed lost selection when double-clicking while a gizmo is active 2018-12-06 14:26:13 +01:00
Enrico Turri
c908a4674a Removal of tabs from plater -> added buttons to scene to switch between views 2018-12-06 10:38:19 +01:00
Enrico Turri
9bfcf10cc6 Gizmos shortcuts set as default 2018-12-04 16:01:25 +01:00
Enrico Turri
04d7154d40 Gizmos rendered on top set as default 2018-12-04 15:53:40 +01:00
Enrico Turri
428800ad1e 1st installment of removal of tabs from plater 2018-12-04 13:55:25 +01:00
Enrico Turri
c08d0a4a78 Bunch of fixes into sla support gizmo 2018-12-03 14:02:58 +01:00
YuSanka
7395b923bd Update gizmos on/off state 2018-12-03 13:29:28 +01:00
bubnikv
041fae8148 Added the bed texture for SL1 2018-11-30 15:31:47 +01:00
Enrico Turri
918a7f8ddd Fixed lost selection when selecting object while place on face gizmo is active 2018-11-30 12:49:31 +01:00
Enrico Turri
b83468e763 Removed gizmo reset by double-cliking on grabbers 2018-11-30 11:42:36 +01:00
YuSanka
054d202817 Correct mixed_selection updating from 3dScene to ObjectList 2018-11-30 11:22:06 +01:00
Enrico Turri
42b70c4933 Modified gizmo rotate rendering 2018-11-29 15:10:11 +01:00
Enrico Turri
ef1d43c711 SLA slices preview - improved performances 2018-11-29 11:11:39 +01:00
Enrico Turri
7913060869 Added zoom in/out using keys [i]/[o] 2018-11-29 09:03:38 +01:00
YuSanka
360133246c Fixed ColorPrint current layer identification 2018-11-28 16:03:24 +01:00
Enrico Turri
bac021d516 SLA slices preview - completed prototype 2018-11-28 15:13:25 +01:00
Vojtech Kral
f5080ea7f5 Fix re-entrant render() calls, add an assert to enforce 2018-11-27 16:57:37 +01:00
Enrico Turri
e6369fe548 SLA slices preview - wip 3 2018-11-27 14:50:57 +01:00
Vojtech Kral
cc557b8a7f Yet more fix of ENABLE_IMGUI 2018-11-27 12:51:50 +01:00
Lukas Matena
878c7ee3d7 SLA support point gizmo - ImGui experimental overlay plus a small bugfix related to point deletion 2018-11-26 15:54:37 +01:00
Enrico Turri
4ca302ba6a SLA slices preview - wip 2018-11-26 15:16:35 +01:00
Lukas Matena
d28d4823e0 SLA support points gizmo - multiple instance support 2018-11-26 13:03:03 +01:00
Vojtech Kral
c29493a41b imgui: Refactor, use in cut gizmo 2018-11-26 11:16:39 +01:00
Enrico Turri
b94f19eaf4 Added method GLCanvas3D::is_dragging() 2018-11-26 10:41:16 +01:00
bubnikv
9722bcdd75 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-23 12:47:46 +01:00
bubnikv
b03f672801 Refactored to get direct access to GLCanvas3D in Plater and Preview.
WIP: SLA update delayed until mouse is released.
2018-11-23 12:47:32 +01:00
Enrico Turri
cabfca1031 Do not select wipe tower when using Select all command 2018-11-23 11:47:18 +01:00
bubnikv
bde4153d44 Removed legacy GUI Perl bindings,
replaced Print & SLAPrint pointers with BackgroundProcessing pointer
at the GLCanvas3D level, so that the Print & SLAPrint access will be
synchronized with the current printer technology.
2018-11-22 15:29:59 +01:00
Enrico Turri
200b3d010f Fixed volumes translation 2018-11-22 12:50:54 +01:00
Enrico Turri
c60ed7bc07 Added shortcuts for gizmos 2018-11-22 10:14:31 +01:00
Enrico Turri
681beeadf6 Added menu Edit -> Select all 2018-11-21 15:28:35 +01:00
bubnikv
a21f1783a9 Added force_full_scene_refresh parameter to the 3DScene::refresh()
function to force a refresh of all GLVolumes. Currently this hack
is used by the Platter::arrange() function only, and ideally
we should replace this parameter with a smarter 3DScene::refresh()
function, which would check for the transformation matrices as well.
2018-11-21 13:52:46 +01:00
Enrico Turri
ee99fa2c64 Ensure object on bed after deletion of subpart 2018-11-21 12:27:20 +01:00
Enrico Turri
6aa4c0ca16 Fixed translation of volumes 2018-11-21 11:33:31 +01:00
Enrico Turri
86ac9ed91e Small refactoring 2018-11-21 10:36:09 +01:00
bubnikv
18f14482d0 Merge branch 'vb_3dscene_partial_update' 2018-11-20 17:07:31 +01:00
Enrico Turri
bcfff27921 Fixed scaling of multivolumes selection - Added local scale by pressing Alt key while dragging the scale gizmo 2018-11-20 15:39:36 +01:00
Enrico Turri
b961d1011a Fixed rotation of multivolumes selection - Added local rotation by pressing Alt key while dragging the rotate gizmo 2018-11-20 11:57:01 +01:00
tamasmeszaros
f3b7b36d20 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-19 17:59:30 +01:00
Enrico Turri
d322fa0fd5 Fixed gizmos overlay rendering/selection by adding GLGizmoBase::is_selectable() method 2018-11-19 14:46:37 +01:00
tamasmeszaros
0fcdc70327 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-19 12:56:32 +01:00
Vojtech Kral
6629d75853 Cutting 2018-11-18 21:20:47 +01:00
bubnikv
dafa4621aa Merge remote-tracking branch 'remotes/origin/dev_native' into vb_3dscene_partial_update 2018-11-16 18:31:39 +01:00
bubnikv
c9a4c6c73c Partial update of 3D scene (GLVolumes derived from Model and from
the SLAPrintObject).
Updated PrintBase to generate a unique timestamp at each step invalidation.
2018-11-16 18:28:50 +01:00
Enrico Turri
d45739fa15 Keeps objects on bed while scaling them using the scale gizmo 2018-11-16 11:30:36 +01:00
Enrico Turri
ed271d66e6 Fixed object picking when gizmos are rendered on top 2018-11-15 11:38:40 +01:00
YuSanka
caaacb4c4f Added "change position" from modification pane 2018-11-14 16:24:55 +01:00
Enrico Turri
72b5da952d Removed a bunch of obsolete methods 2018-11-14 15:57:11 +01:00
Enrico Turri
4149b9ad28 Snap in gizmo scale 3D when holding Shift pressed 2018-11-14 12:57:12 +01:00
Enrico Turri
3613a54e03 Deletion of instances and volumes from 3D scene 2018-11-14 08:53:56 +01:00
bubnikv
03875e7d71 GLVolume: split composite_id to object_id, volume_id and instance_id.
WIP: Added creation of GLVolumes for SLA supports.
2018-11-13 17:45:44 +01:00
Enrico Turri
22dbcbcd9c Enhanced volumes manipulation - wip 2018-11-12 08:54:22 +01:00
YuSanka
aa3e4c294a Added type "MultipleFullObject" to Selection
+ Fixed updating of the name of the manipulation pane
+ Changed logic of "Ctrl+A" inside the object list
2018-11-08 16:44:58 +01:00
Enrico Turri
9e8e5761a9 Added new query methods to GLCanvas3D::Selection 2018-11-08 12:23:07 +01:00
Enrico Turri
102bc99958 Only one instance enabled when selecting sub parts 2018-11-07 12:11:34 +01:00
Enrico Turri
f4b16bb242 Added new selection states - Select parts/modifiers from first instance only from right panel 2018-11-07 10:34:44 +01:00
Enrico Turri
57c769b63b Selection of modifiers in 3D scene 2018-11-06 15:51:33 +01:00
Enrico Turri
4f0869730a Do not render selection's bounding box when any gizmo is active 2018-11-06 10:31:19 +01:00
Lukas Matena
edceb80b18 Updated function names in GLCanvas3D.cpp (mismatch caused by two conflicting commits yesterday) 2018-11-03 08:46:51 +01:00
Lukas Matena
622f4ee4f6 Flatten gizmo should now work with multiple selection 2018-11-02 15:20:26 +01:00
Enrico Turri
3aad8b5fd2 Translation of ModelVolume as transformation component (without modifying the mesh) 2018-11-02 12:11:28 +01:00
Enrico Turri
7751d991d4 GLCanvas3D::update_gizmos_data() set as private 2018-11-01 15:08:39 +01:00
Enrico Turri
a15bf7cc25 New selection set as default 2018-11-01 10:06:55 +01:00
Enrico Turri
00222226ed Mirror component of transformations set as default 2018-11-01 08:46:44 +01:00
Enrico Turri
503166a6a4 Automatic placement of instance at bed level 2018-10-30 16:03:03 +01:00
Lukas Matena
7681d00ee5 Merged branch 'dev_native' into lm_sla_supports_auto
Added igl library files
2018-10-26 15:45:52 +02:00
Enrico Turri
f651182101 Rendering of camera target (for debug) and modified camera target behavior 2018-10-26 09:50:28 +02:00
Enrico Turri
c00ee0659e Call schedule_background_process() after rotating/scaling/flattening using gizmos 2018-10-25 12:10:35 +02:00
Enrico Turri
78d813cbc9 Tooltip when hovering on gizmo icons 2018-10-25 09:35:08 +02:00
Enrico Turri
68f77f1031 New selection -> Changed selection logic == Use SHIFT for both add to selection and remove from selection 2018-10-22 08:54:04 +02:00
Enrico Turri
5d94e6adb8 New selection -> Improved sychronization of instances selection between 3D scene and right panel 2018-10-19 16:14:55 +02:00
Enrico Turri
fbbe1325b6 Mirror transform components in ModelInstance and GLvolume - WIP and disabled 2018-10-18 15:50:51 +02:00
Enrico Turri
2c9a82e582 New selection -> Removed unneeded methods and small refactor 2018-10-18 15:09:41 +02:00
Enrico Turri
7d1828df05 Object context menu wip / Removed links to settings dialog from user interface / Fixed and unified append_menu_item() function / Fixed File->Open menu item / Fixed Window menu items / Added Plater menu 2018-10-17 12:17:25 +02:00
Enrico Turri
b4a09d3d86 New selection -> Toolbar update 2018-10-16 16:04:19 +02:00
Enrico Turri
af4570741c New selection -> Improved gizmos activation 2018-10-16 14:56:35 +02:00
Enrico Turri
a8c459696f New selection -> Tighter bounding box for selections, tweaks to gizmo flatten and fix of instances update 2018-10-16 13:49:40 +02:00
Enrico Turri
059ab4a05c ModelInstance's full 3D transform set as default 2018-10-16 09:51:30 +02:00
Enrico Turri
27fd49d459 New selection -> Improved gizmo scale rendering and behavior 2018-10-15 13:22:36 +02:00
Enrico Turri
f2486bd87d New selection -> Gizmos methods refactored to accept selection instead of bounding box and scale gizmo in local system for single instance selections 2018-10-15 11:30:50 +02:00
Enrico Turri
76052d33bf New selection -> scaling wip 2018-10-12 15:43:29 +02:00
Enrico Turri
3bccb3b97c Extended interface for selections 2018-10-11 08:26:12 +02:00
YuSanka
30f3ec3d16 Changed mode of the OblectList to Multiple selection 2018-10-10 16:22:20 +02:00
Enrico Turri
3e5e72dafc New selection -> changed calculation of euler angles for multivolume rotations 2018-10-10 13:51:11 +02:00
Enrico Turri
6d33077564 New selection -> synchronization of indirectly selected instances 2018-10-10 11:04:04 +02:00
Vojtech Kral
bd85ca721e Plater & GLCanvas3D: Fix instance_moved event, add event handlers 2018-10-09 17:39:04 +02:00
Enrico Turri
895bdf7918 New selection -> rotation wip 2018-10-09 15:56:34 +02:00
Enrico Turri
9ae6d115a2 New selection -> removed obsolete methods\n+\nFixed a few compile warnings 2018-10-08 15:17:36 +02:00