1608 Commits

Author SHA1 Message Date
Filip Sykala - NTB T15p
e85e7a743b Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
2022-10-21 09:52:36 +02:00
enricoturri1966
03a256180a Tech ENABLE_RAYCAST_PICKING - Fixed active/inactive state of scene raycasters when opening/closing a gizmo which hides non selected volumes 2022-10-20 16:35:05 +02:00
Filip Sykala - NTB T15p
a752ccb420 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
2022-10-19 19:35:31 +02:00
enricoturri1966
71660a281b Tech ENABLE_WIPETOWER_OBJECTID_1000_REMOVAL set as default 2022-10-19 08:52:35 +02:00
Filip Sykala - NTB T15p
0e3b7cae12 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
2022-09-29 18:47:21 +02:00
enricoturri1966
3513b800a0 Tech ENABLE_PREVIEW_LAYOUT set as default 2022-09-29 14:23:41 +02:00
Filip Sykala - NTB T15p
75557ca06a fix for double click selection 2022-09-23 17:06:25 +02:00
Filip Sykala - NTB T15p
8f644f5e08 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
2022-09-23 14:11:47 +02:00
Filip Sykala - NTB T15p
20f15dad95 Add option to open text by double click 2022-09-23 12:24:03 +02:00
enricoturri1966
abca0126ec SPE-1313 - Fixed wrong warning message when object out of bounds (SLA printers) 2022-09-21 13:59:15 +02:00
tamasmeszaros
a3aeddfd13 Merge branch 'tm_arrange_bounds_SPE-1247' 2022-09-20 10:59:49 +02:00
Filip Sykala - NTB T15p
ed6a1b18f3 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
2022-09-14 11:28:36 +02:00
YuSanka
10cc836e3f Fix for #8850 - Incorrect display STL file name if not western coding page characters used 2022-09-13 17:30:22 +02:00
tamasmeszaros
2c6431218e Add arrange parameter to set min distance from bed
implements FR #8442
2022-09-12 10:05:34 +02:00
YuSanka
70d0e9eb44 Fix for #8819 - Height Range modifier incorrectly displays height in Viewport 2022-09-08 13:59:13 +02:00
enricoturri1966
7b812a120a Tech ENABLE_RAYCAST_PICKING_DEBUG - Show number of active raycasters in debug imgui dialog and use ImGui tables to layout the dialog 2022-09-06 10:14:27 +02:00
Filip Sykala - NTB T15p
c549c6afbe Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Point.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GLSelectionRectangle.cpp
#	src/slic3r/GUI/GUI_Factories.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	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/MeshUtils.cpp
#	src/slic3r/GUI/MeshUtils.hpp
#	src/slic3r/GUI/ObjectDataViewModel.cpp
#	src/slic3r/GUI/ObjectDataViewModel.hpp
#	src/slic3r/GUI/Selection.cpp
2022-08-31 15:22:10 +02:00
YuSanka
656a1d262a Fix for #2519 - Takes focus away from input box when moving cursor to plater
Take focus away only, if ObjectList was focused, when mouse cursor is moved to 3d-Scene
2022-08-29 15:19:03 +02:00
Vojtech Bubnik
3f69643516 Merge branch 'vb_treesupports' 2022-08-23 16:45:34 +02:00
Vojtech Bubnik
9aee934d53 Speed improvement of initial G-code preview:
1) Preallocating the vertex / index buffers to limit reallocation.
2) Inlining the pushing into the vertex / index buffers.
3) Running the vertex buffer generator on a limited number of threads
   as the generator does not scale well due to memory pressure.
   Not using all the threads leaves some of the threads to G-code
   generator.
