Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 1f77eb1e54 Fixed Technologies.hpp file 2019-02-04 09:13:28 +01:00
Enrico Turri b919dcc4ab Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-02-01 14:42:55 +01:00
Enrico Turri 016507f4ef Merge branch 'sidebar_fixes' of https://github.com/prusa3d/Slic3r 2019-02-01 14:32:21 +01:00
Enrico Turri fb6ef1d20f Keeps modifier transparent while layer editing tool is enabled 2019-01-31 14:25:11 +01:00
Enrico Turri 8076b39c4b Emulation of kill focus event on object manipulator fields when changing selection into objects list [WIN+LINUX] 2019-01-31 14:12:07 +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 035ef9cb23 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-01-31 13:19:46 +01:00
Enrico Turri 81c621716b User mode-aware toolbar items 2019-01-31 13:19:26 +01:00
Enrico Turri 85f7d28c6f Added call to _set_current() into GLCanvas3D::on_mouse() 2019-01-31 10:50:16 +01:00
Enrico Turri 0a72a4e7ad GLCanvas3D -> added call _set_current() to method accessing GPU memory 2019-01-31 09:15:43 +01:00
Enrico Turri 4b1cc282c8 replace #ifdef _DEBUG with #ifndef NDEBUG 2019-01-31 08:47:23 +01:00
Enrico Turri 3deeab90f3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-30 16:19:59 +01:00
Enrico Turri 168c3010fa Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-30 14:09:18 +01:00
Enrico Turri fd65489c11 Added debug output to test event handling sequence between Objects List and Object Manipulator fields 2019-01-30 12:18:01 +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
Enrico Turri 3aa9435c80 Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-30 10:03:22 +01:00
Enrico Turri 9ff4cb01e2 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-01-30 10:00:57 +01:00
Enrico Turri 19c1fc0b3f Hide slicing results after Delete All command 2019-01-30 10:00:38 +01:00
Enrico Turri 414ea1a86e Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-30 08:27:52 +01:00
Enrico Turri ed71f2ccd7 Fix of #1713 2019-01-29 16:11:53 +01:00
Enrico Turri 803062e787 Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-29 15:11:25 +01:00
Enrico Turri f9ea977d86 Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-29 14:34:13 +01:00
Enrico Turri 15b6b4f239 Fix of #1730 2019-01-29 14:16:31 +01:00
Enrico Turri 39005cc8a0 Added missing include (build on OSX) 2019-01-29 12:09:40 +01:00
Enrico Turri 4776ad786f Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-29 12:09:01 +01:00
Enrico Turri b47355a325 Added limit to zoom in 2019-01-29 12:05:49 +01:00
Enrico Turri a09a9845b5 Fixed compile on OSX 2019-01-29 11:38:51 +01:00
Enrico Turri 83b09bffb7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-29 11:33:55 +01:00
Enrico Turri 14fe55d4b8 Fix of rotations using sidebar fields 2019-01-29 11:26:35 +01:00
Enrico Turri 8e4934d91d Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-29 08:25:45 +01:00
Enrico Turri 6137cc48eb ENABLE_IMPROVED_SIDEBAR_OBJECTS_MANIPULATION set as default 2019-01-28 16:06:44 +01:00
Enrico Turri 1c0bc8a5f3 Fixed synchronization between Objects List and Object manipulator table 2019-01-28 15:50:02 +01:00
Enrico Turri cdd415bb0c Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-01-28 12:49:41 +01:00
Enrico Turri 727884d327 Fixed synchronization of scale/size fields in sidebar for single volume and single full instance selection 2019-01-28 12:49:19 +01:00
Enrico Turri 6f25a933b6 Removed check of max rotation close to zero in GLCanvas3D::Selection::rotate() 2019-01-28 09:59:22 +01:00
Enrico Turri 7c6572025d Fixed bed centering when changing printer with preview active 2019-01-28 09:06:14 +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
Enrico Turri c2d34cea89 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-28 08:38:24 +01:00
Enrico Turri 03f186c002 Merge branch 'objects_centering' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 15:16:33 +01:00
Enrico Turri 9f734a073f Disable active gizmo as soon as the selection is cleared by clicking on the scene out of any object 2019-01-25 14:55:20 +01:00
Enrico Turri 8abae757d3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 13:31:56 +01:00
Enrico Turri 5581830ab8 Fixed import of objects greater than print bed (range (5 < 10000) times) 2019-01-25 13:30:01 +01:00
Enrico Turri 533e1feac3 Fixed import of volumes from .amf 2019-01-25 12:58:55 +01:00
Enrico Turri 9d51348272 Tweak to euler angles euristic 2019-01-25 12:46:45 +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 3b90629d85 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 09:10:26 +01:00
Enrico Turri a8437f3ebb Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 08:43:25 +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
Enrico Turri d086bafb39 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 15:58:40 +01:00
Enrico Turri d82cacf1d8 Removed debug code committed by mistake 2019-01-24 15:57:53 +01:00
Enrico Turri 752a5b25f4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 15:52:28 +01:00
Enrico Turri 43beaf46d8 Deactivate layers editing tool if user selects more than one object 2019-01-24 15:50:06 +01:00
Enrico Turri 0805bce280 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 13:34:37 +01:00
Enrico Turri 8366ac4a07 Fixed output of volumes to .amf files 2019-01-24 13:32:45 +01:00
Enrico Turri 270a57c14c Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 11:38:57 +01:00
Enrico Turri a406a44946 Sidebar object manipulation fields updated on idle event 2019-01-24 11:37:58 +01:00
Enrico Turri 589e8e0f23 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 10:54:21 +01:00
Enrico Turri aea6681adf Fixed visual hints orientation for sidebar rotation fields and single full instance selection 2019-01-24 10:52:48 +01:00
Enrico Turri 9ca9e8dda5 Another iteration on euler angles and instances synchronization 2019-01-24 10:04:39 +01:00
Enrico Turri 9a69305367 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 08:33:14 +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
Enrico Turri 322b954c1c Added model for sl1 bed 2019-01-23 15:52:08 +01:00
Enrico Turri 949eac5576 Fixed conflicts after merge with master 2019-01-23 13:24:05 +01:00
Enrico Turri d5b354c053 Apply anisotropic filtering to bed textures 2019-01-23 12:45:58 +01:00
Enrico Turri 6596ed94f4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-23 11:40:33 +01:00
Enrico Turri fbf5460ac2 Fixed gizmo update when selecting objects using the sidebar table 2019-01-23 11:38:13 +01:00
Enrico Turri cc9cf7f39e Fixed unselected instance synchronization when rotating using rotate gizmo 2019-01-23 11:08:18 +01:00
Enrico Turri f2ec6eb249 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-23 11:03:31 +01:00
Enrico Turri 1ea51aeb2e Euler angles calculated as described in http://www.gregslabaugh.net/publications/euler.pdf 2019-01-23 09:12:22 +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
Enrico Turri f44510c272 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-22 08:32:05 +01:00
Enrico Turri 6107b7fd2f Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-21 15:46:05 +01:00
Enrico Turri 447c95ee6e Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-21 14:44:18 +01:00
Enrico Turri d8d7eac5a9 Fixed conflicts after merge with master 2019-01-21 14:43:57 +01:00
Enrico Turri 412ae2865d Fixed rendering of layer editing texture 2019-01-21 14:41:59 +01:00
Enrico Turri 7de73bb967 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-21 13:03:45 +01:00
Enrico Turri db1428dcae Improved transparent volumes rendering set as default 2019-01-21 12:53:01 +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 a8d407b27e World rotations set as default 2019-01-21 11:55:02 +01:00
Enrico Turri 060fac5e55 Ensure object on bed while scaling set as default 2019-01-21 11:46:06 +01:00
Enrico Turri 25319113f1 Code cleanup 2019-01-21 11:29:45 +01:00
Enrico Turri 4577a49d5a Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-21 11:21:21 +01:00
Enrico Turri cef761e6b6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-21 08:23:43 +01:00
Enrico Turri 1eb01df0c8 Fixed .prusa i/o and split to objects 2019-01-18 16:01:43 +01:00
Enrico Turri ce099e91c7 Fixed .amf i/o 2019-01-18 14:40:10 +01:00
Enrico Turri 80bae6dd98 1st installment of volumes centering fixes (WIP) 2019-01-18 12:52:09 +01:00
Enrico Turri aa7ff0700b Reworked management of bed shape changes (may fix #1671) 2019-01-17 13:21:33 +01:00
Enrico Turri 8146be5510 Added shortcut strings to gizmos and toolbars tooltips 2019-01-16 11:51:30 +01:00
Enrico Turri 52493e1739 Show gizmos and toolbars tooltips when hovering on a disabled item 2019-01-16 11:10:24 +01:00
Enrico Turri 02a22ba991 Fixed convex hull of sla supports 2019-01-16 09:59:25 +01:00
Enrico Turri 4066df2db7 Slightly increased limit for zoom out 2019-01-15 12:59:28 +01:00
Enrico Turri 2f48997a22 Fixed rotation of single volumes inside a rotated instance using rotate gizmo 2019-01-15 12:24:32 +01:00
Enrico Turri 4b55db878a Fixed rotation of single volumes using rotate gizmo 2019-01-15 09:30:12 +01:00
Enrico Turri 2d7a828dad Fix of #1640 2019-01-14 15:37:37 +01:00
Enrico Turri 6094512f8f Fix of #1645 2019-01-14 14:42:21 +01:00
Enrico Turri 01dc8e77ac Generic subparts placed at one of the bottom corners of the world bounding box of the transformed current selected instance (#1517) 2019-01-14 13:29:06 +01:00
Enrico Turri 1ee0f8cc85 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-01-14 09:29:38 +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