Lukas Matena
023b788777
Merge branch 'master' into lm_sla_supports_auto2
2019-02-19 10:15:16 +01:00
Enrico Turri
e861f5a243
Tech ENABLE_PRINT_BED_MODELS set as default
2019-02-19 10:07:37 +01:00
Enrico Turri
644794233f
Code cleanup
2019-02-18 15:41:12 +01:00
Enrico Turri
8635756b02
Added debug output to investigate further #1788
2019-02-18 15:41:04 +01:00
Enrico Turri
362f6a069c
2nd attempt to fix #1788
2019-02-18 15:40:58 +01:00
Enrico Turri
022b573bae
1st attempt to fix #1788
2019-02-18 15:40:51 +01:00
Lukas Matena
5966dcb78e
SLA gizmo - fixed support points rendering (depth is now correctly accounted for)
2019-02-18 11:59:47 +01:00
bubnikv
09cce95181
Merge branch 'lm_sla_supports_auto2' of https://github.com/prusa3d/Slic3r into lm_sla_supports_auto2
2019-02-17 13:09:16 +01:00
Lukas Matena
ac8f9ab3dc
SLA gizmo improvements
...
- point can be selected
- selection can be deleted, head diameter changed
- dragging of objects is not allowed with the gizmo being on
- added a modal dialog when automatic support generator is triggered
2019-02-11 16:29:03 +01:00
Lukas Matena
0453caf266
SLA gizmo - shift-up and ctrl+a event passing
2019-02-11 08:21:37 +01:00
Lukas Matena
fd4054be7e
First steps on the rectangular selection for the SLA gizmo
2019-02-09 07:19:01 +01:00
YuSanka
f0cee79170
Fix of #1768
2019-02-08 17:36:38 +01:00
Enrico Turri
7662fa9a5b
Temporary disable transparent bed and higher resolution bed textures
2019-02-08 16:45:03 +01:00
Enrico Turri
29137d1b3c
Fixed z offset of printbed models
2019-02-08 10:19:07 +01:00
bubnikv
d0553ece0e
Extended tesselation wrapper for other 3d and 2d point types.
2019-02-08 09:26:48 +01:00
Lukas Matena
4357c80793
SLA gizmo - fixed hiding of objects and instances
2019-02-06 17:27:02 +01:00
Lukas Matena
9fc75d7b34
SLA support points (better backend->frontend synchronization and more)
...
- backend to frontend data synchronization to inform the gizmo that new points have been generated
- fixed the inadvertent cancellation of background processing caused by the SLA gizmo touching frontend data during the process
- inactive instances of the object are hidden when the SLA gizmo is active
- fix of imgui combobox rendering
2019-02-06 15:16:25 +01:00
Enrico Turri
a2478b7faa
Fixed print bed UV mapping
2019-02-06 15:11:58 +01:00
Enrico Turri
8100f562da
Selection of bed texture resolution in dependence of graphic card capabilities
2019-02-06 14:55:36 +01:00
YuSanka
b2410e0f23
Merge remote-tracking branch 'origin/master' into ys_hdpi
2019-02-06 11:12:44 +01:00
bubnikv
d31cb98fe9
Merge remote-tracking branch 'remotes/origin/master' into lm_sla_supports_auto2
2019-02-06 11:11:51 +01:00
bubnikv
6ef9c23d19
Merge branch 'master' into lm_sla_supports_auto2
2019-02-06 11:10:18 +01:00
YuSanka
3c83fa17cc
Fixed a scale for the LegendTexture in a Preview
2019-02-06 10:55:11 +01:00
bubnikv
72d85261fb
Fix of mouse wheel scrolling over the variable layer height bar
...
with OSX Retina rendering.
2019-02-06 08:44:06 +01:00
bubnikv
3dc6e266ed
Updated GLCanvas3D to use the tesselator through libslic3r
2019-02-05 19:45:52 +01:00
Enrico Turri
ee64ad8d1f
Fixed OpenGL assert on MESA OpenGL driver due to anisotropic texture filtering not supported
2019-02-05 14:02:48 +01:00
Enrico Turri
a35b1a1850
Fix of #1772
2019-02-05 10:18:40 +01:00
bubnikv
5207d31df1
WIP: HiDPI support - 3D scene on Windows / Linux
...
HiDPI support on Windows - enabled in manifest.
2019-02-04 21:41:10 +01:00
Enrico Turri
b3c3881282
Calls to GLCanvas3D::_set_current() made only after the canvas has been initialized
2019-02-04 16:05:54 +01:00
bubnikv
b8d6c6bbb2
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-02-04 15:46:20 +01:00
bubnikv
ac007d4173
Platform independent delete menus
2019-02-04 15:46:12 +01:00
Enrico Turri
e43e89d495
Code cleanup
2019-02-04 15:25:22 +01:00
bubnikv
f42ce8c84a
Ctrl+A is handled differently on OSX than on Windows / Linux by wxWidgets
2019-02-04 15:12:24 +01:00
Lukas Matena
9dff44a8ad
SLA support gizmo does not use Grabber class anymore
2019-02-04 12:33:59 +01:00
Enrico Turri
5136ffa94b
2nd attempt to fix SPE-807
2019-02-04 12:27:44 +01:00
Enrico Turri
c31a648bf7
1st attempt to fix SPE-807
2019-02-04 10:06:15 +01:00
Enrico Turri
fe7806c7f0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes
2019-02-04 09:55:48 +01:00
bubnikv
7c5d94e0b1
Don't capture Cmd+A on OSX in Canvas, it works throug the menu accelerators.
2019-02-04 09:37:49 +01:00
Lukas Matena
d32d0a7636
Merge branch 'master' into lm_sla_supports_auto2
2019-02-04 08:41:00 +01:00
Lukas Matena
d154e75ad7
Merge branch 'master' into lm_sla_supports_auto2
2019-02-04 08:40:20 +01:00
Enrico Turri
9b9d35d90d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes
2019-02-04 08:36:28 +01:00
bubnikv
d0b1b3b3de
Trying to convince OSX that we want the Control key to behave as Command
...
key when accessing OSX machine over VNC from a PC.
2019-02-03 17:57:55 +01:00
bubnikv
14a623f50e
Removed GLCanvas3D::on_key_down() handler, as it is replaced
...
by the on_char() handler.
2019-02-03 14:11:09 +01:00
bubnikv
0c1f750cba
The accelerators Ctrl+A, Ctrl+Del and Del were incorrectly captured
...
globally by being defined in the Edit menu.
These accelerators are now suppressed in the menu (shown on Windows
but inactive, not shown on OSX / Linux),
and they are now captured by the 3D scene widget instead.
Fix of ctrl-A doesn't work well #1753
2019-02-03 14:06:13 +01:00
bubnikv
5deb8fcc65
Suppressed the "Split to volumes" button in simple mode.
2019-02-03 11:15:26 +01:00
bubnikv
f050d91239
OSX specific: The Command short keys over the 3D scene toolbars
...
are now shown with the OSX "Command" symbols, not as "Ctrl+"
2019-02-03 11:10:25 +01:00
Lukas Matena
f568f93f08
More SLA support points improvements
...
- unselected objects are hidden when SLA gizmo is active
- support volumes are hidden when editing mode is active
- 3mf support points format versioning
2019-02-01 23:09:02 +01:00
Enrico Turri
e00fb7ba43
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes
2019-02-01 15:14:19 +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
8f87ae5ca9
Added other debug output to investigate SPE-807
2019-02-01 13:15:24 +01:00
Enrico Turri
3e7f76b578
Added debug output to investigate SPE-807
2019-02-01 11:54:18 +01:00
Lukas Matena
21026ec9a8
SLA support points improvements
...
- semi-intelligent algorithm to place support points
- enhanced ImGui dialog with editing/non-editing mode
- support points can have different head diameter (only implemented in GUI so far)
- autogenerated points supporting emerging islands are annotated and the info is kept
2019-02-01 07:13:08 +01:00
Enrico Turri
fb6ef1d20f
Keeps modifier transparent while layer editing tool is enabled
2019-01-31 14:25:11 +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
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
Enrico Turri
3deeab90f3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-30 16:19:59 +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
Enrico Turri
883e09fbcd
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-30 12:16:49 +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
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