2022-08-23 11:28:25 +02:00
enricoturri1966
e9f5551450 #8563 - Fix icon scaling causing crash on startup. Ported from c8bb0a46b8 2022-08-22 09:53:51 +02:00
enricoturri1966
2b996158d2 Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_opengl_es_rebase 2022-08-18 12:51:55 +02:00
enricoturri1966
0388132acd Tech ENABLE_SHOW_NON_MANIFOLD_EDGES set as default 2022-07-28 08:55:53 +02:00
enricoturri1966
5cf71bb094 Tech ENABLE_SHOW_TOOLPATHS_COG set as default 2022-07-27 15:52:40 +02:00
enricoturri1966
253b24e298 When pressing ESC key to clear the current selection do not repeatedly update the view if the user keeps the key pressed. 2022-07-27 15:35:35 +02:00
enricoturri1966
b8a1ead9f3 Fix incorrect clamping of bounding box in GLCanvas3D::_max_bounding_box() 2022-07-27 10:57:52 +02:00
enricoturri1966
bb36f0df0c Tech ENABLE_OPENGL_ES - 1st installment 2022-07-21 15:43:11 +02:00
enricoturri1966
8fbc0b8633 SPE-1259 - Fix for sinking objects not placed on top of bed after rotation with Place on face Gizmo 2022-07-21 14:16:09 +02:00
enricoturri1966
ca34518bcc Fixed conflicts after merge with master 2022-07-21 08:55:52 +02:00
enricoturri1966
520261925f Fixed conflicts after merge with master 2022-07-21 08:14:44 +02:00
Filip Sykala - NTB T15p
79a7f588b9 Merge branch 'et_world_coordinates' into fs_emboss
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Selection.cpp
#	src/slic3r/GUI/Selection.hpp
2022-07-20 13:02:07 +02:00
enricoturri1966
4353c626fc Revert of 324594db5e6e366cc64b15c2d5a77711d56077ee 2022-07-20 09:45:32 +02:00
enricoturri1966
324594db5e Added some errors to test new command line option '--opengl-debug' 2022-07-20 08:55:39 +02:00
enricoturri1966
90c49f4c1a Added filtering of key auto repeat for SHIFT and CTRL keys in GLCanvas3D 2022-07-20 08:15:38 +02:00
enricoturri1966
f06a931d0b Tech ENABLE_RAYCAST_PICKING - Fixed wrong behavior when pressing CTRL while dragging a model on the plate 2022-07-14 14:45:19 +02:00
enricoturri1966
b9caacfdd9 Merge branch 'et_opengl_3_rebase' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_raycast_picking_rebase 2022-07-13 13:50:34 +02:00
enricoturri1966
642f64cb41 Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fixed rendering of layer editing background on older OpenGL compatibility profile 2022-07-13 12:12:35 +02:00
enricoturri1966
22b634ca1d Fixed crash at startup on Mac OS 2022-07-13 08:56:00 +02:00
tamasmeszaros
7fbaf0f96c Fix previous commit 2022-07-07 15:57:15 +02:00
tamasmeszaros
6091412c6b Arrange params storage/retrieve functions now ignore locale 2022-07-07 15:53:53 +02:00
enricoturri1966
a7af73795d Tech ENABLE_RAYCAST_PICKING - Method GLCanvas3D::_mouse_to_3d() modified to use the new scene raycaster instead of reading data from the depth buffer 2022-07-01 15:00:27 +02:00
enricoturri1966
c991798740 Tech ENABLE_RAYCAST_PICKING - Fixed wrong scope for ENABLE_RAYCAST_PICKING_DEBUG in GLCanvas3D::_picking_pass() causing the 3d scene to freeze while rotating it 2022-07-01 14:57:22 +02:00
Lukas Matena
6c0db58628 Fixing conflicts part 4:
See previous commit. This one applies changes from master_250
to the files mentioned
2022-06-29 16:43:29 +02:00
Lukas Matena
d662bf2a18 Fixing conflicts part 3:
Some files have whitespace changes that make resolving conflicts difficult.
Take the version from master first, next commit will apply changes from master_250
2022-06-29 16:43:29 +02:00
Lukas Matena
b61714bb3e Merge branch 'master_250' (NO CONFLICTS FIXED):
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250.  Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250.  Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
2022-06-29 14:37:14 +02:00
enricoturri1966
39b1222b22 Tech ENABLE_RAYCAST_PICKING - Rendering for rectangle selection made only inside the rectangle, on systems supporting framebuffers 2022-06-29 12:14:41 +02:00
enricoturri1966
ae76468f7c Tech ENABLE_RAYCAST_PICKING - Partial revert of 89ac9326280083de5325bc19950299842902d5b1 - Restored rectangle selection using encoded colors rendering 2022-06-28 14:12:57 +02:00
Lukas Matena
a96eaf5426 Fix crash when pressing Ctrl+A while a gizmo is open (#8416):
There were two separate issues. Missing update when select_all was invoked in
the scene and missing check when SLA supports/hollow gizmo were asked to select
all points/holes.
2022-06-22 16:51:27 +02:00
enricoturri1966
0a1d1ef6c8 Follow-up of 37d36616ee940db59dcdf376e19a995a147a17e9 - Fixed previous commit 2022-06-21 11:29:18 +02:00
enricoturri1966
89ac932628 Tech ENABLE_NEW_RECTANGLE_SELECTION set as default 2022-06-21 11:10:57 +02:00