Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 84632d32ba Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-05-21 08:23:53 +02:00
Enrico Turri b0200c04ae Fixed debug technology ENABLE_RENDER_SELECTION_CENTER 2019-05-20 15:59:54 +02:00
Enrico Turri 951f9c1dab Reset tooltip in objects list when no item is hovered 2019-05-20 13:52:58 +02:00
Enrico Turri 0132313ee0 Fixed position of instances after paste object 2019-05-20 10:33:49 +02:00
Enrico Turri 7bb79062e6 Ctrl+Shift+S in place of Ctrl+Alt+S for command Save Project as on Mac 2019-05-20 10:02:51 +02:00
Enrico Turri 783a527109 Added imgui debug dialog for camera statistics 2019-05-20 09:39:57 +02:00
Enrico Turri c5e4ada75b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-05-20 08:28:34 +02:00
Enrico Turri 64bd392e7d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-05-17 15:14:08 +02:00
Enrico Turri e354a306e6 Fixed delayed update of 3D scene when moving preview layers' slider (as reported in #1250) 2019-05-17 15:04:06 +02:00
Enrico Turri a098f118b6 Follow-up of c62006048f -> Notify Windows only when the its registry is changed 2019-05-17 11:35:35 +02:00
Enrico Turri 8c6304688d Camera refactoring: Frustrum calculations moved into Camera class 2019-05-16 15:54:11 +02:00
Enrico Turri 8e31668704 Fixed method Vec3d Camera::get_position() const 2019-05-16 12:06:02 +02:00
Enrico Turri 0298e9077f Fix build of d0fd8a4a29 on OsX and Linux 2019-05-15 14:55:51 +02:00
Enrico Turri d0fd8a4a29 Follow-up of f54fd10897 -> Project name stored with no extension, updated after drag and drop of .3mf or .amf files and used by export g-code and send g-code commands 2019-05-15 14:09:16 +02:00
Enrico Turri 64d4e7cd0c Follow-up of 8ae1dfd4d0 -> Fixed build on OsX 2019-05-15 10:59:00 +02:00
Enrico Turri 8ae1dfd4d0 File->Open Project allows to load .amf files 2019-05-15 10:23:02 +02:00
Enrico Turri bdd9ed123a Updated keyboard shortcuts dialog 2019-05-14 15:16:37 +02:00
Enrico Turri f54fd10897 Implementation of File->New project menu item 2019-05-14 15:00:24 +02:00
Enrico Turri 5f6c7853d4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-14 11:57:48 +02:00
Enrico Turri 14c4469cbf Added Esc shortcut and menu item for command deselect all 2019-05-14 11:57:39 +02:00
Enrico Turri c4c292168d Merge branch 'et_copy_and_paste' of https://github.com/prusa3d/PrusaSlicer 2019-05-14 10:31:56 +02:00
Enrico Turri 016c5f6557 Added placeholder for File->New Project menu item 2019-05-14 10:30:14 +02:00
Enrico Turri 979b66f231 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_copy_and_paste 2019-05-14 09:07:53 +02:00
Enrico Turri 9ba8cb502e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_copy_and_paste 2019-05-13 14:18:34 +02:00
Enrico Turri 9b8323389e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_copy_and_paste 2019-05-13 11:59:29 +02:00
Enrico Turri f55e494899 Constrained gizmo-scaling -> Fixed grabbers offsets transformation for volumes 2019-05-13 09:02:33 +02:00
Enrico Turri 9a16af5251 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-05-13 08:30:30 +02:00
Enrico Turri e785709b91 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-05-10 15:22:00 +02:00
Enrico Turri 6a0885002f Added Cancel button to the confirm delete all dialog to enable dismiss the dialog using esc key 2019-05-10 15:20:46 +02:00
Enrico Turri 11c7accabf Constrained gizmo-scaling -> small refactoring 2019-05-10 14:44:10 +02:00
Enrico Turri 38e8f345f5 Constrained gizmo-scaling -> fixed offset for uniform scale 2019-05-10 14:04:43 +02:00
Enrico Turri 3432218e8b Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-05-10 13:50:46 +02:00
Enrico Turri efcc38f717 Constrained gizmo-scaling -> keep initial ctrl key status while dragging 2019-05-10 13:50:25 +02:00
Enrico Turri 86d466688b Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-05-10 13:08:19 +02:00
Enrico Turri d69c98b48d Constrained gizmo-scaling -> code cleanup and simplification 2019-05-10 13:07:59 +02:00
Enrico Turri b55c60125c Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-05-10 11:45:10 +02:00
Enrico Turri baa8bace8d Removed duplicated line 2019-05-10 11:44:47 +02:00
Enrico Turri f0da19446b Merge branch 'lm_arrange_wipe_tower' of https://github.com/prusa3d/Slic3r 2019-05-10 11:14:42 +02:00
Enrico Turri 128da453d5 1st installment of constrained gizmo-scaling 2019-05-10 11:13:55 +02:00
Enrico Turri 244d0e3ecf Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-05-10 10:58:35 +02:00
Enrico Turri 769f0144c2 Follow-up of 14925af62872c11be9ef638edd95457dd51fb70f -> Fixed detection of sla supports out of bed 2019-05-10 10:43:49 +02:00
Enrico Turri efd429ea46 Detection of sla supports out of printbed in Preview and when sla gizmo is active 2019-05-10 10:43:39 +02:00
Enrico Turri ca70901104 Fixed conflicts after merge with master 2019-05-10 08:31:54 +02:00
Enrico Turri 39946ce28c Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-05-09 11:49:23 +02:00
Enrico Turri cc98c9bbe2 Fixed disappearing visual hints when the user presses the ENTER key while editing one of the object manipulators fields 2019-05-09 11:43:28 +02:00
Enrico Turri ec57a7f971 Fixed current gizmo not turning off when removing last object from selection by ctrl + click and using selection rectangle 2019-05-09 10:09:33 +02:00
Enrico Turri 2ce0c575f6 Fixed objects rendering when turning off sla supports gizmo 2019-05-07 15:37:41 +02:00
Enrico Turri 61a0ab4280 Workaround to fix crash reported in #2209 2019-05-07 15:09:15 +02:00
Enrico Turri 69f81120e0 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-05-06 08:22:37 +02:00
Enrico Turri c62006048f Associate 3mf files on Windows 2019-05-03 15:50:05 +02:00
Enrico Turri d971c821b7 Merge branch 'et_selection_rectangle' of https://github.com/prusa3d/Slic3r 2019-05-03 11:44:37 +02:00
Enrico Turri bf30ec439f Fixed file extension when using option --export-amf in command line 2019-05-03 11:43:48 +02:00
Enrico Turri 47f27d20f1 Added confirmation dialog for Delete All command 2019-05-02 13:52:13 +02:00
Enrico Turri a3385278e5 Export to STL of SLA supports and pad 2019-05-02 13:46:39 +02:00
Enrico Turri 4a5992ba6e Top toolbar use layers_white.svg icon for layers editing 2019-04-30 15:43:19 +02:00
Enrico Turri e06e99cd20 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-30 15:12:40 +02:00
Enrico Turri 3a5485a179 Flip X mouse deltas if bed is upside down (when camera up vector has negative Z) 2019-04-30 15:09:25 +02:00
Enrico Turri 2a741bf8f8 Rectangle selection -> Lighter color for deselect hover 2019-04-29 10:01:28 +02:00
Enrico Turri a4bd98070e Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-29 10:01:01 +02:00
Enrico Turri 6ec9d6ba3f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-29 09:02:50 +02:00
Enrico Turri 2c9e3819c1 Darker colors for axes arrows, transformation visual hints and gizmo grabbers 2019-04-29 09:02:04 +02:00
Enrico Turri dfe2719656 Rectangle selection -> Min size of rectangle selection set to 1 pixel 2019-04-29 08:31:32 +02:00
Enrico Turri fdf1b8af81 Rectangle selection -> Removed cursor change 2019-04-29 08:26:08 +02:00
Enrico Turri 818f7ad647 Rectangle selection in 3D scene -> Fixed selection cleared when mouse left-up follows shift-up 2019-04-26 14:07:46 +02:00
Enrico Turri 049d4ba335 Another synch with branch et_selection_rectangle 2019-04-26 14:07:05 +02:00
Enrico Turri e3b5885a3c Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-26 13:39:52 +02:00
Enrico Turri 18db983900 Synch with branch et_selection_rectangle 2019-04-26 13:39:33 +02:00
Enrico Turri 6f273bef7f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-26 13:38:34 +02:00
Enrico Turri 8857d556f6 Rectangle selection in 3D scene -> tweaks to hovering detection and selection update logic 2019-04-26 13:37:34 +02:00
Enrico Turri c850fb434b Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-26 12:41:56 +02:00
Enrico Turri 92aab039d2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-26 12:41:32 +02:00
Enrico Turri 661222dab8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-26 08:03:26 +02:00
Enrico Turri 07d8fe6f11 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-26 08:03:10 +02:00
Enrico Turri 36252a42da Small optimization 2019-04-25 15:08:14 +02:00
Enrico Turri 905673f344 Small refactoring 2019-04-25 13:41:00 +02:00
Enrico Turri 748a4438ba Attempt to fix build on Linux 2019-04-25 13:35:24 +02:00
Enrico Turri f52f0f3634 Disabled debug imgui dialog for render statistics 2019-04-25 12:33:27 +02:00
Enrico Turri a0640d2d24 Rectangle selection in 3D scene -> selection update 2019-04-25 12:31:55 +02:00
Enrico Turri 2c077a6b18 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-25 11:51:54 +02:00
Enrico Turri 16ef4731e7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-25 11:51:23 +02:00
Enrico Turri 3fba850793 Rectangle selection in 3D scene -> tweaks to the hovering detection logic 2019-04-25 11:50:30 +02:00
Enrico Turri d2597482e0 Added imgui debug dialog for render statistics 2019-04-25 11:10:01 +02:00
Enrico Turri d2d06c9f73 Rectangle selection in 3D scene -> refactored GLVolume member varialbe for hovering 2019-04-25 10:21:24 +02:00
Enrico Turri 5cfa164776 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-25 09:58:41 +02:00
Enrico Turri 51e1f5cd97 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-25 09:58:15 +02:00
Enrico Turri 11490dfb06 Rectangle selection in 3D scene -> hovering detection 2019-04-25 09:46:26 +02:00
Enrico Turri ec2f319a3d Rectangle selection in 3D scene -> rendering 2019-04-25 09:10:03 +02:00
Enrico Turri b557336fa6 Fixed conflicts after merge with master 2019-04-25 08:12:48 +02:00
Enrico Turri 771ab50466 Fixed conflicts after merge with master 2019-04-25 08:09:22 +02:00
Enrico Turri 06fa70147c Code cleanup 2019-04-25 08:06:07 +02:00
Enrico Turri 8b77a4c717 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-24 16:08:08 +02:00
Enrico Turri e3f396a14f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-24 16:07:35 +02:00
Enrico Turri 9d070410c2 Refactoring of GLSelectionRectangle 2019-04-24 16:01:27 +02:00
Enrico Turri d79a2b8d2d GLCanvas3D -> added support for cursor change and change cursor when using SLA support gizmo rectangle selection 2019-04-24 15:43:52 +02:00
Enrico Turri 9710140948 int GLCanvas3D::m_hover_volume_id replaced with std::vector<int> GLCanvas3D::m_hover_volume_idxs 2019-04-24 15:07:28 +02:00
Enrico Turri fc67f44bea Fixed typo 2019-04-24 13:43:39 +02:00
Enrico Turri 49dff105bd Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-24 08:17:33 +02:00
Enrico Turri 8ace8f4294 Picking using rectangle selection WIP 4 -> Prototype for selection update 2019-04-23 15:08:18 +02:00
Enrico Turri a6ba6865bb Picking using rectangle selection WIP 3 -> Use parallel_for to extract data from the framebuffer copy 2019-04-23 12:07:35 +02:00
Enrico Turri 43ad9ff8b7 Picking using rectangle selection WIP 2 2019-04-23 10:45:41 +02:00