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
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
enricoturri1966
6d97de14d9
Tech ENABLE_RAYCAST_PICKING - Removal of all remaining code related to old OpenGL based picking
2022-06-21 09:16:36 +02:00
enricoturri1966
37d36616ee
Tech ENABLE_RAYCAST_PICKING - Do know allow picking while dragging gizmos
2022-06-20 14:07:38 +02:00
enricoturri1966
63890b5f8d
Do know allow picking while dragging gizmos
2022-06-20 13:58:06 +02:00
enricoturri1966
692aabd8e1
Tech ENABLE_RAYCAST_PICKING - Fixed build and warnings on Mac
2022-06-15 14:58:04 +02:00
enricoturri1966
f45711e7e5
Removed tech ENABLE_RENDER_PICKING_PASS
2022-06-15 14:29:29 +02:00
enricoturri1966
c5c5c23ed2
Tech ENABLE_RAYCAST_PICKING - Raytraced picking of Gizmo Hollow
2022-06-15 09:01:13 +02:00
enricoturri1966
df47ba7122
Tech ENABLE_RAYCAST_PICKING - Raytraced picking of gizmos - Move Gizmo
2022-06-13 13:09:24 +02:00
enricoturri1966
6c6713c4ad
Tech ENABLE_RAYCAST_PICKING - Raytraced picking of volumes
2022-06-10 14:56:15 +02:00
enricoturri1966
cfc3988b9f
Tech ENABLE_RAYCAST_PICKING - 1st installment - Raytraced picking of printbed
2022-06-10 13:20:52 +02:00
enricoturri1966
cd6155293b
Fixed conflicts after merge with master
2022-06-07 11:10:19 +02:00
enricoturri1966
c99e93c357
Fixed differences after rebase with master
2022-06-06 14:55:38 +02:00
enricoturri1966
00878fb330
Tech ENABLE_TRANSFORMATIONS_BY_MATRICES merged into ENABLE_WORLD_COORDINATE
...
Fixed conflicts during rebase with master
2022-06-06 13:36:29 +02:00
enricoturri1966
3b3edb5a97
Fixed build and warnings on Linux and Mac
...
Fixed conflicts during rebase with master
2022-06-06 12:22:42 +02:00
enricoturri1966
19712749c3
Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Added reset button to remove skew, when detected, in object manipulator panel
...
Fixed conflicts during rebase with master
2022-06-06 10:00:28 +02:00
enricoturri1966
88ce6ccdef
Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::scale(const Vec3d& scale, TransformationType transformation_type) to use matrix multiplication
...
Fixed conflicts during rebase with master
2022-06-06 09:54:19 +02:00
enricoturri1966
9f503b95e8
Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::rotate(const Vec3d& rotation, TransformationType transformation_type) to use matrix multiplication
...
Fixed conflicts during rebase with master
2022-06-03 15:44:45 +02:00
Lukas Matena
d557bd1dd3
Fixed a crash when using a selection rectangle in cut gizmo
2022-06-02 09:28:08 +02:00
enricoturri1966
8d0780aabe
Tech ENABLE_GL_CORE_PROFILE - Added command line option '--opengl-core=M.m' which allows the user to select a specific OpenGL version supporting core profile
2022-05-30 16:15:25 +02:00
enricoturri1966
c468dcbed7
Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fixed calculation of normal matrices sent to shaders
...
Fixed conflicts during rebase with master
2022-05-26 12:25:55 +02:00
enricoturri1966
1d5be00acf
Fixed warning
...
Fixed conflicts during rebase with master
2022-05-26 11:53:16 +02:00
enricoturri1966
172929259a
Tech ENABLE_GL_CORE_PROFILE - Fix in generate_system_info_json()
...
Fixed conflicts during rebase with master
2022-05-26 11:45:44 +02:00
enricoturri1966
96803b5384
Follow-up of 09ad6d704060a6a2a9a08771e796bc9bec09479f - Code for Mesa drivers in Windows only builds
...
Fixed conflicts during rebase with master
2022-05-26 11:39:35 +02:00