Commit Graph

558 Commits

Author SHA1 Message Date
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
YuSanka
054d202817 Correct mixed_selection updating from 3dScene to ObjectList 2018-11-30 11:22:06 +01:00
YuSanka
4bb771683d Fixed assert message after wxAutoBufferedPaintDC and warnings in 2DBed.cpp 2018-11-30 11:22:06 +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
tamasmeszaros
6c99837a9d Quick fix for broken MacOS build 2018-11-29 18:33:30 +01:00
tamasmeszaros
55d62b8295 Fix for empty or broken png output.
Fix for instance transformation order error and state invalidation issues with rasterization.
2018-11-29 18:12:40 +01:00
Enrico Turri
bf94751a94 Esc key toggles off current gizmo 2018-11-29 15:33:52 +01:00
Enrico Turri
42b70c4933 Modified gizmo rotate rendering 2018-11-29 15:10:11 +01:00
YuSanka
d7f9e86400 Update additional object setting after print technology changing 2018-11-29 15:01:20 +01:00
tamasmeszaros
38733ff56a Merge branch 'tm_sla_supports_backend' 2018-11-29 13:34:48 +01:00
YuSanka
2add733caa Suppress change preset to SLA if we have multi-part object 2018-11-29 12:35:07 +01:00
Vojtech Kral
be9ba936e9 Cut: Sanitize Z when switching selections 2018-11-29 12:22:06 +01:00
tamasmeszaros
980c53970b merge tm_sla_supports_backend with master, reapply fix for index slice invalidation, fix for autorotation z offset 2018-11-29 11:45:02 +01:00
Enrico Turri
ef1d43c711 SLA slices preview - improved performances 2018-11-29 11:11:39 +01:00
tamasmeszaros
8fbfad275c Reordered scene reload to prevent race conditions.
Also extended progress status bar to support status value -1 for pulsing.
2018-11-29 10:57:06 +01:00
Enrico Turri
7913060869 Added zoom in/out using keys [i]/[o] 2018-11-29 09:03:38 +01:00
Vojtech Kral
18c95c404c Fix wxNotebook event incontinence 2018-11-28 19:26:48 +01:00
Enrico Turri
19c47afb7b Fixed size of gizmo scale grabbers 2018-11-28 16:09:04 +01:00
YuSanka
c010e14460 Suppress ColorPrint for the multi-material printing 2018-11-28 16:03:25 +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
Lukas Matena
ebac4c7eb8 Place on bed gizmo disabled for individual object parts 2018-11-28 12:08:25 +01:00
Lukas Matena
5813ec08c9 Place on bed planes recalculation after individual volumes are manipulated 2018-11-28 11:37:41 +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
Vojtech Kral
0bdbd3ee63 imgui: Use OpenGL 2.0 2018-11-27 16:57:37 +01:00
Vojtech Kral
21cb489077 WIP: imgui: Fix GLSL version enumeration 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
4c8f3f6ea7 SLA slices preview - wip 4 2018-11-27 15:36:31 +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
Vojtech Kral
d0b6beaaaa One more fix of ENABLE_IMGUI 2018-11-27 12:00:44 +01:00
Vojtech Kral
2585e3103d imgui: Fix ENABLE_IMGUI, disable on OS X for now 2018-11-27 11:28:19 +01:00
YuSanka
db4ceaa5fa DoubleSlider improvement
+ added thicks selection by mouse in the DoubleSlider
 + Click on the Unlock icon on DoubleSlider => set Min and Max slider values
