3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_lines_g2_g3

Browse source
This commit is contained in:
enricoturri1966 2022-03-21 08:54:04 +01:00
commit 6ee4457b31
5 changed files with 2337 additions and 2333 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build_win.bat
View file

@ -164,6 +164,9 @@ IF NOT EXIST "%MSVC_DIR%" (
@ECHO ERROR: Compatible Visual Studio installation not found. 1>&2 @ECHO ERROR: Compatible Visual Studio installation not found. 1>&2
GOTO :HELP GOTO :HELP
) )
REM Cmake always defaults to latest supported MSVC generator. Let's make sure it uses what we select.
FOR /F "tokens=* USEBACKQ" %%I IN (`^""%VSWHERE%" %MSVC_FILTER% -nologo -property catalog_productLineVersion^"`) DO SET PS_PRODUCT_VERSION=%%I
REM Give the user a chance to cancel if we found something odd. REM Give the user a chance to cancel if we found something odd.
IF "%PS_ASK_TO_CONTINUE%" EQU "" GOTO :BUILD_ENV IF "%PS_ASK_TO_CONTINUE%" EQU "" GOTO :BUILD_ENV
@ECHO. @ECHO.
@ -183,6 +186,7 @@ SET PS_CURRENT_STEP=environment
@ECHO ** Deps path: %PS_DESTDIR% @ECHO ** Deps path: %PS_DESTDIR%
@ECHO ** Using Microsoft Visual Studio installation found at: @ECHO ** Using Microsoft Visual Studio installation found at:
@ECHO ** %MSVC_DIR% @ECHO ** %MSVC_DIR%
SET CMAKE_GENERATOR=Visual Studio %PS_VERSION% %PS_PRODUCT_VERSION%
CALL "%MSVC_DIR%\Common7\Tools\vsdevcmd.bat" -arch=%PS_ARCH% -host_arch=%PS_ARCH_HOST% -app_platform=Desktop CALL "%MSVC_DIR%\Common7\Tools\vsdevcmd.bat" -arch=%PS_ARCH% -host_arch=%PS_ARCH_HOST% -app_platform=Desktop
IF %ERRORLEVEL% NEQ 0 GOTO :END IF %ERRORLEVEL% NEQ 0 GOTO :END
REM Need to reset the echo state after vsdevcmd.bat clobbers it. REM Need to reset the echo state after vsdevcmd.bat clobbers it.

1
resources/profiles/Anycubic.idx
View file

@ -1,4 +1,5 @@
min_slic3r_version = 2.4.1-rc1 min_slic3r_version = 2.4.1-rc1
0.1.1 Fixed before layer change g-code for Mega Zero.
0.1.0 Added Anycubic 4Max Pro 2.0 0.1.0 Added Anycubic 4Max Pro 2.0
min_slic3r_version = 2.3.2-alpha0 min_slic3r_version = 2.3.2-alpha0
0.0.12 Updated Anycubic i3 MEGA(S) profiles. 0.0.12 Updated Anycubic i3 MEGA(S) profiles.

4658
resources/profiles/Anycubic.ini
View file

File diff suppressed because one or more lines are too long

6
src/libslic3r/GCode/GCodeProcessor.cpp
View file

@ -1210,7 +1210,6 @@ void GCodeProcessor::reset()
m_extruded_last_z = 0.0f; m_extruded_last_z = 0.0f;
m_first_layer_height = 0.0f; m_first_layer_height = 0.0f;
m_processing_start_custom_gcode = false;
m_g1_line_id = 0; m_g1_line_id = 0;
m_layer_id = 0; m_layer_id = 0;
m_cp_color.reset(); m_cp_color.reset();
@ -1818,7 +1817,6 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers
set_extrusion_role(ExtrusionEntity::string_to_role(comment.substr(reserved_tag(ETags::Role).length()))); set_extrusion_role(ExtrusionEntity::string_to_role(comment.substr(reserved_tag(ETags::Role).length())));
if (m_extrusion_role == erExternalPerimeter) if (m_extrusion_role == erExternalPerimeter)
m_seams_detector.activate(true); m_seams_detector.activate(true);
m_processing_start_custom_gcode = (m_extrusion_role == erCustom && m_g1_line_id == 0);
return; return;
} }
@ -2540,6 +2538,8 @@ void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line)
#else #else
if (m_forced_height > 0.0f) if (m_forced_height > 0.0f)
m_height = m_forced_height; m_height = m_forced_height;
else if (m_layer_id == 0)
m_height = (m_end_position[Z] <= double(m_first_layer_height)) ? m_end_position[Z] : m_first_layer_height;
else { else {
if (m_end_position[Z] > m_extruded_last_z + EPSILON) if (m_end_position[Z] > m_extruded_last_z + EPSILON)
m_height = m_end_position[Z] - m_extruded_last_z; m_height = m_end_position[Z] - m_extruded_last_z;
@ -3509,7 +3509,7 @@ void GCodeProcessor::store_move_vertex(EMoveType type)
m_extrusion_role, m_extrusion_role,
m_extruder_id, m_extruder_id,
m_cp_color.current, m_cp_color.current,
Vec3f(m_end_position[X], m_end_position[Y], m_processing_start_custom_gcode ? m_first_layer_height : m_end_position[Z] - m_z_offset) + m_extruder_offsets[m_extruder_id], Vec3f(m_end_position[X], m_end_position[Y], m_end_position[Z] - m_z_offset) + m_extruder_offsets[m_extruder_id],
static_cast<float>(m_end_position[E] - m_start_position[E]), static_cast<float>(m_end_position[E] - m_start_position[E]),
m_feedrate, m_feedrate,
m_width, m_width,

1
src/libslic3r/GCode/GCodeProcessor.hpp
View file

@ -550,7 +550,6 @@ namespace Slic3r {
ExtruderTemps m_extruder_temps; ExtruderTemps m_extruder_temps;
float m_extruded_last_z; float m_extruded_last_z;
float m_first_layer_height; // mm float m_first_layer_height; // mm
bool m_processing_start_custom_gcode;
unsigned int m_g1_line_id; unsigned int m_g1_line_id;
unsigned int m_layer_id; unsigned int m_layer_id;
CpColor m_cp_color; CpColor m_cp_color;