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

Wipe tower rotation around center point

Browse Source
This commit is contained in:
Lukas Matena 2017-12-05 11:25:38 +01:00
parent cb84a6cfce
commit c34fd10e23
5 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xs/src/libslic3r/GCode/WipeTower.hpp
View File

@ -25,12 +25,15 @@ public:
bool operator!=(const xy &rhs) const { return x != rhs.x || y != rhs.y; } bool operator!=(const xy &rhs) const { return x != rhs.x || y != rhs.y; }
// Rotate the point around given point about given angle (in degrees) // Rotate the point around given point about given angle (in degrees)
xy rotate(const xy& origin, float angle) const { // shifts the result so that point of rotation is in the middle of the tower
xy rotate(const xy& origin, float width, float depth, float angle) const {
xy out(0,0); xy out(0,0);
float temp_x = x - width / 2.f;
float temp_y = y - depth / 2.f;
angle *= M_PI/180.; angle *= M_PI/180.;
out.x=(x-origin.x) * cos(angle) - (y-origin.y) * sin(angle); out.x += (temp_x - origin.x) * cos(angle) - (temp_y - origin.y) * sin(angle);
out.y=(x-origin.x) * sin(angle) + (y-origin.y) * cos(angle); out.y += (temp_x - origin.x) * sin(angle) + (temp_y - origin.y) * cos(angle);
return out+origin; return out + origin;
} }
float x; float x;

61
xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
View File

