GCodeProcessor -> Added processing of gcode lines G0

This commit is contained in:
enricoturri1966 2020-06-12 09:01:20 +02:00
parent 4c51a258ef
commit aa14b42638
3 changed files with 7 additions and 1 deletions

View File

@ -66,7 +66,6 @@ vec4 on_sphere_color(vec3 eye_on_sphere_position)
intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;
return vec4(intensity.y + uniform_color.rgb * intensity.x, 1.0); return vec4(intensity.y + uniform_color.rgb * intensity.x, 1.0);
// return vec4(vec3(intensity.y) + uniform_color.rgb * intensity.x, 1.0);
} }
float fragment_depth(vec3 eye_pos) float fragment_depth(vec3 eye_pos)

View File

@ -110,6 +110,7 @@ void GCodeProcessor::process_gcode_line(const GCodeReader::GCodeLine& line)
{ {
switch (::atoi(&cmd[1])) switch (::atoi(&cmd[1]))
{ {
case 0: { process_G0(line); break; } // Move
case 1: { process_G1(line); break; } // Move case 1: { process_G1(line); break; } // Move
case 10: { process_G10(line); break; } // Retract case 10: { process_G10(line); break; } // Retract
case 11: { process_G11(line); break; } // Unretract case 11: { process_G11(line); break; } // Unretract
@ -263,6 +264,11 @@ void GCodeProcessor::process_tags(const std::string& comment)
} }
} }
void GCodeProcessor::process_G0(const GCodeReader::GCodeLine& line)
{
process_G1(line);
}
void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line) void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line)
{ {
auto absolute_position = [this](Axis axis, const GCodeReader::GCodeLine& lineG1) auto absolute_position = [this](Axis axis, const GCodeReader::GCodeLine& lineG1)

View File

@ -155,6 +155,7 @@ namespace Slic3r {
void process_tags(const std::string& comment); void process_tags(const std::string& comment);
// Move // Move
void process_G0(const GCodeReader::GCodeLine& line);
void process_G1(const GCodeReader::GCodeLine& line); void process_G1(const GCodeReader::GCodeLine& line);
// Retract // Retract