Commit Graph

605 Commits

Author SHA1 Message Date
bubnikv
460cf820af Some optimizations of the color print preview. 2019-01-30 12:10:26 +01:00
bubnikv
d30676ceee Merge remote-tracking branch 'remotes/origin/ys_color_print' 2019-01-30 09:29:55 +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
YuSanka
e291172e24 Implemented "Color Print" for preview mode (without re-slicing) 2019-01-29 15:11:29 +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
14fe55d4b8 Fix of rotations using sidebar fields 2019-01-29 11:26:35 +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
bubnikv
3e0ef05386 Merge remote-tracking branch 'remotes/origin/objects_centering' 2019-01-28 10:25:41 +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
bubnikv
66ecdf61ec FIx of the previous commit 2019-01-28 08:53:02 +01:00
bubnikv
bb0cf221bc WIP synchronization of Z rotation of the instances 2019-01-28 08:52:22 +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
bubnikv
241283d956 Merge remote-tracking branch 'remotes/origin/vk-bugfixes' 2019-01-26 13:10:58 +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
bubnikv
708a14c228 Fix of instance synchronization. It seems to be working, but one may
want to review the center of rotation of the instances when rotating
around a general axis (zero component of the rotation axis in the world Z).
2019-01-25 14:56:41 +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
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
bubnikv
dbcf800353 Yet another compilation fix on OSX 2019-01-25 09:57:08 +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
bubnikv
ee87d73916 Fixed compilation on Linux. 2019-01-25 09:06:49 +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
e1abd1256c Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-01-24 19:09:06 +01:00
bubnikv
49487c16e6 Improvements of the triangulation of SLA layer preview. 2019-01-24 19:08: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
bubnikv
5a707a66b9 Adjustment of the offset from the print bed STLs to their textures.
Changed the MK2.5 bed from MK2 to MK3.
2019-01-23 17:24:56 +01:00
YuSanka
8fd6194403 Improved Instance splitting :
- Added icon and context menu for Instance.
- Added multiple selection and splitting for the instances (add new object with selected instances)
2019-01-23 16:12:47 +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
bubnikv
fc97ec9cd9 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-01-23 14:00:23 +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
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
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
3366ce51e5 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-01-21 17:02:40 +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
447c95ee6e Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-21 14:44:18 +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
Lukas Matena
528546b6c8 Place on bed should now correctly process instance mirror and respect transformations on subvolumes 2019-01-21 12:53:57 +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
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
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
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
6094512f8f Fix of #1645 2019-01-14 14:42:21 +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
ad245a0021 Deactivate current gizmo if user delete all objects from the scene 2019-01-10 14:43:07 +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
Enrico Turri
ef446f6930 Fixed orientation of visual hints for sidebar size fields 2019-01-10 10:35:30 +01:00
Enrico Turri
a33b64c9a3 Gizmo shortcuts disabled if selection is empty 2019-01-10 08:37:54 +01:00
bubnikv
a476e4ca0f One more fix of Segfault moving support blocker #1506
Fixed unsafe access to support layers from the G-code preview UI.
2019-01-09 15:07:10 +01:00
Enrico Turri
abc38ebc82 Fixed orientation of visual hints for sidebar scale fields 2019-01-09 10:12:04 +01:00
Enrico Turri
7cf67db332 Uniform scale is sidebar 2019-01-08 15:16:40 +01:00
Enrico Turri
cfff3832dc Force SetFocus on 3D view when mouse enters it also on Mac 2019-01-08 10:06:10 +01:00
Enrico Turri
153c6e7f68 Extended limits in z for camera target movements - Fix of #1589 2019-01-08 09:10:57 +01:00
Enrico Turri
a2bc7e1660 Fix of #1596 2019-01-07 09:15:31 +01:00
Lukas Matena
bdf4d5f41f Fixed a crash when deleting several instances of one object 2019-01-05 08:34:05 +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
360dbca52e Attempt to fix camera movements after importing object 2019-01-03 15:43:03 +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
bubnikv
b7a92b5525 Fix of #1512
"Printer Host Upload Queue vanishes in the background [1.42.0-alpha1]"
the canvas3d used to grab focus when mouse entered a window even
if the top level window was not active. This was now changed and
the top level must be active for the canvas3d to grab the focus.
2019-01-02 17:49:23 +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
Enrico Turri
26959d0cde Partial revert of previous commit 2018-12-21 14:41:47 +01:00
Enrico Turri
8014bc537a Fixed glitches in object position when moving it with background process enabled 2018-12-21 12:42:06 +01:00
Enrico Turri
5006633221 Improved rendering of transparent volumes 2018-12-21 09:56:11 +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
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
d922260b73 Do not clear selection if left-clicking out of objects while shift is down 2018-12-19 11:59:59 +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
d453b6fb3f Sidebar matrix field behavior for single full instance selection 2018-12-18 11:11:06 +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
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
Enrico Turri
3bddf2afff Selection's debug output set as optional 2018-12-13 08:55:19 +01:00
bubnikv
f60a767ed9 Fix of the wipe tower manipulation: 3D scene should maintain selection
status of the wipe tower after the wipe tower is updated.
2018-12-12 14:40:56 +01:00
Enrico Turri
706a9d6ddf Custom bed color 2018-12-12 11:44:17 +01:00
Enrico Turri
ba4c8c1b87 PrusaControl-like background color 2018-12-12 10:38:07 +01:00
Enrico Turri
984b8b79b0 Another fix into GLCanvas3D::Selection::is_single_full_instance() 2018-12-11 10:35:12 +01:00
Enrico Turri
5e077c5edf Fixed GLCanvas3D::Selection::is_single_full_instance() 2018-12-11 09:43:10 +01:00
Enrico Turri
0420d76037 Fixed rotation of volumes contained in rotated instances 2018-12-10 16:09:20 +01:00
Enrico Turri
eb1518bf31 Removed out of bed detection for sla pad 2018-12-10 13:57:43 +01:00
Enrico Turri
1f0c12dd9f Do not show objects' shell in sla preview until pass slaposIndexSlices is completed 2018-12-10 13:27:00 +01:00
Enrico Turri
9e952c9122 Fixed rendering of caps in sla preview 2018-12-10 12:59:49 +01:00
Enrico Turri
31387af176 Fixed camera zoom after object scale 2018-12-10 10:40:57 +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
8fc723b746 Fixed wipe tower translation 2018-12-07 11:24:29 +01:00
Enrico Turri
512677ed73 Fixed typo 2018-12-07 09:01:58 +01:00
Enrico Turri
20cff0f630 Fixed crash when selecting wipe tower 2018-12-07 09:00:17 +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
d6b5ed2063 Fixed OxS compile 2018-12-06 13:09:39 +01:00
Enrico Turri
8d78b23c78 Removal of tabs from plater -> Fixed buttons update when switching between views using keyboard 2018-12-06 12:37:39 +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
609a0e8aa5 Fixed typo into GLCanvas3D::Selection::is_single_full_instance() 2018-12-05 13:55:38 +01:00
YuSanka
adbf1b674b GLVolume : set color from the model volume to correct part rendering on the Scene 2018-12-05 12:11:03 +01:00
Enrico Turri
6997f7f5b5 Fixed crash when deleting sla support points 2018-12-05 10:26:08 +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
bubnikv
96e14b5d3b Fixed Canvas3D update after an object instance is deleted. 2018-12-04 11:35:04 +01:00
Enrico Turri
6c69d0e922 Fixed scene update after select all command 2018-12-04 08:38:31 +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
435163fb73 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-03 13:21:48 +01:00
YuSanka
d522e8ea70 Delete mixed selection 2018-12-03 12:13:57 +01:00
bubnikv
041fae8148 Added the bed texture for SL1 2018-11-30 15:31:47 +01:00
Enrico Turri
1f3b9d0657 Fixed vertical centering of gizmo overlay icons 2018-11-30 13:27:54 +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
Enrico Turri
4e4760bb82 Fixed translation of volumes belonging to scaled instances 2018-11-30 10:59:00 +01:00
Enrico Turri
dca0cb04ea New icons for gizmo overlay 2018-11-30 08:48:32 +01:00
Enrico Turri
bf94751a94 Esc key toggles off current gizmo 2018-11-29 15:33:52 +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
Enrico Turri
0a47bc1c5c SLA slices preview - wip 5 2018-11-28 09:28:07 +01:00
Vojtech Kral
f5080ea7f5 Fix re-entrant render() calls, add an assert to enforce 2018-11-27 16:57:37 +01:00
YuSanka
f203f6fbd9 ColorPrint improvement
+ Select "Color Print" preview type if it's not after add/delete new color change
+ Added level heights to the color legend instead of "Color N"
2018-11-27 16:04:56 +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
bubnikv
3fa099bd1a Fix of SLA support gizmos:
Fix of the Z offset.
Background processing is now not re-triggered during dragging
of a support point.
2018-11-26 19:22:16 +01:00
YuSanka
f8bc7cb959 Implementation of the "ColorPrint" on the 3DScene 2018-11-26 16:28:12 +01:00
Enrico Turri
b153c8cb20 SLA slices preview - wip 2 2018-11-26 16:17:59 +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
bubnikv
ebbce32158 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-26 15:19:58 +01:00
bubnikv
b5c56caf6f Fixed an issue with the SLA Z offset at the end of slicing,
fixed compilation on OSX due to the libigl overriding our "L" localization
macro.
2018-11-26 15:19:42 +01:00
Enrico Turri
4ca302ba6a SLA slices preview - wip 2018-11-26 15:16:35 +01:00
bubnikv
a378bb7bed Removed some obsolete Perl bindings.
Removed libslic3r from the default include paths for all modules but
libslic3r. Now headers from libslic3r need to be included with an
explicit path (libslic3r/libslic3r.h etc)
Split the localization macros into I18N.{cpp,h}
2018-11-26 14:41:58 +01:00
Lukas Matena
d28d4823e0 SLA support points gizmo - multiple instance support 2018-11-26 13:03:03 +01:00
Enrico Turri
63996f5ba1 Fixed update of GLCanvas3D::m_moving member 2018-11-26 11:49:04 +01:00
Vojtech Kral
c29493a41b imgui: Refactor, use in cut gizmo 2018-11-26 11:16:39 +01:00
Enrico Turri
57e9d28a84 Added ImGuiWrapper 2018-11-26 10:57:12 +01:00
Enrico Turri
b94f19eaf4 Added method GLCanvas3D::is_dragging() 2018-11-26 10:41:16 +01:00
Enrico Turri
da0b9b9b75 Generate EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED event after an object has been dragged on scene 2018-11-26 08:36:31 +01:00
Enrico Turri
f838d8cf18 Fixed GLCanvas3D::Selection::_ensure_on_bed() method 2018-11-23 13:20:04 +01:00
tamasmeszaros
746c1d2fd8 SLA support parameters changed: radiuses for diameters. 2018-11-23 13:05:24 +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
tamasmeszaros
a05bda5347 Removed head_back_radius and added pillar widening factor to the parameter layers 2018-11-23 11:51:45 +01:00
Enrico Turri
cabfca1031 Do not select wipe tower when using Select all command 2018-11-23 11:47:18 +01:00
Enrico Turri
bcf7a1f751 Fixed volumes translation (again) 2018-11-23 11:14:32 +01:00
Enrico Turri
66a08be209 Fixed transformations when deleting second-to-last sub-volume of an object 2018-11-23 10:50:25 +01:00
bubnikv
6da9d19916 Fixed lifting of models for SLA above the print if supports
or pad are calculated.
2018-11-23 09:33:01 +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
bubnikv
86c11df554 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-22 13:33:34 +01:00
bubnikv
8d7a34160d Fix of my previous commit. 2018-11-22 13:33:21 +01:00
Enrico Turri
3b3eab2e84 Added member m_sla_shift_z to GLVolume 2018-11-22 13:33:20 +01:00
bubnikv
233c1593f1 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-22 13:20:18 +01:00
bubnikv
a4be8ef6ad Fixed "setting an extruder does not change object's color" 2018-11-22 13:20:13 +01:00
Enrico Turri
200b3d010f Fixed volumes translation 2018-11-22 12:50:54 +01:00
Enrico Turri
cac56154ef Selection updated to detect sla volumes 2018-11-22 12:07:26 +01:00
Enrico Turri
c494dec1c4 Gizmos' shortcut not requiring shift key pressed 2018-11-22 11:13:00 +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
Enrico Turri
d8e7310d72 Gizmo rotate operates always in world reference system 2018-11-21 09:28:27 +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
Enrico Turri
aa22f75829 Forced zoom to bed when changing bed size 2018-11-20 10:36:26 +01:00
Enrico Turri
34cf541e0d Fixed position of newly created modifiers 2018-11-20 10:15:31 +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
ad8c7c9f97 GUI forms with SLA support parameters 2018-11-19 14:15:40 +01:00
Enrico Turri
7cb99f8e27 Added debug error message when missing icons for gizmos 2018-11-19 14:03:28 +01:00
Enrico Turri
dbc9bf5be7 Lift-up of SLA volumes only when at least one volume is generated 2018-11-19 13:04:19 +01:00
tamasmeszaros
0fcdc70327 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-19 12:56:32 +01:00
Enrico Turri
eb4d1e9d5e Shift-up volumes after SLA support volumes creation 2018-11-19 12:20:44 +01:00
Vojtech Kral
6629d75853 Cutting 2018-11-18 21:20:47 +01:00
bubnikv
74ba1eaa16 WIP: Support of SLA suport & pad GLVolumes, couple of fixes. 2018-11-17 17:23:56 +01:00
bubnikv
b59d5d083f WIP: Fixed loading of SLA support meshes. 2018-11-16 18:59:13 +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
9084d64b3b Removed duplicated code 2018-11-16 12:58:43 +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
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
YuSanka
62aa34b444 SpinCtrsl inside Manipulation pane is replaced to TextCtrls
+ Added "proces_enter" mode for TextCtrl (The control will generate the event wxEVT_TEXT_ENTER)
2018-11-14 12:35:15 +01:00
Enrico Turri
a56cee5f60 Gizmos rotate, move and scale rendered on top of geometry 2018-11-14 10:43:52 +01:00
Enrico Turri
3613a54e03 Deletion of instances and volumes from 3D scene 2018-11-14 08:53:56 +01:00
bubnikv
88445f98f0 Fixed forward declaration of enums, made volumes with negative ID
directly unselectable.
2018-11-13 18:44:30 +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
Lukas Matena
df658713bf Wipe tower preview not shown in SLA mode 2018-11-12 15:41:04 +01:00
Enrico Turri
564fa9e4dc Enhanced volumes manipulation 2 (scaling in local system) 2018-11-12 09:54:04 +01:00
Enrico Turri
22dbcbcd9c Enhanced volumes manipulation - wip 2018-11-12 08:54:22 +01:00
YuSanka
2e8f21fff8 Changed toolbar icons for "split to object/part" 2018-11-08 16:44:59 +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
Vojtech Kral
3e4af381c9 Fix rendering performance on macOS 2018-11-08 15:31:29 +01:00
Enrico Turri
e529315ef9 Fixed update of ModelVolume mirror after GLVolume manipulation 2018-11-07 14:51:11 +01:00
Enrico Turri
69208c4f43 Fixed update of ModelVolume scale after GLVolume manipulation 2018-11-07 14:24:10 +01:00
Enrico Turri
92528ebcb3 Fixed update of ModelVolume rotation after GLVolume manipulation 2018-11-07 14:15:04 +01:00
Enrico Turri
b05aa00089 Fixed update of ModelVolume offset after GLVolume manipulation 2018-11-07 14:01:03 +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
Enrico Turri
0810beae77 Reintroduced instances synchronization 2018-11-06 08:47:21 +01:00
Enrico Turri
4b5657b16b Fixed assert in GLCanvas3D::Selection::is_single_full_instance() 2018-11-05 10:54:05 +01:00
Lukas Matena
9442cb99f4 Flatten gizmo now correctly processes both instance and volume transformations 2018-11-05 09:34:04 +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
Lukas Matena
93ef2de667 SLA supports gizmo is only shown in SLA mode 2018-11-02 10:31:57 +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
Lukas Matena
cc27570704 Fixed a crash when moving an object with wipe tower volume on screen 2018-10-31 12:23:26 +01:00
Enrico Turri
da4903a37f New selection -> Disabled instances synchronization 2018-10-31 09:39:43 +01:00
Enrico Turri
503166a6a4 Automatic placement of instance at bed level 2018-10-30 16:03:03 +01:00
Enrico Turri
63960dfde0 Translate entire selection when user clicks and drags on a selected volume 2018-10-30 11:18:15 +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
321322b17a Fixed rendering of warning and legend textures (due to newer wxWidgets) 2018-10-25 15:32:35 +02:00
Enrico Turri
e72a058600 Fixed update of GUI when object is selected by right-clicking on it to show its context menu 2018-10-25 12:36:10 +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
30fe846158 Do not translate selection if user press Shift while selecting and then drags 2018-10-25 11:06:08 +02:00
Enrico Turri
bde5f17d5c Fixed build on Linux and OSx 2018-10-25 10:36:47 +02:00
Enrico Turri
78d813cbc9 Tooltip when hovering on gizmo icons 2018-10-25 09:35:08 +02:00
Enrico Turri
90ecbce9bb Split to objects and Split to parts 2018-10-24 12:55:38 +02:00
bubnikv
bded28f888 WIP: Reconstruction of background processing. 2018-10-23 15:27:31 +02:00
Enrico Turri
9a4a41acbf New selection -> Fixed selection cleanup in GLCanvas3D::reset_volumes() 2018-10-23 11:50:30 +02:00
Enrico Turri
126f0e5073 Added mirroring factors to .amf import/export 2018-10-22 11:45:03 +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
42a77316ba Planes of gizmo flatten visible from both sides 2018-10-19 13:26:42 +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
143c23c54a New selection -> Force volume selection when right clicking to get the object context menu 2018-10-18 08:51:06 +02:00
Enrico Turri
2e274b5646 Plater -> View Menu 2018-10-17 12:59:58 +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
9bb93cc4f4 Added helper functions to extract euler angles from 3d transforms 2018-10-12 12:19:57 +02:00
Enrico Turri
aa0c3bf2e3 Added helper functions to generate 3d transforms 2018-10-12 10:09:16 +02:00
Enrico Turri
6563cff246 New selections -> allow all three rotations for single instance selection 2018-10-11 10:56:25 +02:00
Enrico Turri
bb2000d094 Simplified OpenGL calls 2018-10-11 10:52:50 +02:00
Enrico Turri
3bccb3b97c Extended interface for selections 2018-10-11 08:26:12 +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
99fe5761d8 New selection -> removed obsolete parameters from GLVolumeCollection::load_object() 2018-10-08 16:05:55 +02:00
Enrico Turri
9ae6d115a2 New selection -> removed obsolete methods\n+\nFixed a few compile warnings 2018-10-08 15:17:36 +02:00
Enrico Turri
384cfa0e6d 1st installment of new selections (disabled) 2018-10-08 14:02:12 +02:00
Enrico Turri
04e193011c Fixed crash when selecting object 2018-10-08 09:08:42 +02:00
YuSanka
42fd6bc7b5 Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-10-05 23:39:51 +02:00
YuSanka
ea30385fd0 Completed split of the GUI_ObjectParts 2018-10-05 23:29:15 +02:00
YuSanka
bcedd71e99 Start to Split GUI_ObjectParts:
+ created GUI_ObjectList & GUI_ObjectManipulation classes
2018-10-04 16:43:10 +02:00
Enrico Turri
96745e12d7 Use an unique opengl context 2018-10-04 10:41:11 +02:00
Enrico Turri
b3c09a9254 Fixed object position after loading 2018-10-03 16:18:23 +02:00
Vojtech Kral
83f55b608c Event.hpp: Set event object 2018-10-03 14:07:10 +02:00
Vojtech Kral
770d944283 Replace PerlCallbacks with events in GLCanvas3d et al. 2018-10-03 11:51:47 +02:00
YuSanka
08c6905751 Moved functions and variables (for fonts and labels color) to GUI_App
+ corrected Sidebar layouts
+ deleted get_preset_bundle
+ actions with tabs_list moved to GUI_App
2018-10-01 16:31:36 +02:00
Vojtech Kral
342b584399 WIP: Plater 2018-10-01 09:28:40 +02:00
bubnikv
6260e43f61 Merge remote-tracking branch 'origin/dev2' into dev_native 2018-09-25 15:33:51 +02:00
bubnikv
9a3db200a5 Updated AMF/3MF import to pass configuration into a DynamicPrintConfig
instead of PresetBundle.
2018-09-25 11:53:05 +02:00
bubnikv
20d0f046d2 Merge remote-tracking branch 'origin/dev2' into dev_native 2018-09-20 16:48:40 +02:00
bubnikv
0558b53493 WIP: Moved sources int src/, separated most of the source code from Perl.
The XS was left only for the unit / integration tests, and it links
libslic3r only. No wxWidgets are allowed to be used from Perl starting
from now.
2018-09-19 11:02:24 +02:00