@ -15,7 +15,6 @@
#endif #endif
namespace Slic3r namespace Slic3r
{ {
@ -50,8 +49,8 @@ public:
Writer& set_extrusion_flow(float flow) Writer& set_extrusion_flow(float flow)
{ m_extrusion_flow = flow; return *this; } { m_extrusion_flow = flow; return *this; }
Writer& set_rotation(WipeTower::xy pos,float angle) Writer& set_rotation(WipeTower::xy pos,float width,float depth,float angle)
{ m_wipe_tower_pos = pos; m_angle_deg = angle; return (*this); } { m_wipe_tower_pos = pos; m_wipe_tower_depth = depth; m_wipe_tower_width = width; m_angle_deg = angle; return (*this); }
// Suppress / resume G-code preview in Slic3r. Slic3r will have difficulty to differentiate the various // Suppress / resume G-code preview in Slic3r. Slic3r will have difficulty to differentiate the various
// filament loading and cooling moves from normal extrusion moves. Therefore the writer // filament loading and cooling moves from normal extrusion moves. Therefore the writer
@ -71,8 +70,8 @@ public:
float x() const { return m_current_pos.x; } float x() const { return m_current_pos.x; }
float y() const { return m_current_pos.y; } float y() const { return m_current_pos.y; }
const WipeTower::xy& pos() const { return m_current_pos; } const WipeTower::xy& pos() const { return m_current_pos; }
const WipeTower::xy start_pos_rotated() const { return m_start_pos.rotate(m_wipe_tower_pos,m_angle_deg); } const WipeTower::xy start_pos_rotated() const { return m_start_pos.rotate(m_wipe_tower_pos, m_wipe_tower_width, m_wipe_tower_depth, m_angle_deg); }
const WipeTower::xy pos_rotated() const { return m_current_pos.rotate(m_wipe_tower_pos,m_angle_deg); } const WipeTower::xy pos_rotated() const { return m_current_pos.rotate(m_wipe_tower_pos, m_wipe_tower_width, m_wipe_tower_depth, m_angle_deg); }
float elapsed_time() const { return m_elapsed_time; } float elapsed_time() const { return m_elapsed_time; }
// Extrude with an explicitely provided amount of extrusion. // Extrude with an explicitely provided amount of extrusion.
@ -87,9 +86,8 @@ public:
double len = sqrt(dx*dx+dy*dy); double len = sqrt(dx*dx+dy*dy);
// For rotated wipe tower, transform position to printer coordinates // For rotated wipe tower, transform position to printer coordinates
WipeTower::xy rotated_current_pos( m_current_pos.rotate(m_wipe_tower_pos,m_angle_deg) ); WipeTower::xy rotated_current_pos(m_current_pos.rotate(m_wipe_tower_pos, m_wipe_tower_width, m_wipe_tower_depth, m_angle_deg));
WipeTower::xy rot( WipeTower::xy(x,y).rotate(m_wipe_tower_pos,m_angle_deg ) ); WipeTower::xy rot(WipeTower::xy(x, y).rotate(m_wipe_tower_pos, m_wipe_tower_width, m_wipe_tower_depth, m_angle_deg));
if (! m_preview_suppressed && e > 0.f && len > 0.) { if (! m_preview_suppressed && e > 0.f && len > 0.) {
// Width of a squished extrusion, corrected for the roundings of the squished extrusions. // Width of a squished extrusion, corrected for the roundings of the squished extrusions.
@ -299,6 +297,8 @@ private:
const double m_filament_area = 0.25*M_PI*1.75*1.75; const double m_filament_area = 0.25*M_PI*1.75*1.75;
float m_angle_deg = 0; float m_angle_deg = 0;
WipeTower::xy m_wipe_tower_pos; WipeTower::xy m_wipe_tower_pos;
float m_wipe_tower_width;
float m_wipe_tower_depth;
std::string set_format_X(float x) { std::string set_format_X(float x) {
char buf[64]; char buf[64];
@ -543,18 +543,18 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::tool_change(unsigned int tool, boo
PrusaMultiMaterial::Writer writer; PrusaMultiMaterial::Writer writer;
writer.set_extrusion_flow(m_extrusion_flow) writer.set_extrusion_flow(m_extrusion_flow)
.set_z(m_z_pos) .set_z(m_z_pos)
.set_layer_height(m_layer_height) .set_layer_height(m_layer_height)
.set_initial_tool(m_current_tool) .set_initial_tool(m_current_tool)
.set_rotation(this->m_wipe_tower_pos,m_wipe_tower_rotation_angle) .set_rotation(m_wipe_tower_pos, m_wipe_tower_width, m_wipe_tower_depth, m_wipe_tower_rotation_angle)
.append(";--------------------\n" .append(";--------------------\n"
"; CP TOOLCHANGE START\n") "; CP TOOLCHANGE START\n")
.comment_with_value(" toolchange #", m_num_tool_changes) .comment_with_value(" toolchange #", m_num_tool_changes)
.comment_material(m_material[m_current_tool]) .comment_material(m_material[m_current_tool])
.append(";--------------------\n") .append(";--------------------\n")
.speed_override(100); .speed_override(100);
xy initial_position = ((m_current_shape == SHAPE_NORMAL) ? cleaning_box.ld : cleaning_box.lu) + xy initial_position = ((m_current_shape == SHAPE_NORMAL) ? cleaning_box.ld : cleaning_box.lu) +
xy(m_perimeter_width, ((m_current_shape == SHAPE_NORMAL) ? 1.f : -1.f) * m_perimeter_width); xy(m_perimeter_width, ((m_current_shape == SHAPE_NORMAL) ? 1.f : -1.f) * m_perimeter_width);
if (purpose == PURPOSE_MOVE_TO_TOWER || purpose == PURPOSE_MOVE_TO_TOWER_AND_EXTRUDE) { if (purpose == PURPOSE_MOVE_TO_TOWER || purpose == PURPOSE_MOVE_TO_TOWER_AND_EXTRUDE) {
@ -640,11 +640,12 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::toolchange_Brim(Purpose purpose, b
PrusaMultiMaterial::Writer writer; PrusaMultiMaterial::Writer writer;
writer.set_extrusion_flow(m_extrusion_flow * 1.1f) writer.set_extrusion_flow(m_extrusion_flow * 1.1f)
// Let the writer know the current Z position as a base for Z-hop. // Let the writer know the current Z position as a base for Z-hop.
.set_z(m_z_pos) .set_z(m_z_pos)
.set_layer_height(m_layer_height) .set_layer_height(m_layer_height)
.set_initial_tool(m_current_tool) .set_initial_tool(m_current_tool)
.set_rotation(this->m_wipe_tower_pos,m_wipe_tower_rotation_angle) .set_rotation(m_wipe_tower_pos, m_wipe_tower_width, m_wipe_tower_depth, m_wipe_tower_rotation_angle)
//.set_offset(xy(-))
.append( .append(
";-------------------------------------\n" ";-------------------------------------\n"
"; CP WIPE TOWER FIRST LAYER BRIM START\n"); "; CP WIPE TOWER FIRST LAYER BRIM START\n");
@ -866,7 +867,7 @@ void WipeTowerPrusaMM::toolchange_Load(
writer.extrude(xr, writer.y(), 1600); writer.extrude(xr, writer.y(), 1600);
bool colorInit = false; bool colorInit = false;
size_t pass = colorInit ? 1 : 2; size_t pass = colorInit ? 1 : 2;
float dy = ((m_current_shape == SHAPE_NORMAL) ? 1.f : -1.f) * m_perimeter_width * 0.85f; float dy = ((m_current_shape == SHAPE_NORMAL) ? 1.f : -1.f) * m_perimeter_width * 0.85f;
for (int i = 0; i < pass; ++ i) { for (int i = 0; i < pass; ++ i) {
writer.travel (xr, writer.y() + dy, 7200); writer.travel (xr, writer.y() + dy, 7200);
writer.extrude(xl, writer.y(), 2200); writer.extrude(xl, writer.y(), 2200);
@ -930,14 +931,14 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::finish_layer(Purpose purpose)
PrusaMultiMaterial::Writer writer; PrusaMultiMaterial::Writer writer;
writer.set_extrusion_flow(m_extrusion_flow) writer.set_extrusion_flow(m_extrusion_flow)
.set_z(m_z_pos) .set_z(m_z_pos)
.set_layer_height(m_layer_height) .set_layer_height(m_layer_height)
.set_initial_tool(m_current_tool) .set_initial_tool(m_current_tool)
.set_rotation(this->m_wipe_tower_pos,m_wipe_tower_rotation_angle) .set_rotation(m_wipe_tower_pos, m_wipe_tower_width, m_wipe_tower_depth, m_wipe_tower_rotation_angle)
.append(";--------------------\n" .append(";--------------------\n"
"; CP EMPTY GRID START\n") "; CP EMPTY GRID START\n")
// m_num_layer_changes is incremented by set_z, so it is 1 based. // m_num_layer_changes is incremented by set_z, so it is 1 based.
.comment_with_value(" layer #", m_num_layer_changes - 1); .comment_with_value(" layer #", m_num_layer_changes - 1);
// Slow down on the 1st layer. // Slow down on the 1st layer.
float speed_factor = m_is_first_layer ? 0.5f : 1.f; float speed_factor = m_is_first_layer ? 0.5f : 1.f;

7
xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
View File

@ -9,7 +9,6 @@
#include "WipeTower.hpp" #include "WipeTower.hpp"
namespace Slic3r namespace Slic3r
{ {
@ -86,6 +85,9 @@ public:
// Is this the last layer of the waste tower? // Is this the last layer of the waste tower?
bool is_last_layer) bool is_last_layer)
{ {
if (is_first_layer)
m_wipe_tower_depth = m_wipe_area * max_tool_changes; // tower depth (y-range) of the bottom
m_z_pos = print_z; m_z_pos = print_z;
m_layer_height = layer_height; m_layer_height = layer_height;
m_max_color_changes = max_tool_changes; m_max_color_changes = max_tool_changes;
@ -151,6 +153,8 @@ private:
xy m_wipe_tower_pos; xy m_wipe_tower_pos;
// Width of the wipe tower. // Width of the wipe tower.
float m_wipe_tower_width; float m_wipe_tower_width;
// Depth of the wipe tower (wipe_area * max_color_changes at the base)
float m_wipe_tower_depth;
// Per color Y span. // Per color Y span.
float m_wipe_area; float m_wipe_area;
// Wipe tower rotation angle in degrees (with respect to x axis // Wipe tower rotation angle in degrees (with respect to x axis
@ -171,6 +175,7 @@ private:
float m_retract = 4.f; float m_retract = 4.f;
// Width of an extrusion line, also a perimeter spacing for 100% infill. // Width of an extrusion line, also a perimeter spacing for 100% infill.
float m_perimeter_width = 0.5f; float m_perimeter_width = 0.5f;
// Extrusion flow is derived from m_perimeter_width, layer height and filament diameter. // Extrusion flow is derived from m_perimeter_width, layer height and filament diameter.
float m_extrusion_flow = 0.029f; float m_extrusion_flow = 0.029f;

2
xs/src/libslic3r/PrintConfig.cpp
View File

@ -1710,7 +1710,7 @@ PrintConfigDef::PrintConfigDef()
def = this->add("wipe_tower_rotation_angle", coFloat); def = this->add("wipe_tower_rotation_angle", coFloat);
def->label = "Wipe tower rotation angle"; def->label = "Wipe tower rotation angle";
def->tooltip = "Wipe tower rotation angle with respect to x-asis "; def->tooltip = "Wipe tower rotation angle with respect to x-axis ";
def->sidetext = "degrees"; def->sidetext = "degrees";
def->cli = "wipe-tower-rotation-angle=f"; def->cli = "wipe-tower-rotation-angle=f";
def->default_value = new ConfigOptionFloat(0.); def->default_value = new ConfigOptionFloat(0.);

5
xs/src/slic3r/GUI/3DScene.cpp
View File

@ -307,7 +307,10 @@ int GLVolumeCollection::load_wipe_tower_preview(
this->volumes.emplace_back(new GLVolume(color)); this->volumes.emplace_back(new GLVolume(color));
GLVolume &v = *this->volumes.back(); GLVolume &v = *this->volumes.back();
auto mesh = make_cube(width, depth, height); auto mesh = make_cube(width, depth, height);
mesh.rotate_z(rotation_angle*M_PI/180.); mesh.translate(-width/2.f,-depth/2.f,0.f);
Point origin_of_rotation(0.f,0.f);
mesh.rotate(rotation_angle,&origin_of_rotation);
v.indexed_vertex_array.load_mesh_flat_shading(mesh); v.indexed_vertex_array.load_mesh_flat_shading(mesh);
v.origin = Pointf3(pos_x, pos_y, 0.); v.origin = Pointf3(pos_x, pos_y, 0.);
// finalize_geometry() clears the vertex arrays, therefore the bounding box has to be computed before finalize_geometry(). // finalize_geometry() clears the vertex arrays, therefore the bounding box has to be computed before finalize_geometry().