Commit graph

628 commits

Author SHA1 Message Date
Filip Sykala
74cf6649f3 Merge branch 'master' into fs_mouse 2022-02-10 10:26:04 +01:00
enricoturri1966
92aa6540f5 Tech ENABLE_SHOW_TOOLPATHS_COG - Show toolpaths center of gravity 2022-02-08 12:57:56 +01:00
Filip Sykala
0c40e2f8c8 Merge branch 'master' into fs_mouse
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
2022-02-08 10:43:29 +01:00
Filip Sykala
a50d93cd66 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Geometry.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
#	src/slic3r/GUI/Selection.cpp
#	tests/slic3rutils/slic3r_jobs_tests.cpp
2022-02-02 15:27:25 +01:00
enricoturri1966
eda55701a2 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Background rendering 2022-01-28 11:30:04 +01:00
enricoturri1966
a939d8e4c0 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Layers editing profile's background texture rendering 2022-01-27 15:45:55 +01:00
enricoturri1966
8c807dbcc4 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - A few fixes in layers editing profile rendering 2022-01-27 15:19:29 +01:00
enricoturri1966
9d764bfeac Code cleanup in Selection and GLCanvas3D 2022-01-27 13:17:32 +01:00
enricoturri1966
afcac6e2ea Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Refactoring of GLModel to:
1) allow for custom vertex data layout

2) allow for custom index data format

3) allow for any OpenGL primitive type
2022-01-27 12:00:51 +01:00
enricoturri1966
35dd03e8cb Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Camera target 2022-01-21 12:07:54 +01:00
enricoturri1966
2673994471 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - LayersEditing profile 2022-01-21 11:03:25 +01:00
Filip Sykala
f23c356507 Merge branch 'dev' into fs_mouse
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
2022-01-20 09:25:06 +01:00
enricoturri1966
bebb5505a3 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Selection layers hints 2022-01-18 13:47:19 +01:00
enricoturri1966
22f38235ea Tech ENABLE_GLBEGIN_GLEND_REMOVAL - 1st installment - Selection bounding box 2022-01-18 10:42:46 +01:00
enricoturri1966
b9b702d550 Fixed conflicts after merge with branch dev 2022-01-14 09:55:13 +01:00
enricoturri1966
6201dad245 Tech ENABLE_COLOR_CLASSES set as default 2022-01-14 08:19:00 +01:00
enricoturri1966
cd4094743e Tech ENABLE_COLOR_CLASSES - 1st installment -> Introduction of classes ColorRGB and ColorRGBA to unify color data definition and manipulation 2021-12-22 10:45:35 +01:00
Filip Sykala
c751d6327d Separate GizmoManager on_move into gizmo itself 2021-12-10 09:09:53 +01:00
Filip Sykala
d698df2c31 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	tests/libslic3r/test_indexed_triangle_set.cpp
2021-12-01 14:35:42 +01:00
Filip Sykala
d4744954cb store position of just opened menu into Canvas3d 2021-12-01 13:56:14 +01:00
enricoturri1966
18cb91a982 Fixed conflicts after merge with master 2021-11-30 12:13:51 +01:00
enricoturri1966
75856d5e65 Tech ENABLE_SEAMS_USING_MODELS set as default 2021-11-30 08:36:55 +01:00
enricoturri1966
c242f31353 Fixed conflicts after merge with master 2021-11-23 08:48:11 +01:00
Lukas Matena
6180e3a89e Do not open simplify dialog on top of the main toolbar 2021-11-22 11:00:17 +01:00
enricoturri1966
9af9b9b35d Tech ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS set as default 2021-11-16 12:39:54 +01:00
Vojtech Bubnik
cc44089440 New BuildVolume class was created, which detects build volume type (rectangular,
circular, convex, concave) and performs efficient collision detection agains these build
volumes. As of now, collision detection is performed against a convex
hull of a concave build volume for efficency.

GCodeProcessor::Result renamed out of GCodeProcessor to GCodeProcessorResult,
so it could be forward declared.

Plater newly exports BuildVolume, not Bed3D. Bed3D is a rendering class,
while BuildVolume is a purely geometric class.

Reduced usage of global wxGetApp, the Bed3D is passed as a parameter
to View3D/Preview/GLCanvas.

Convex hull code was extracted from Geometry.cpp/hpp to Geometry/ConvexHulll.cpp,hpp.
New test inside_convex_polygon().
New efficent point inside polygon test: Decompose convex hull
to bottom / top parts and use the decomposition to detect point inside
a convex polygon in O(log n). decompose_convex_polygon_top_bottom(),
inside_convex_polygon().

