disable prime tower preview
This commit is contained in:
parent
2406a34bf7
commit
4a7d298786
1 changed files with 20 additions and 19 deletions
|
@ -3196,26 +3196,27 @@ void GCodeViewer::load_shells(const Print& print, bool initialized, bool force_p
|
|||
object_count++;
|
||||
}
|
||||
|
||||
if (wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptFFF) {
|
||||
// BBS: adds wipe tower's volume
|
||||
std::vector<unsigned int> print_extruders = print.extruders(true);
|
||||
int extruders_count = print_extruders.size();
|
||||
// Orca: disable wipe tower shell
|
||||
// if (wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptFFF) {
|
||||
// // BBS: adds wipe tower's volume
|
||||
// std::vector<unsigned int> print_extruders = print.extruders(true);
|
||||
// int extruders_count = print_extruders.size();
|
||||
|
||||
const double max_z = print.objects()[0]->model_object()->get_model()->bounding_box().max(2);
|
||||
const PrintConfig& config = print.config();
|
||||
if (config.enable_prime_tower &&
|
||||
(print.enable_timelapse_print() || (extruders_count > 1 && (config.print_sequence == PrintSequence::ByLayer)))) {
|
||||
const float depth = print.wipe_tower_data(extruders_count).depth;
|
||||
const float brim_width = print.wipe_tower_data(extruders_count).brim_width;
|
||||
// const double max_z = print.objects()[0]->model_object()->get_model()->bounding_box().max(2);
|
||||
// const PrintConfig& config = print.config();
|
||||
// if (config.enable_prime_tower &&
|
||||
// (print.enable_timelapse_print() || (extruders_count > 1 && (config.print_sequence == PrintSequence::ByLayer)))) {
|
||||
// const float depth = print.wipe_tower_data(extruders_count).depth;
|
||||
// const float brim_width = print.wipe_tower_data(extruders_count).brim_width;
|
||||
|
||||
int plate_idx = print.get_plate_index();
|
||||
Vec3d plate_origin = print.get_plate_origin();
|
||||
double wipe_tower_x = config.wipe_tower_x.get_at(plate_idx) + plate_origin(0);
|
||||
double wipe_tower_y = config.wipe_tower_y.get_at(plate_idx) + plate_origin(1);
|
||||
m_shells.volumes.load_wipe_tower_preview(1000, wipe_tower_x, wipe_tower_y, config.prime_tower_width, depth, max_z, config.wipe_tower_rotation_angle,
|
||||
!print.is_step_done(psWipeTower), brim_width, initialized);
|
||||
}
|
||||
}
|
||||
// int plate_idx = print.get_plate_index();
|
||||
// Vec3d plate_origin = print.get_plate_origin();
|
||||
// double wipe_tower_x = config.wipe_tower_x.get_at(plate_idx) + plate_origin(0);
|
||||
// double wipe_tower_y = config.wipe_tower_y.get_at(plate_idx) + plate_origin(1);
|
||||
// m_shells.volumes.load_wipe_tower_preview(1000, wipe_tower_x, wipe_tower_y, config.prime_tower_width, depth, max_z, config.wipe_tower_rotation_angle,
|
||||
// !print.is_step_done(psWipeTower), brim_width, initialized);
|
||||
// }
|
||||
// }
|
||||
|
||||
// remove modifiers
|
||||
while (true) {
|
||||
|
@ -4138,7 +4139,7 @@ void GCodeViewer::render_shells()
|
|||
m_shells.volumes.render(GLVolumeCollection::ERenderType::Transparent, false, wxGetApp().plater()->get_camera().get_view_matrix());
|
||||
shader->stop_using();
|
||||
|
||||
// glsafe(::glDepthMask(GL_TRUE));
|
||||
// glsafe(::glDepthMask(GL_TRUE));
|
||||
}
|
||||
|
||||
//BBS
|
||||
|
|
Loading…
Reference in a new issue