mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-17 16:02:11 +00:00
Part 2.6: Add belt floor support clipping for all support types
- Fix support clipping z-shift calculation by removing coordinate-space mismatch and sync belt_floor_z_shift with global_z_offset; fix invalidation so posSupportMaterial no longer resets slicing params - Add belt floor polygon clipping to non-organic tree support (slim/strong/hybrid) with collision surface integration in TreeSupportData, belt extension layers, and first-layer brim suppression - Add belt floor clipping to organic tree support pipeline with virtual belt raft layers, per-layer polygons in TreeModelVolumes, and post-generation layer trimming; fix pre-existing processing_last_mesh bug in calculateCollision() Fix belt floor support clipping: z-shift, invalidation, and global offset - Fix support clipping z-shift calculation by removing coordinate-space mismatch (raw_bounding_box min.z vs trafo_centered m_belt_min_z) and sync belt_floor_z_shift with global_z_offset in global shear mode - Fix invalidation so posSupportMaterial no longer resets slicing params, preventing the exact posSlice z-shift from being overwritten by the bounding-box approximation on support-only setting changes - Remove double-counting of global z_offset on support layers — support already inherits the offset from object layers during generation This Work Was Co-Authored-By Claude Opus 4.6 (1M context) <noreply@anthropic.com> UI: gray out inactive belt sub-options, rename to mesh transforms, move to Advanced Fix mesh clipping through build plate after belt shear/scale transform Generalize G-code viewer designed-view toggle for full belt transform Clip support layers to transformed belt floor plane Supports below the tilted build plate (Z = shear_factor * from_axis - min_z) are now clipped via half-plane intersection after generation. Belt floor parameters stored in SlicingParameters and populated in both update_slicing_parameters() and the static slicing_parameters() overload. Make belt G-code viewer toggle more prominent, add B keyboard shortcut - Add separator + teal "Belt Printer" header in legend panel - Append [B] hint to checkbox label - Add B key shortcut in GLCanvas3D to toggle designed/machine view - Read belt_printer_angle from loaded G-code headers to enable belt view Add per-axis global transform option for belt printer shear New belt_shear_{x,y,z}_global bool configs. When enabled, shear incorporates instance shift so objects at different bed positions get position-aware transform (Z += factor * instance_shift_on_from_axis). Fix global shear: use layer Z offset instead of mesh transform, add config invalidation - Global shear offset applied as post-slicing layer print_z adjustment instead of mesh transform (which was absorbed by min_z normalization or shifted mesh out of slice range) - Register all belt transform options in Print::invalidate_state_by_config_options to trigger posSlice re-slicing (the fallback only invalidated Print steps, not PrintObject steps — belt changes had no effect without manual re-slice) - Belt gcode remap options added to steps_gcode (gcode-export only) - Skip empty-first-layer check for belt objects with global Z offset WIP: split instances for global shear, relative Z offsets, debug logging - PrintApply: when belt global mode active, prevent instance grouping by adding unique Z perturbation to trafo — each copy becomes its own PrintObject with independent layers - PrintObjectSlice: compute global Z offset relative to minimum Y shift across all PrintObjects (lowest-Y object stays at Z=0) - Debug logging (warning level) for belt global shift values and offsets Known issues: - Cached posSlice results cause stale offsets when mixing copies with individually-added objects — need to compute min baseline outside slice() - Supports still generate to Z=0 instead of object's global Z offset Fix global shear for copied objects: disable shared-object layer optimization When belt global Z shear is active, each object needs unique layer Z values based on its bed position. The shared-object optimization was causing copies to reuse the source object's layers (and its Z offset) instead of computing their own position-based offset. started work on getting supports to work properly one step forward, one step back this version didn't quite work. Getting somewhere though about to add UI controllable tests added configuration options for supports tweak CLAUDE.md to be more aggressive for my machine. This commit should probably be pulled out before contributing upstream still chasing down some bugs moving objects between slices no longer results in improper Z-height because of caching added more data to the debug logs Z offset is getting more global again still not quite there, I think there's a fundamental logic flaw? hunting for bugs finally have a functional fix Add belt floor clipping to tree supports (organic and non-organic) - Add belt floor polygon clipping to non-organic tree support (slim/strong/hybrid) in draw_circles() and terminate nodes at the belt surface instead of the horizontal build plate - Add belt floor clipping to organic tree support pipeline with virtual belt raft layers for sub-floor branch generation, per-layer belt floor polygons in TreeModelVolumes, and post-generation layer trimming - Fix pre-existing processing_last_mesh bug in TreeModelVolumes that prevented m_anti_overhang (support blockers) from ever being applied; skip empty first layer check for belt printers Commits: current approach: make a face surface to build supports to closer! supports now terminate on shear plane, now need to get shear plane to correct Z height nearly there chasing down logic issues still committing for checkpoint, this still does not work still got logic problems... cull support clipping stashing changes for now. Going to focus on getting the global shear OFF support generation dialed first. beginning per object shear calcs Local shear transform is on correct Z offset now local shear finally works now and needs more testing global shear works now, needs thorough testing debugging non-45 degree angles debugging part 2 supports at all angles work now remove debug logging Add belt floor collision to non-organic tree support pipeline - Integrate belt floor as a collision surface in TreeSupportData so branches route around the belt naturally, replacing the explicit termination checks in drop_nodes() - Add belt extension layers below the object after draw_circles() to allow support geometry to extend to the diagonal belt surface instead of terminating at a horizontal first layer - Fix coordinate overflow in belt floor polygons (scale_(1e4) exceeds int32), skip first-layer brim expansion for belt printers, and extend empty first layer check bypass to all belt modes add debug logging, Z translate for tree supports still not seeing any cutoff surface yet adding debug options attempt #2 at trees if hit Z buildplate stop but don't set to_buildplate true getting closer tree support almost there, just need to get rid of the circles at the beginning getting closer belt / shear plane clip works, need to figure out the buidlplate plane issues more logic, added debugging logs supports now extend somewhat below Z=0 in global shear mode fix bad alloc, add 10mm below build plate fully works now shear transform + prusa tree support generation works now. pull out debug logging
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
#include "MutablePolygon.hpp"
|
||||
#include "PrintConfig.hpp"
|
||||
#include "Support/SupportMaterial.hpp"
|
||||
#include "Support/SupportCommon.hpp"
|
||||
#include "Support/SupportSpotsGenerator.hpp"
|
||||
#include "Support/TreeSupport.hpp"
|
||||
#include "Surface.hpp"
|
||||
@@ -1365,7 +1366,12 @@ bool PrintObject::invalidate_step(PrintObjectStep step)
|
||||
} else if (step == posSupportMaterial) {
|
||||
invalidated |= this->invalidate_steps({ posSimplifySupportPath });
|
||||
invalidated |= m_print->invalidate_steps({ psSkirtBrim });
|
||||
m_slicing_params.valid = false;
|
||||
// NOTE: do NOT set m_slicing_params.valid = false here.
|
||||
// belt_floor_z_shift is patched to an exact value during posSlice
|
||||
// (PrintObjectSlice.cpp, after slice_volumes). Invalidating slicing
|
||||
// params here causes update_slicing_parameters() to overwrite that
|
||||
// exact value with a bounding-box approximation, while posSlice does
|
||||
// not re-run to correct it — breaking belt support clipping.
|
||||
}
|
||||
|
||||
// Wipe tower depends on the ordering of extruders, which in turn depends on everything.
|
||||
@@ -3392,6 +3398,10 @@ void PrintObject::update_slicing_parameters()
|
||||
// Orca: updated function call for XYZ shrinkage compensation
|
||||
if (!m_slicing_params.valid) {
|
||||
coordf_t object_height = this->model_object()->max_z();
|
||||
// Belt floor parameters for support clipping (populated below if belt Z-shear is active).
|
||||
double belt_floor_shear_factor_out = 0.0;
|
||||
int belt_floor_from_axis_out = 1;
|
||||
double belt_floor_z_shift_out = 0.0;
|
||||
// Belt shear/scale may change the effective Z height.
|
||||
const auto &pcfg = this->print()->config();
|
||||
if (pcfg.belt_printer.value) {
|
||||
@@ -3435,6 +3445,12 @@ void PrintObject::update_slicing_parameters()
|
||||
max_rz = std::max(max_rz, new_z);
|
||||
}
|
||||
object_height = max_rz - min_rz;
|
||||
belt_floor_shear_factor_out = shear_factor;
|
||||
belt_floor_from_axis_out = from;
|
||||
// Belt contact surface starts at bb.min.z() pre-shear; add the
|
||||
// slicing Z-shift that keeps the mesh above Z=0.
|
||||
// Exact value is patched after slice_volumes() in posSlice.
|
||||
belt_floor_z_shift_out = bb.min.z() + ((min_rz < 0.) ? -min_rz : 0.);
|
||||
} else {
|
||||
object_height *= scale_z;
|
||||
}
|
||||
@@ -3442,6 +3458,10 @@ void PrintObject::update_slicing_parameters()
|
||||
}
|
||||
m_slicing_params = SlicingParameters::create_from_config(pcfg, m_config, object_height,
|
||||
this->object_extruders(), this->print()->shrinkage_compensation());
|
||||
// Populate belt floor parameters into slicing params for support clipping.
|
||||
m_slicing_params.belt_floor_shear_factor = belt_floor_shear_factor_out;
|
||||
m_slicing_params.belt_floor_from_axis = belt_floor_from_axis_out;
|
||||
m_slicing_params.belt_floor_z_shift = belt_floor_z_shift_out;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3479,6 +3499,11 @@ SlicingParameters PrintObject::slicing_parameters(const DynamicPrintConfig &full
|
||||
sort_remove_duplicates(object_extruders);
|
||||
//FIXME add painting extruders
|
||||
|
||||
// Belt floor parameters for support clipping (populated below if belt Z-shear is active).
|
||||
double belt_floor_shear_factor_out = 0.0;
|
||||
int belt_floor_from_axis_out = 1;
|
||||
double belt_floor_z_shift_out = 0.0;
|
||||
|
||||
if (object_max_z <= 0.f) {
|
||||
BoundingBoxf3 bb = model_object.raw_bounding_box();
|
||||
object_max_z = (float)bb.size().z();
|
||||
@@ -3523,13 +3548,20 @@ SlicingParameters PrintObject::slicing_parameters(const DynamicPrintConfig &full
|
||||
max_rz = std::max(max_rz, new_z);
|
||||
}
|
||||
object_max_z = (float)(max_rz - min_rz);
|
||||
belt_floor_shear_factor_out = shear_factor;
|
||||
belt_floor_from_axis_out = from;
|
||||
belt_floor_z_shift_out = bb.min.z() + ((min_rz < 0.) ? -min_rz : 0.);
|
||||
} else {
|
||||
object_max_z *= (float)scale_z;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return SlicingParameters::create_from_config(print_config, object_config, object_max_z, object_extruders, object_shrinkage_compensation);
|
||||
SlicingParameters params = SlicingParameters::create_from_config(print_config, object_config, object_max_z, object_extruders, object_shrinkage_compensation);
|
||||
params.belt_floor_shear_factor = belt_floor_shear_factor_out;
|
||||
params.belt_floor_from_axis = belt_floor_from_axis_out;
|
||||
params.belt_floor_z_shift = belt_floor_z_shift_out;
|
||||
return params;
|
||||
}
|
||||
|
||||
// returns 0-based indices of extruders used to print the object (without brim, support and other helper extrusions)
|
||||
@@ -4038,6 +4070,67 @@ void PrintObject::combine_infill()
|
||||
}
|
||||
}
|
||||
|
||||
// Belt printer: clip an ExtrusionEntityCollection to a region defined by clip_expoly.
|
||||
// Handles ExtrusionPath, ExtrusionMultiPath, ExtrusionLoop, and nested ExtrusionEntityCollection.
|
||||
static void clip_support_fills(ExtrusionEntityCollection &fills, const ExPolygons &clip_region)
|
||||
{
|
||||
ExtrusionEntitiesPtr new_entities;
|
||||
for (ExtrusionEntity *entity : fills.entities) {
|
||||
if (auto *path = dynamic_cast<ExtrusionPath *>(entity)) {
|
||||
ExtrusionEntityCollection clipped;
|
||||
path->intersect_expolygons(clip_region, &clipped);
|
||||
if (!clipped.empty()) {
|
||||
for (ExtrusionEntity *e : clipped.entities)
|
||||
new_entities.push_back(e->clone());
|
||||
}
|
||||
delete entity;
|
||||
} else if (auto *multipath = dynamic_cast<ExtrusionMultiPath *>(entity)) {
|
||||
ExtrusionPaths new_paths;
|
||||
for (const ExtrusionPath &p : multipath->paths) {
|
||||
ExtrusionEntityCollection clipped;
|
||||
p.intersect_expolygons(clip_region, &clipped);
|
||||
for (ExtrusionEntity *e : clipped.entities)
|
||||
if (auto *cp = dynamic_cast<ExtrusionPath *>(e))
|
||||
new_paths.push_back(std::move(*cp));
|
||||
}
|
||||
if (!new_paths.empty()) {
|
||||
multipath->paths = std::move(new_paths);
|
||||
new_entities.push_back(multipath);
|
||||
} else {
|
||||
delete entity;
|
||||
}
|
||||
} else if (auto *loop = dynamic_cast<ExtrusionLoop *>(entity)) {
|
||||
ExtrusionPaths new_paths;
|
||||
for (const ExtrusionPath &p : loop->paths) {
|
||||
ExtrusionEntityCollection clipped;
|
||||
p.intersect_expolygons(clip_region, &clipped);
|
||||
for (ExtrusionEntity *e : clipped.entities)
|
||||
if (auto *cp = dynamic_cast<ExtrusionPath *>(e))
|
||||
new_paths.push_back(std::move(*cp));
|
||||
}
|
||||
if (!new_paths.empty()) {
|
||||
// Loop is no longer a closed loop after clipping; emit as individual paths.
|
||||
for (auto &p : new_paths)
|
||||
new_entities.push_back(new ExtrusionPath(std::move(p)));
|
||||
delete entity;
|
||||
} else {
|
||||
delete entity;
|
||||
}
|
||||
} else if (auto *coll = dynamic_cast<ExtrusionEntityCollection *>(entity)) {
|
||||
clip_support_fills(*coll, clip_region);
|
||||
if (!coll->empty()) {
|
||||
new_entities.push_back(coll);
|
||||
} else {
|
||||
delete entity;
|
||||
}
|
||||
} else {
|
||||
// Unknown entity type — keep as-is.
|
||||
new_entities.push_back(entity);
|
||||
}
|
||||
}
|
||||
fills.entities = std::move(new_entities);
|
||||
}
|
||||
|
||||
void PrintObject::_generate_support_material()
|
||||
{
|
||||
if (is_tree(m_config.support_type.value)) {
|
||||
@@ -4049,6 +4142,25 @@ void PrintObject::_generate_support_material()
|
||||
PrintObjectSupportMaterial support_material(this, m_slicing_params);
|
||||
support_material.generate(*this);
|
||||
}
|
||||
// Global Z offset for support layers:
|
||||
// - Normal support: layers already inherit global_z_offset from object layers.
|
||||
// - Non-organic tree support (slim/strong/hybrid): plan_layer_heights() reads
|
||||
// from globally-offset object layers, so support layers already have it.
|
||||
// - Organic tree support: generate_tree_support_3D() computes its own Z values
|
||||
// independently and does NOT inherit the offset — apply it here.
|
||||
// Belt floor polygon clipping for non-organic tree support is done inside
|
||||
// draw_circles() before area_groups and toolpaths are built.
|
||||
if (is_tree(m_config.support_type.value) && std::abs(m_belt_global_z_offset) > EPSILON) {
|
||||
// Resolve effective support style (same logic as SupportParameters).
|
||||
auto style = m_config.support_style.value;
|
||||
if (style == smsDefault)
|
||||
style = smsTreeOrganic;
|
||||
if (style == smsTreeOrganic) {
|
||||
for (SupportLayer *sl : m_support_layers)
|
||||
sl->print_z += m_belt_global_z_offset;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// BBS
|
||||
|
||||
Reference in New Issue
Block a user