2018-11-27 11:13:00 +01:00
tamasmeszaros
3f0ea223d1 Speeding up the auto rotation algorithm (decreasing accuracy) 2018-11-27 11:09:25 +01:00
bubnikv
85e81a2a21 SLA support points gizmo: Limit manipulation to an active instance
(the first instance selected), show the points on other instances
grayed out.
2018-11-26 20:39:18 +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
Vojtech Kral
3b20d03e1d Cut: Preserve Z-rotation, fix upper part mesh position,
perform custom placing instead of arrange()
2018-11-26 17:09:37 +01:00
Lukas Matena
21a1106776 SLA support points are rendered with regard to sla_shift_z 2018-11-26 16:32:42 +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
9f2fdfabb9 Lay flat gizmo should work correctly with multiple instances and modifier meshes 2018-11-26 13:03:03 +01:00
Lukas Matena
d28d4823e0 SLA support points gizmo - multiple instance support 2018-11-26 13:03:03 +01:00
Enrico Turri
e038c3a20d Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-11-26 12:11:37 +01:00
Vojtech Kral
25f4f1fe55 Cut: Use world coordinates 2018-11-26 12:08:10 +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
Vojtech Kral
763b443459 imgui: Update 2018-11-26 10:57:14 +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
bubnikv
9258ca8cc6 Further removal of the 3DScene / GLCanvas3DManager scaffold. 2018-11-23 17:15:17 +01:00
Enrico Turri
aaab549cfa Partial cleanup of obsolete methods 2018-11-23 15:05:43 +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
YuSanka
4575443c4c Fixed bug with last solid part deleting
+ fixed building
+ deleted last ";" from the settings digest
2018-11-23 11:57:04 +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
tamasmeszaros
45b51bd40e remove + shortcut from 'optimize rotation' menuitem 2018-11-23 09:56:49 +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
tamasmeszaros
d28b61f8a3 Adding checkbox for disabling support generation (still having pad generation) 2018-11-22 18:02:05 +01:00
tamasmeszaros
7efadfae1c Merge branch 'tm_sla_supports_backend' 2018-11-22 16:12:22 +01:00
YuSanka
421fbe3a3c Fixed updating of the value for "Post processing scripts" field 2018-11-22 16:09:28 +01:00
YuSanka
9d7b4ce41d Position(Displacement)/Rotation/Scale for group selection 2018-11-22 16:09:28 +01:00
YuSanka
7041e2b877 Hide "Extruder" column for the SLA printing 2018-11-22 16:09:28 +01:00
tamasmeszaros
c7434a492b Available object menu item: optimize orientation 2018-11-22 16:04:21 +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
bubnikv
94b1183843 Synchronize SLA background processing on UI change, so that
the supports disappear if invalidated.
2018-11-22 12:42:17 +01:00
Enrico Turri
cac56154ef Selection updated to detect sla volumes 2018-11-22 12:07:26 +01:00
Enrico Turri
e247b532fb Added Edit -> Delete all menu item 2018-11-22 11:31:53 +01:00
Enrico Turri
c494dec1c4 Gizmos' shortcut not requiring shift key pressed 2018-11-22 11:13:00 +01:00
YuSanka
7b9f498410 Changed the object context menu in the object list for SLA print technology
+ changed list of the options for "Add settings"
2018-11-22 11:06:07 +01:00
Enrico Turri
343335dbc3 Different colors for SLA support and pad geometry 2018-11-22 11:01:57 +01:00
Enrico Turri
c60ed7bc07 Added shortcuts for gizmos 2018-11-22 10:14:31 +01:00
bubnikv
487ccdd2be Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-21 17:35:58 +01:00
bubnikv
314f7dc674 WIP: Synchronization of SLA background processing. 2018-11-21 17:35:35 +01:00
Enrico Turri
a27e238ced Use Del as shortcut for Edit/Delete selected 2018-11-21 16:00:20 +01:00
Enrico Turri
3e939a7496 Added menu Edit -> Delete selected 2018-11-21 15:47:41 +01:00
Enrico Turri
681beeadf6 Added menu Edit -> Select all 2018-11-21 15:28:35 +01:00
YuSanka
c6b597b813 Fixed updating of the options values after the clearing of the TextCtrl 2018-11-21 15:05:18 +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
bubnikv
bc9de8956a Removed the unused force_autocenter parameter from Plater::update() 2018-11-21 13:32:24 +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
tamasmeszaros
87b96f4c09 trying to fix broken arrange on master 2018-11-21 11:09:14 +01:00
tamasmeszaros
2fffb0c2ff Arrangement is still not working, update is probably broken. 2018-11-21 11:07:08 +01:00
Enrico Turri
86ac9ed91e Small refactoring 2018-11-21 10:36:09 +01:00
Enrico Turri
302b37dcd1 Adjusted main shortcuts 2018-11-21 10:21:12 +01:00
Enrico Turri
37b5cb9a4d Update transformation values in sidebar for single volume/modifier selection 2018-11-21 09:45:43 +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
bubnikv
8107ff4f86 Merge remote-tracking branch 'origin/tm_sla_supports_backend' into vb_3dscene_partial_update 2018-11-20 17:05:45 +01:00
bubnikv
22a7afabba Renamed PrintBase::Status to SlicingStatusEvent
Hopefully it will fix compilation on Linux (some forgotten Status macro?)
2018-11-20 16:27:30 +01:00
tamasmeszaros
013e068d71 Merge remote-tracking branch 'origin/vb_3dscene_partial_update' into tm_sla_supports_backend 2018-11-20 16:16:23 +01:00
tamasmeszaros
d27e22c2c3 height level mismatches seems to be fixed. 2018-11-20 16:12:04 +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
bubnikv
0ec37ae038 Fixed missing wxEvent type on GCC, fixed some compiler warnings. 2018-11-20 15:01:32 +01:00
YuSanka
48e0e1078b Changed output for "Used filament", "Cost" and "Estimated printed time" inside the Sliced info pane 2018-11-20 13:32:36 +01:00
bubnikv
e3b858c45f Merge remote-tracking branch 'origin/tm_sla_supports_backend' into vb_3dscene_partial_update 2018-11-20 13:23:12 +01:00
bubnikv
bed3eed3d2 The slicing progress message can now trigger refresh of the 3D scene. 2018-11-20 13:22:26 +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
tamasmeszaros
87d49cf82f Adding object elevation param.
Quick attempt to build with MinGW 7.3. Successful compile, failed linking
2018-11-19 17:58:08 +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
YuSanka
d658d918d7 Fixed crashing when project with modifier is imported 2018-11-19 14:05:29 +01:00
YuSanka
398f15d546 Some code rebase 2018-11-19 14:05:29 +01:00
YuSanka
703f367e69 Fixed preset updating 2018-11-19 14:05:29 +01:00
YuSanka
ae4f116b46 Added the context to the TabPrintSLA 2018-11-19 14:05:29 +01:00
YuSanka
2fa055903f "SLA Print Settings" implementation (start) 2018-11-19 14:05:29 +01:00
Enrico Turri
7cb99f8e27 Added debug error message when missing icons for gizmos 2018-11-19 14:03:28 +01:00
tamasmeszaros
a00e767fd2 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-19 13:53:27 +01:00
Vojtech Kral
ee33f0f1d7 Add missing icons 2018-11-19 13:51:43 +01:00
tamasmeszaros
35bbe89251 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-19 13:11:03 +01:00
Vojtech Kral
60563e6702 Plater: Revert usage of panel_gizmo_widgets for now 2018-11-19 13:05:10 +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
b1228537d2 Plater: Fix on_notebook_changed 2018-11-19 12:00:37 +01:00
Vojtech Kral
b950e9e575 Fix build 2018-11-19 11:39:17 +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
6981152d74 fixed src/slic3r/GUI/3DScene.hpp:522:30: error:
extra qualification on member 'load_object_auxiliary'
2018-11-16 18:45: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
417783a469 View menu items enabled only when Plater is the current active tab 2018-11-16 12:31:06 +01:00
Enrico Turri
d45739fa15 Keeps objects on bed while scaling them using the scale gizmo 2018-11-16 11:30:36 +01:00
YuSanka
4de0f574fb Fixed wrong preset comboboxes updating on sidebar after preset changing on "Printer Settings" tab 2018-11-16 11:15:27 +01:00