Commit Graph

309 Commits

Author SHA1 Message Date
c32c45deef Keeps modifier transparent while layer editing tool is enabled 2019-01-31 14:25:11 +01:00
736ef3373e Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-01-31 13:19:46 +01:00
0fd82f7fa0 User mode-aware toolbar items 2019-01-31 13:19:26 +01:00
c5279c3ee6 Added call to _set_current() into GLCanvas3D::on_mouse() 2019-01-31 10:50:16 +01:00
ec7dff8b81 GLCanvas3D -> added call _set_current() to method accessing GPU memory 2019-01-31 09:15:43 +01:00
9df8de0f14 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
5153261a8b 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
e3c0315865 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
e8e8e7e9c5 Updated draw_colored_band() according to the new colors.
+ some code refactoring
2019-01-30 14:45:18 +01:00
dd0d976adb Some optimizations of the color print preview. 2019-01-30 12:10:26 +01:00
26f0f40931 Merge remote-tracking branch 'remotes/origin/ys_color_print' 2019-01-30 09:29:55 +01:00
1148a7dc32 Fix of #1713 2019-01-29 16:11:53 +01:00
d28cecf6c5 Implemented "Color Print" for preview mode (without re-slicing) 2019-01-29 15:11:29 +01:00
81e25e17fa Added limit to zoom in 2019-01-29 12:05:49 +01:00
3e7cec0ce5 Merge remote-tracking branch 'remotes/origin/objects_centering' 2019-01-28 10:25:41 +01:00
dacf325a7f Removed check of max rotation close to zero in GLCanvas3D::Selection::rotate() 2019-01-28 09:59:22 +01:00
836ffee857 Fixed bed centering when changing printer with preview active 2019-01-28 09:06:14 +01:00
0f02b2fb1e Merge branch 'objects_centering' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-28 08:53:46 +01:00
3e61749d06 FIx of the previous commit 2019-01-28 08:53:02 +01:00
8bf692a640 WIP synchronization of Z rotation of the instances 2019-01-28 08:52:22 +01:00
d611694d77 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-28 08:38:24 +01:00
00034eb470 Merge remote-tracking branch 'remotes/origin/vk-bugfixes' 2019-01-26 13:10:58 +01:00
ccc55bf320 Merge branch 'objects_centering' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 15:16:33 +01:00
446ec58d05 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
763c6d44c9 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
f54eef959d Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 11:50:34 +01:00
7a0f9f63d5 Free camera rotation for sla printer 2019-01-25 11:35:28 +01:00
5f495362c8 Yet another compilation fix on OSX 2019-01-25 09:57:08 +01:00
ee238f2bb4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 09:10:26 +01:00
df8bcf84dd Fixed compilation on Linux. 2019-01-25 09:06:49 +01:00
63015c6a4a Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 08:29:15 +01:00
b34b1366f5 Mac: Retina OpenGL: Fix imgui windows, right-click menu, misc 2019-01-24 20:03:12 +01:00
7bd509fc6d Mac: Retina OpenGL: Fix ImGui font switch, dynamic switching, toolbar fixes 2019-01-24 20:03:12 +01:00
baf609a149 Mac: Implement Retina for the 3D scene, fix #97 2019-01-24 20:03:12 +01:00
8991eb4201 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-01-24 19:09:06 +01:00
9341ac5584 Improvements of the triangulation of SLA layer preview. 2019-01-24 19:08:58 +01:00
e32e54d9a2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 10:54:21 +01:00
764ef84971 Fixed visual hints orientation for sidebar rotation fields and single full instance selection 2019-01-24 10:52:48 +01:00
98c34827f3 Another iteration on euler angles and instances synchronization 2019-01-24 10:04:39 +01:00
c2b7b6bdf0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 08:33:14 +01:00
47234d6704 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
707078b48d 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
725cd3c55c Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-23 15:56:46 +01:00
eccce89204 Added model for sl1 bed 2019-01-23 15:52:08 +01:00
7eb28c6a3b Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-01-23 14:00:23 +01:00
bd4108cd5c 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
d3d79e58a8 Fixed conflicts after merge with master 2019-01-23 13:24:05 +01:00
f5dcf161a9 Apply anisotropic filtering to bed textures 2019-01-23 12:45:58 +01:00
4dd8616c17 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-23 11:40:33 +01:00
0162fdd352 Fixed gizmo update when selecting objects using the sidebar table 2019-01-23 11:38:13 +01:00