mirror of
https://github.com/QIDITECH/QIDIStudio.git
synced 2026-02-07 20:31:49 +03:00
update slic3r
This commit is contained in:
@@ -247,8 +247,6 @@ std::optional<float> calc_angle(const Selection &selection)
|
||||
|
||||
Transform3d to_world = gl_volume->world_matrix();
|
||||
const ModelVolume *volume = get_model_volume(*gl_volume, selection.get_model()->objects);
|
||||
assert(volume != nullptr);
|
||||
assert(volume->emboss_shape.has_value());
|
||||
if (volume == nullptr || !volume->emboss_shape.has_value() || !volume->emboss_shape->fix_3mf_tr)
|
||||
return Emboss::calc_up(to_world, UP_LIMIT);
|
||||
|
||||
@@ -391,7 +389,8 @@ void do_local_z_rotate(Selection &selection, double relative_angle) {
|
||||
|
||||
bool is_single_volume = selection.volumes_count() == 1;
|
||||
assert(is_single_volume);
|
||||
if (!is_single_volume) return;
|
||||
if (!is_single_volume)
|
||||
return;
|
||||
|
||||
// Fix angle for mirrored volume
|
||||
bool is_mirrored = false;
|
||||
@@ -431,7 +430,8 @@ void do_local_z_move(Selection &selection, double relative_move) {
|
||||
|
||||
TransformationType get_drag_transformation_type(const Selection &selection)
|
||||
{
|
||||
return is_embossed_object(selection) ?
|
||||
bool is_embossed = is_embossed_object(selection);
|
||||
return is_embossed ?
|
||||
TransformationType::Instance_Relative_Joint :
|
||||
TransformationType::Local_Relative_Joint;
|
||||
}
|
||||
@@ -714,3 +714,16 @@ const Transform3d *get_fix_transformation(const Selection &selection) {
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
namespace Slic3r::GUI {
|
||||
Transform3d get_drag_volume_transformation(Transform3d world,
|
||||
const Vec3d & world_dir,
|
||||
const Vec3d & world_position,
|
||||
const std::optional<Transform3d> &fix,
|
||||
const Transform3d & instance_inv,
|
||||
std::optional<float> current_angle,
|
||||
const std::optional<double> & up_limit)
|
||||
{
|
||||
return get_volume_transformation(world, world_dir, world_position, fix, instance_inv, current_angle, up_limit);
|
||||
}
|
||||
} // namespace Slic3r::GUI
|
||||
|
||||
Reference in New Issue
Block a user