Commit Graph
1084 Commits
Author SHA1 Message Date
Lukas Matena 891b6a8a34 First experiments with sla supports ui 2018-09-10 12:08:57 +02:00
Enrico Turri 775ec1b546 Tweaks to gizmo scale 3D 2018-09-07 13:40:26 +02:00
Enrico Turri ada6dba00b Selection of picking color for gizmo grabber moved into GLGizmoBase 2018-09-07 12:20:56 +02:00
Enrico Turri ea15475ad8 Fixed double click on gizmo overlay and toolbar 2018-09-07 12:00:04 +02:00
Enrico Turri e9d5cd726e Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-07 10:32:39 +02:00
Enrico Turri e04805eaa2 Fixed rendering of endcaps on open toolpaths 2018-09-07 10:30:13 +02:00
Enrico Turri 8460926d36 Added select by part tool to toolbar 2018-09-06 16:10:31 +02:00
Enrico Turri c8f1369824 Added Vec3d ModelInstance::transform_vector() method 2018-09-06 09:16:32 +02:00
Enrico Turri 677dad0669 Object's properties updated while manipulating gizmos 2018-09-05 16:22:48 +02:00
Enrico Turri 42567e3af2 Object's position updated on gui after displacement 2018-09-05 15:35:09 +02:00
Enrico Turri 622e86d9e4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-05 15:32:12 +02:00
Enrico Turri aef871f1a0 Another fix in flatten gizmo's flattening normal 2018-09-05 15:13:29 +02:00
Enrico Turri df594fc5b0 Tweaks to update of object properties on gui 2018-09-05 15:09:13 +02:00
YuSanka 82838cc640 Final bug-fix for #1169 considering issue #971 2018-09-05 15:03:20 +02:00
Enrico Turri b9e6f8f3e3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-05 14:12:58 +02:00
Enrico Turri 011281068b Fixed flatten gizmo's flattening normal 2018-09-05 14:02:08 +02:00
YuSanka 8ba48f8dc5 fixed typo-bug 2018-09-05 12:33:04 +02:00
YuSanka e2830dc337 Fix to last commit 2018-09-05 12:02:34 +02:00
Enrico Turri 407aee9942 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-05 09:51:31 +02:00
YuSanka f67060f012 Fixed bug from issue #1169 2018-09-05 09:47:36 +02:00
Enrico Turri 87c5c8e7f6 Renamed GLVolume member variables to match the corresponding ModelInstance ones 2018-09-05 09:11:58 +02:00
Enrico Turri 15b1340514 Added ModelInstance::world_matrix() method and stl_transform using eigen transform 2018-09-04 14:42:14 +02:00
Enrico Turri 5f2afad95e Fixed render of picking pass for flatten gizmo 2018-09-04 12:41:14 +02:00
tamasmeszaros 4f53fc2a5f Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppControllerWx.cpp
#	xs/src/slic3r/GUI/GUI.hpp
2018-08-30 17:35:49 +02:00
tamasmeszaros f5b1729af3 fixing build issues 2018-08-30 12:11:52 +02:00
tamasmeszaros 15ad0ef2f2 working C++ status bar.
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:55:10 +02:00
tamasmeszaros 9e2d48ff3b Almost working c++ status bar
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:54:08 +02:00
Enrico Turri 3750bd781e Enhanced gizmo scale 3D 2018-08-29 13:36:03 +02:00
YuSanka 6c1b52afa2 Deleted "scale" column from object list 2018-08-29 13:11:30 +02:00
YuSanka 7fd7d83470 Updated PrusaDoubleSlider icons 2018-08-29 11:21:22 +02:00
YuSanka b1d418a799 Merge remote-tracking branch 'origin/dev' into new_main_page_ui 2018-08-29 10:06:29 +02:00
YuSanka 2dcfd74579 Try to fix object_ctrl_context_menu on OS X 2018-08-29 09:33:56 +02:00
YuSanka a56ea9a616 Try to understand OSX crashing on context menu 2018-08-28 17:03:40 +02:00
Enrico Turri 4ffdb46110 Cached world matrix of GLVolume to speed up rendering 2018-08-28 16:08:43 +02:00
YuSanka 5557e59d43 Reorganized object settings pane
+ Added new control - PrusaLockButton
2018-08-28 15:51:53 +02:00
Enrico Turri 84fb7940b7 More eigenized gizmos 2018-08-28 13:23:28 +02:00
Enrico Turri 255e837d33 Removed 2D gizmos 2018-08-28 12:50:26 +02:00
Enrico Turri dd86546d0f Fixed rotate gizmo position after arrange 2018-08-28 12:05:16 +02:00
Enrico Turri 6ce686aff8 Fixed 3D scene mouse capture 2018-08-28 09:31:23 +02:00
Enrico Turri 41c093a258 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-28 09:04:12 +02:00
Enrico Turri 87565a0686 Tweaks to GLGizmoFlatten 2018-08-28 09:03:03 +02:00
tamasmeszaros 1c4574d42e fix centroid error for two points and merge with dev. 2018-08-27 16:20:13 +02:00
Enrico Turri b9bb821392 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:56:23 +02:00
Enrico Turri eb9f4ee777 Fixed moving center of rotate gizmo 2018-08-27 14:54:20 +02:00
Enrico Turri 4b25d3924b Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:01:03 +02:00
Enrico Turri fef5a5252e Fixed conflicts after merging with master 2018-08-27 14:00:53 +02:00
tamasmeszaros d749080261 Merge remote-tracking branch 'origin/dev' into sla_base_pool 2018-08-27 09:53:52 +02:00
YuSanka d4c8bc0720 Fixed post-merge compilation problem 2018-08-24 16:56:42 +02:00
bubnikv 3c0d81e7d9 Merge remote-tracking branch 'remotes/origin/lm_lay_flat_round_merged_facets' 2018-08-24 16:39:24 +02:00
bubnikv de0f8ec267 Merge remote-tracking branch 'remotes/origin/lm_retraction_fix' 2018-08-24 16:33:57 +02:00