New Circle constructing functions: circle_ransac() and circle_taubin_newton().

New polygon_is_convex() test with unit tests.
2021-11-16 10:15:51 +01:00
enricoturri1966
dd484e42fc Fixed conflicts after merge with master 2021-11-12 08:08:54 +01:00
Lukas Matena
ba56a79795 Simplify gizmo now renders the volume by itself,
it does not rely on the usual GLVolume rendering. GLCanvas3D::toggle_model_object_visibility
was extended to hide a single volume. Rendering the model and wireframe uses the same
vertex buffer, which is now used through GLModel class. GLGizmoRenderTransparent class
should no longer be needed. GLCanvas3D::reload_scene calls replaced with request_rerender.
2021-11-12 06:49:09 +01:00
enricoturri1966
f7662682c8 Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Modified ImGuiWrapper::slider_float() to create a compound widget where an additional button can be used to set the keyboard focus into the slider to allow the user to type in the desired value 2021-11-05 14:46:44 +01:00
enricoturri1966
e1b3ba063b Tech ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS - Printbed collision detection made cheaper for rectangular beds and faster for circular beds 2021-10-26 08:45:21 +02:00
enricoturri1966
3d22cc096f Fixed conflicts after merge with master 2021-10-19 12:08:43 +02:00
enricoturri1966
2c0815f537 Fixed conflicts after merge with master and ported changes into gouraud shaders to gouraud_mod shaders 2021-10-19 11:27:11 +02:00
Lukáš Hejl
b45675b4e1 Follow-up of 6194e67e68 - Separated the part that computed triangles normals and lighting inside the fragment shader into a separate shader mm_gouraud, which is only used for the multi-material painting gizmo. 2021-10-18 11:35:13 +02:00
enricoturri1966
0d922b04af Tech ENABLE_PREVIEW_LAYOUT - Added menu item View/Show legend 2021-10-14 11:30:27 +02:00
enricoturri1966
4ff13a5d63 Tech ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS - Reworked detection of collision with printbed. The detection uses now different algorithms in dependence of the printbed type (rectangular, circular, convex) to improve performance. 2021-10-06 13:47:54 +02:00
enricoturri1966
b19c742455 Fixed conflicts after merge with master 2021-09-30 10:31:25 +02:00
enricoturri1966
33da203b18 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_preview_layout 2021-09-30 07:58:11 +02:00
enricoturri1966
1df91ea930 Follow-up of 67e519d3ab - Use a platform-indipendent fix 2021-09-29 13:34:30 +02:00
enricoturri1966
57a0b23a07 Tech ENABLE_PREVIEW_LAYOUT - Avoid resetting the preview's horizontal slider when toggling options 2021-09-24 11:57:29 +02:00
enricoturri1966
1af0c5c73b Tech ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS - Call GLVolumeCollection::check_outside_state() only when needed 2021-09-20 13:40:34 +02:00
enricoturri1966
d52ee52098 Tech ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER set as default 2021-09-14 15:05:33 +02:00
enricoturri1966
30d2c3787f Tech ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING set as default 2021-09-14 14:34:21 +02:00
Vojtech Bubnik
880feb3a3d GCodeViewer slight opitmization: reuse (move) G-code line indices
in G-code viewer.
2021-09-13 10:41:28 +02:00
enricoturri1966
8bd0f8ada9 Removed duplicated method GLVolumeCollection::check_outside_state() 2021-09-10 08:27:03 +02:00
Vojtech Bubnik
32733b7db9 GCodeProcessor collects positions of line ends for GCodeViewer,
GCodeViewer no more parses G-code just to extract line end positions.
Removed start_mapping_gcode_window(), void stop_mapping_gcode_window(),
they are no more needed.
2021-09-07 15:42:56 +02:00
enricoturri1966
39ec1a6318 Fixed conflicts after merge with master 2021-08-26 12:39:28 +02:00
Filip Sykala
11c91d781e FIX: extra frame request
Do not freeze bargraph in Siplify dialog when no mouse move.
2021-08-17 15:28:08 +02:00
enricoturri1966
599a4d97e3 Removed constness from a few renderXXX() methods 2021-08-04 12:47:36 +02:00
enricoturri1966
a8552512cf Fixed sinking objects popping-up when deleting modifiers 2021-07-30 08:18:11 +02:00
enricoturri1966
dc21fb1100 Changed detection of sinking objects into ObjectList::update_info_items() 2021-07-29 15:15:57 +02:00