Commit Graph

309 Commits

Author SHA1 Message Date
Enrico Turri
fb6ef1d20f Keeps modifier transparent while layer editing tool is enabled 2019-01-31 14:25:11 +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
bubnikv
991632add5 GLCanvas3d::on_render(): if not intialized yet,
Call render directly, so it gets initialized immediately, not from On Idle handler.
2019-01-30 19:48:26 +01:00
bubnikv
ed9a924880 Added missing GL context "Set Current" calls before loading data
into vertex buffers.

Changed behavior of Canvas3D::on_render() to postpone rendering to idle,
as on OSX the paint events happen directly from control updates,
if the control update triggers Canvas3D window rescaling. With this change,
rendering only happens from idle handler consistently.
2019-01-30 19:02:30 +01:00
bubnikv
eec289961a Removed Microsoft specific _DEBUG flag from the Unix systems.
Made condional compilation of assert code based on #ifndef NDEBUG
instead of #ifdef _DEBUG to compile on Unix systems.
2019-01-30 15:27:11 +01:00
YuSanka
5a28693ff4 Updated draw_colored_band() according to the new colors.
+ some code refactoring
2019-01-30 14:45:18 +01:00
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
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
b47355a325 Added limit to zoom in 2019-01-29 12:05:49 +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