mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-19 13:41:03 +00:00
harrierpigeon
ad6afce67b
Brings in upstream/belt-printer (the Sept 14 main merge) plus Hanif Koh's 21 review-fix commits from PR #15685, on top of the MachineKinematics refactor and the purge-prism / tree-support / first-layer-speed fixes. Conflict resolution: - BeltGCodeWriter is gone (kinematics refactor), so Hanif's plate-offset fix for it is ported into GCodeWriter: the first-layer-plane checks in travel_to_xy / travel_to_xyz / _travel_to_z now evaluate the plate-local point, and BeltGCode::init_belt_writer hands the stored plate origin to the writer it installs. - init_belt_writer(Print&) takes Hanif's signature; the BBL flag is set on the surviving writer by GCode::_do_export. - The shared emit_belt_brim_bands() loop keeps the BeltFloorObjectGuard the local branch added, so apron bands classify first-layer height against their own object. - eager_lift keeps effective_type: it now carries set_force_normal_lift(). - GCodeWriter's initializer list follows Hanif's member order with m_kinematics in its declared position. - TreeSupport::detect_overhangs uses Hanif's clamped build_plate_tilt_slope() for the non-belt path and the belt shear for the belt path.
74 lines
3.9 KiB
C++
74 lines
3.9 KiB
C++
#include "BeltGCode.hpp"
|
|
#include "GCodeWriter.hpp"
|
|
#include "GCode/BeltKinematics.hpp"
|
|
#include "BeltTransform.hpp"
|
|
#include "Print.hpp"
|
|
|
|
namespace Slic3r {
|
|
|
|
void BeltGCode::init_belt_writer(Print &print)
|
|
{
|
|
auto belt_writer = std::make_unique<GCodeWriter>();
|
|
// Axis remap and build volume max are set by base GCode after init_belt_writer
|
|
// returns; set_kinematics() replays them, so install order does not matter.
|
|
install_belt_kinematics(*belt_writer, print.config());
|
|
belt_writer->set_force_normal_lift(true);
|
|
// The plate origin was stored on the writer this one replaces.
|
|
belt_writer->set_xy_offset(m_gcode_offset.x(), m_gcode_offset.y());
|
|
m_writer = std::move(belt_writer);
|
|
}
|
|
|
|
void BeltGCode::write_belt_header(GCodeOutputStream &file, const Print &print)
|
|
{
|
|
const auto &full_cfg = print.full_print_config();
|
|
// Slicing rotation: the belt tilt (axis + angle) and the single source of truth
|
|
// for the physical tilt the G-code viewer uses to enable belt view.
|
|
file.write_format("; belt_slice_rotation = %s\n", full_cfg.opt_serialize("belt_slice_rotation").c_str());
|
|
file.write_format("; belt_slice_rotation_angle = %.1f\n", print.config().belt_slice_rotation_angle.value);
|
|
file.write_format("; belt_slice_rotation_global = %d\n", print.config().belt_slice_rotation_global.value ? 1 : 0);
|
|
// Pre-slice remap configs
|
|
file.write_format("; preslice_remap_x = %s\n", full_cfg.opt_serialize("preslice_remap_x").c_str());
|
|
file.write_format("; preslice_remap_y = %s\n", full_cfg.opt_serialize("preslice_remap_y").c_str());
|
|
file.write_format("; preslice_remap_z = %s\n", full_cfg.opt_serialize("preslice_remap_z").c_str());
|
|
file.write_format("; preslice_remap_global = %d\n", print.config().preslice_remap_global.value ? 1 : 0);
|
|
file.write_format("; belt_preslice_global = %d\n", print.config().belt_preslice_global.value ? 1 : 0);
|
|
// Machine-frame transform: shear (tan) + scale (1/cos) derived from the belt
|
|
// tilt angle (or belt_frame_tilt_angle when decoupled).
|
|
file.write_format("; belt_frame_tilt_decouple = %d\n", print.config().belt_frame_tilt_decouple.value ? 1 : 0);
|
|
file.write_format("; belt_frame_tilt_angle = %.1f\n", print.config().belt_frame_tilt_angle.value);
|
|
}
|
|
|
|
void BeltGCode::on_set_origin(const PrintObject * /*obj*/, const Point & /*inst_shift*/)
|
|
{
|
|
// Global pre-slice mode: adjust origin using computed correction.
|
|
// Transform the origin through the belt pipeline so that
|
|
// back_transform(T * origin) = origin (correct machine position).
|
|
//
|
|
// Flags that trigger this path:
|
|
// belt_preslice_global — full pipeline (rotation * remap) is global
|
|
// preslice_remap_global — only the pre-slice remap is global
|
|
// belt_slice_rotation_global — slicing rotation treated as global (matches
|
|
// the per-instance Z-offset added in PrintObjectSlice.cpp)
|
|
// The XY origin adjustment uses the FULL forward transform, because the
|
|
// back_transform applied during G-code emission is always the inverse of
|
|
// the full pipeline.
|
|
bool use_global = m_config.belt_preslice_global.value
|
|
|| (m_config.preslice_remap_global.value
|
|
&& BeltTransformPipeline::has_preslice_remap(m_config))
|
|
|| (m_config.belt_slice_rotation_global.value
|
|
&& m_config.belt_slice_rotation.value != BeltRotationAxis::None
|
|
&& std::abs(m_config.belt_slice_rotation_angle.value) > EPSILON);
|
|
if (!use_global)
|
|
return;
|
|
|
|
// Adjust origin: transform through belt forward pipeline so that
|
|
// the back-transform correctly recovers model-space positions.
|
|
Transform3d T = BeltTransformPipeline::build_forward_transform(m_config);
|
|
Vec2d cur_origin = this->origin();
|
|
Vec3d origin3d(cur_origin.x(), cur_origin.y(), 0.);
|
|
Vec3d adjusted = T.linear() * origin3d;
|
|
this->set_origin(Vec2d(adjusted.x(), adjusted.y()));
|
|
}
|
|
|
|
} // namespace Slic3r
|