Commit Graph

155 Commits

Author SHA1 Message Date
Vojtech Kral
82352c1314 imgui: Refactor combo boxes. Fix #1895 #1868 2019-03-05 15:28:53 +01:00
Enrico Turri
822bd92bd1 Fixed conflicts after merge with master 2019-03-05 08:27:21 +01:00
Lukas Matena
2fe542e0fc Merge branch 'lm_sla_gizmo_render' 2019-03-04 14:52:21 +01:00
Lukas Matena
02c68ed895 Prevented the sla gizmo dialog to overlap the bottom toolbar 2019-03-04 14:52:08 +01:00
Lukas Matena
9c5194c89b An attempt to fix an OSX crash when manipulating the ImGui sliders 2019-03-04 12:47:02 +01:00
Enrico Turri
3c7ec5f7c6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-03-04 08:33:52 +01:00
Lukas Matena
ee4496f59f An attempt to fix an unwanted cancellation caused by improper frontend-backend data synchronization (SLA support points) 2019-03-01 16:17:23 +01:00
Lukas Matena
b45c80b8db Fixed the 'remove all points' button in sla gizmo (was only working in editing mode) 2019-03-01 15:03:58 +01:00
Lukas Matena
5846af256a SLA supports gizmo can change object config options 2019-03-01 13:24:24 +01:00
Enrico Turri
806eff2325 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-28 08:23:44 +01:00
Lukas Matena
4eb4e40746 SLA gizmo keeps track of current status of the points, enables the user to erase all points 2019-02-27 16:23:10 +01:00
Enrico Turri
f47fe861ac Allow non-squared textures for toolbars and gizmo icons 2019-02-26 10:40:00 +01:00
Enrico Turri
0f683a6a1e 1st installment of svg icons for toolbars and gizmos 2019-02-26 09:56:23 +01:00
Lukas Matena
bb3819fd18 SLA support gizmo hotkeys added (A,M,Esc,Enter) 2019-02-25 13:04:05 +01:00
Enrico Turri
fab87ff1d9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-25 09:32:02 +01:00
bubnikv
917f044f81 Renamed the "lambda-" prefix for the generic modifiers to "Generic-"
Refactored ModelVolume::Type to enum class ModelVolumeType to be able
to forward declare it.

Refactored UI to use the ModelVolumeType instead of the untyped int.
2019-02-22 12:12:10 +01:00
Enrico Turri
03022ce124 Code cleanup 2019-02-22 12:06:56 +01:00
Enrico Turri
c6607bcd27 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-22 11:40:04 +01:00
bubnikv
53ccac6925 Show wait cursor when exporting an STL.
Fix of SLA gizmo picking by rectangle: point is occluded only if an object
is half its radius away from the point center.
Don't show the temp G-code file name in the status bar when exporting.
2019-02-22 10:11:57 +01:00
Enrico Turri
aa9994fa35 Gizmos overlay using a single png texture 2019-02-22 10:01:34 +01:00
bubnikv
8d09508ca8 SLA supports: Update only supports for the selected object from iside
the SLA support gizmo.
2019-02-21 12:09:03 +01:00
Lukas Matena
5292f16f32 SLA gizmo - clicking on object does not add new points if any point is selected
Remove selected points button is greyed out unless something is selected
2019-02-20 15:42:03 +01:00
Lukas Matena
b0d78c3fb2 Place on bed fix (incorrect usage of sla z-shift) 2019-02-20 15:15:00 +01:00
Lukas Matena
4558910a84 SLA gizmo can be deselected by clicking in canvas area (unless in editing mode) 2019-02-20 09:59:59 +01:00
Lukas Matena
eb0fd03861 SLA supports - added parameters for the automatic generation (relative density measure and minimal distance of the points) 2019-02-19 16:34:52 +01:00
Lukas Matena
1bb0af1588 SLA gizmo asks about saving changes, right button click removes points 2019-02-19 13:47:28 +01:00
Lukas Matena
3c7912186e SLA gizmo cannot be activated for objects outside the bed 2019-02-19 10:47:15 +01:00
bubnikv
8b4bd7177b SLA auto supports: Work with support force deficit to sprinkle support points.
Use OpenGL emissive material to render support points.
2019-02-19 10:09:41 +01:00
Lukas Matena
cb4763bb32 SLA gizmo - combobox items are now rendered immediately on mouse click, not after next mouse move 2019-02-18 14:56:19 +01:00
Lukas Matena
c63bdccb4b SLA gizmo selection rectangle now checks for obscured points 2019-02-18 14:07:45 +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
388f2aac71 Fix of a merge error. 2019-02-17 13:26:17 +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
bubnikv
fcc1b2ad69 Reworked polygon sampling for SLA auto support generation.
Conditional compilation of an igl winding number tree for SLA support generator, as it is not used as of now and initialization of the tree is expensive.
Fixed issue with passing the new SLA point definition to the back end and back to the UI.
2019-02-17 13:05:22 +01:00
Lukas Matena
d1529296c6 Added a wxMessageDialog as an alternative to the ImGui modal, in case it turns out not good enough 2019-02-11 17:09:15 +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
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
Lukas Matena
9dff44a8ad SLA support gizmo does not use Grabber class anymore 2019-02-04 12:33:59 +01:00
Lukas Matena
fab3025107 SLA support points - minor adjustments 2019-02-04 10:56:49 +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
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
bubnikv
588c07c12a Performance improvements:
Lazy "Place on face" gizmo update.
Caching of MeshObject::raw_mesh_bounding_box() for the object size display.
ModelObject::bounding_box(), raw_mesh_bounding_box(), full_raw_mesh_bounding_box() will not copy the mesh.
TriangleMesh::transformed_bounding_box(const Transform3d &trafo) will not copy the mesh data.
get_options_for_bundle() will not return reference to temp value
is_splittable() calls cheap mesh.has_multiple_patches()
2019-01-26 18:51:34 +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
Lukas Matena
7c3319ede2 Place on bed optimization 2019-01-23 14:27:11 +01:00
Enrico Turri
f2ec6eb249 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-23 11:03:31 +01:00
Lukas Matena
78a9e6036a Fix of previous commit 2019-01-23 09:42:04 +01:00
Lukas Matena
bf0232308b Place on face - fix of updating on selection change 2019-01-23 09:29:50 +01:00