GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-10-21 19:51:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,596 Commits 131 Branches 318 Tags
Commit Graph

1964 Commits

Author SHA1 Message Date
Filip Sykala - NTB T15p
e831255018 Merge branch 'fs_dir_per_glyph_SPE-1597' into fs_svg 
# Conflicts:
#	src/libslic3r/Emboss.cpp
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/TextConfiguration.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
#	src/slic3r/GUI/Jobs/EmbossJob.cpp
#	src/slic3r/GUI/Jobs/EmbossJob.hpp
 2023-06-07 11:18:26 +02:00
Filip Sykala - NTB T15p
5de06a9ef8 Merge branch 'master' into fs_svg 2023-06-02 10:53:47 +02:00
Filip Sykala - NTB T15p
7d867e5dc2 Merge branch 'master' into SPE-1597-per-glyph-transformation-over-surface 2023-06-01 13:37:56 +02:00
Lukas Matena
46678c27b5 Conflict checker: detection of the wipe tower when it narrows towards the top 2023-05-31 13:34:03 +02:00
enricoturri1966
cc55bcbf5e Conflict checker: automatically set the gcode preview at the layer shown in the notification when hitting the action text in it 2023-05-31 13:34:03 +02:00
enricoturri1966
efe00f310b Fixed warnings 2023-05-31 13:34:02 +02:00
enricoturri1966
6944c30f87 Tech ENABLE_BAMBUSTUDIO_TOOLPATHS_CONFLICTS_DETECTION set as default 2023-05-31 13:34:02 +02:00
enricoturri1966
417c85b83b Tech ENABLE_BAMBUSTUDIO_TOOLPATHS_CONFLICTS_DETECTION_MOD set as default 2023-05-31 13:34:02 +02:00
enricoturri1966
7a82429cf6 SPE-1682 - Toolpaths conflicts detection, 1st installment 
Succesfully enhanced and integrated into PrusaSlicer from BambuStudio:

d43c7d5c92

d72b4c1bfe

87eb0f3665

b5b7264e99

Code taken from BambuStudio is embedded into tech ENABLE_BAMBUSTUDIO_TOOLPATHS_CONFLICTS_DETECTION

Changes to adapt the code to PrusaSlicer is embedded into tech ENABLE_BAMBUSTUDIO_TOOLPATHS_CONFLICTS_DETECTION_MOD

Co-authored-by: manch1n <miaoxin.chen@bambulab.com>

Co-authored-by: miaoxin <miaoxin.chen@bambulab.com>

Co-authored-by: lane.wei <lane.wei@bambulab.com>
 2023-05-31 13:34:02 +02:00
Lukas Matena
ca3c6ecd9e Do not show the wipe tower in 3D scene when only one extruder is used 2023-05-31 13:01:28 +02:00
Filip Sykala - NTB T15p
6751bba96e Merge branch 'master' into fs_dir_per_glyph 2023-05-26 09:23:20 +02:00
Vojtech Bubnik
60e13272bd Fixed some more compilation warnings. 2023-05-25 18:22:34 +02:00
enricoturri1966
a8824d8f59 Fixed a couple of warnings 2023-05-25 14:00:54 +02:00
enricoturri1966
25575bb3f3 SPE-1716 - Fixed synchronization of layer editing texture when using undo/redo 2023-05-25 11:59:57 +02:00
enricoturri1966
7ee770baef Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_spe1698 2023-05-25 10:39:54 +02:00
Filip Sykala - NTB T15p
30df70705e Merge branch 'master' into fs_dir_per_glyph 2023-05-23 10:31:00 +02:00
enricoturri1966
f856129e72 Follow-up of bbea397aa662a01e8b42ea13159aa4109a615573 - Alternate fix for SPE-1675 2023-05-22 09:13:21 +02:00
enricoturri1966
0dacdb2061 Follow-up of 15bd82edc356c9aa19c940cc381c5544058ed391 - Fixed detection of out of printbed after arrange 2023-05-19 09:42:30 +02:00
Filip Sykala - NTB T15p
bca6b7811d Merge branch 'master' into fs_dir_per_glyph 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
 2023-05-17 12:58:53 +02:00
