Wipe tower rotation around center point

xs/src/libslic3r/GCode/WipeTower.hpp

@@ -25,12 +25,15 @@ public:
 		bool operator!=(const xy &rhs) const { return x != rhs.x || y != rhs.y; }
 		
 		// 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);
+			float temp_x = x - width / 2.f;
+			float temp_y = y - depth / 2.f;
 			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;

xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp

@@ -15,7 +15,6 @@
 #endif
 
 
-
 namespace Slic3r
 {
 
@@ -50,8 +49,8 @@ public:
 	Writer& 			 set_extrusion_flow(float flow)
 		{ 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
 	// 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                y()     const { return m_current_pos.y; }
 	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; }
 
 	// Extrude with an explicitely provided amount of extrusion.
@@ -87,9 +86,8 @@ public:
 		double len = sqrt(dx*dx+dy*dy);
 		
 		// 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.) {
 			// 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;
 	float   	  m_angle_deg = 0;
 	WipeTower::xy m_wipe_tower_pos;
+	float 		  m_wipe_tower_width;
+	float		  m_wipe_tower_depth;
 
 	std::string   set_format_X(float x) {
 		char buf[64];
@@ -546,7 +546,7 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::tool_change(unsigned int tool, boo
 		.set_z(m_z_pos)
 		.set_layer_height(m_layer_height)
 		.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"
 				"; CP TOOLCHANGE START\n")
 		.comment_with_value(" toolchange #", m_num_tool_changes)
@@ -644,7 +644,8 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::toolchange_Brim(Purpose purpose, b
 		  .set_z(m_z_pos)
 		  .set_layer_height(m_layer_height)
 		  .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(
 			";-------------------------------------\n"
 			"; CP WIPE TOWER FIRST LAYER BRIM START\n");
@@ -933,7 +934,7 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::finish_layer(Purpose purpose)
 		.set_z(m_z_pos)
 		.set_layer_height(m_layer_height)
 		.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"
 				"; CP EMPTY GRID START\n")
 		// m_num_layer_changes is incremented by set_z, so it is 1 based.

xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp

@@ -9,7 +9,6 @@
 #include "WipeTower.hpp"
 
 
-
 namespace Slic3r
 {
 
@@ -86,6 +85,9 @@ public:
 		// Is this the last layer of the waste tower?
 		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_layer_height			= layer_height;
 		m_max_color_changes 	= max_tool_changes;
@@ -151,6 +153,8 @@ private:
 	xy     			m_wipe_tower_pos;
 	// Width of the wipe tower.
 	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.
 	float  			m_wipe_area;
 	// Wipe tower rotation angle in degrees (with respect to x axis
@@ -171,6 +175,7 @@ private:
 	float  			m_retract		 = 4.f;
 	// Width of an extrusion line, also a perimeter spacing for 100% infill.
 	float  			m_perimeter_width = 0.5f;
+	
 	// Extrusion flow is derived from m_perimeter_width, layer height and filament diameter.
 	float  			m_extrusion_flow  = 0.029f;
 

xs/src/libslic3r/PrintConfig.cpp

@@ -1710,7 +1710,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("wipe_tower_rotation_angle", coFloat);
     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->cli = "wipe-tower-rotation-angle=f";
     def->default_value = new ConfigOptionFloat(0.);

xs/src/slic3r/GUI/3DScene.cpp

@@ -307,7 +307,10 @@ int GLVolumeCollection::load_wipe_tower_preview(
     this->volumes.emplace_back(new GLVolume(color));
     GLVolume &v = *this->volumes.back();
     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.origin = Pointf3(pos_x, pos_y, 0.);
     // finalize_geometry() clears the vertex arrays, therefore the bounding box has to be computed before finalize_geometry().