enricoturri1966
3377043154 SPE-1698 - Follow-up of 15bd82edc356c9aa19c940cc381c5544058ed391 - Fixed detection of out of printbed 2023-05-15 14:05:23 +02:00
enricoturri1966
15bd82edc3 SPE-1654 - Out of printbed detection applied only to selected volumes when the selection is not empty 2023-05-15 13:45:25 +02:00
enricoturri1966
568dc2a0e8 Fixed update of sequential printing clearance contours after deleting an object 2023-05-15 12:35:25 +02:00
enricoturri1966
beabf5d652 Do not calculate sequential print clearance contours for objects out of printbed 2023-05-15 09:08:30 +02:00
enricoturri1966
fa2ff496c6 Fixed build on MAC OS 2023-05-15 09:06:59 +02:00
enricoturri1966
2dba40789f Some refactoring related to sequential print clearance contours 2023-05-15 08:55:22 +02:00
enricoturri1966
5cc1359c05 Show and update sequential print clearance contours while manipulating the scene using Move/Rotate/Scale gizmos 2023-05-15 08:48:06 +02:00
enricoturri1966
9da788eae1 Method GLCanvas3D::update_sequential_clearance() modified to use frontend data to calculate sequential print clearance contours 2023-05-15 08:46:41 +02:00
enricoturri1966
6974962dd0 Avoid updating and sending to gpu sequential print clearance contours at every frame. Cache them instead and update only their transforms. 
Fixed conflicts after cherry-picking e99ee946afbaf6e6db9413ccacdd03233c4743d1
 2023-05-15 08:39:46 +02:00
enricoturri1966
35195dc03e Revert "Merge remote-tracking branch 'origin/et_outofbed_optimization'" 
This reverts commit a430aa41bac56875476dddb20c1b2a99b3a15833, reversing
changes made to a42d8571367d825a454e993a1f4e56883d3d3629.
 2023-05-12 14:09:16 +02:00
enricoturri1966
53b812a646 Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_outofbed_optimization 2023-05-12 12:00:58 +02:00
enricoturri1966
c6a203cb14 Do not calculate sequential print clearance contours for objects out of printbed 2023-05-11 12:34:02 +02:00
enricoturri1966
653d7bc678 Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_outofbed_optimization 2023-05-11 11:40:50 +02:00
enricoturri1966
663465299b Small refactoring 2023-05-10 11:15:39 +02:00
enricoturri1966
662c3da65b Fixed warnings 2023-05-10 11:01:50 +02:00
enricoturri1966
a4605a5e9e SPE-1606 - Do no show the switch view type icon in the 3D scene if the object does not contain negative volumes 2023-05-10 10:20:31 +02:00
enricoturri1966
b13a51f400 Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_sla_switch_view 2023-05-10 08:15:35 +02:00
Filip Sykala - NTB T15p
5a517e71de Merge branch 'master' into fs_dir_per_glyph 2023-05-09 13:01:08 +02:00
YuSanka
234956dfda Fix for SPE-1686 : Bug with instance rotation around X or Y 
Steps to repro:
1. Add object
2. Increase instances
3. Select some instance
4. Rotate around X or Y
5. After MouseUp:
OSX -> hard crash
MSW and Linux -> object and instance are selected at a same time
 2023-05-03 14:26:06 +02:00
enricoturri1966
d9dde32b78 SPE-1606 - Fixed a bunch of bugs/crashes related to visualizing original or processed volumes in 3D scene after slicing using SLA printers when multiple objects are on the printbed 2023-05-03 13:45:15 +02:00
Filip Sykala - NTB T15p
ea2b214741 @Enrico suggest this solution to preven accessing pointer on caster without data 2023-05-02 14:01:34 +02:00
enricoturri1966
159e699cd5 Fixed conflicts after merge with master 2023-04-26 12:35:02 +02:00
enricoturri1966
f1c5ffddfa Fixed typo 2023-04-26 09:06:17 +02:00
enricoturri1966
bbea397aa6 SPE-1675 - Do not update layer editing when the mouse cursor is moved outside of the 3D scene while dragging 2023-04-25 10:02:50 +02:00
enricoturri1966
b37d4e5b6c SPE-1674 - Follow-up of 9efed4be225615b3fac420bc2993cd0cb1e3429c - More robust fix 2023-04-24 10:01:32 +02:00
enricoturri1966
69b69cb9a2 Follow-up of 85dd2e486ab22e9d822036749efd75f0e675ccc9 - Fixed Zoom to mouse cursor for orthograpic camera 2023-04-21 09:09:04 +02:00
enricoturri1966
9efed4be22 SPE-1438 - Reset mouse dragging state when entering the 3D scene after the user released the mouse buttons outside of it 2023-04-20 08:08:02 +02:00
enricoturri1966
b0cc0e98fa Use the same colors as in 3D view when generating thumbnails 2023-04-19 13:12:27 +02:00
enricoturri1966
85dd2e486a SPE-1667 - Added 'Zoom to mouse cursor' by Shift+Mouse wheel 
Successfully enhanced and integrated into PrusaSlicer from 3f2ee4062b

Co-authored-by: liz.li <liz.li@bambulab.com>

Co-authored-by: lane.wei <lane.wei@bambulab.com>
 2023-04-19 11:45:37 +02:00
Filip Sykala - NTB T15p
51441bc5f0 Emboss SVG shape 2023-04-18 13:44:31 +02:00
enricoturri1966
3b93b316c6 SPE-1654 - Out of printbed detection applied only to selected volumes when the selection is not empty 2023-04-12 10:07:50 +02:00