diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index da62523ed..a8b4e88a0 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -1533,12 +1533,8 @@ sub increase { for my $i (1..$copies) { $instance = $model_object->add_instance( offset => Slic3r::Pointf->new(map 10+$_, @{$instance->offset}), - z_translation => $instance->z_translation, scaling_factor => $instance->scaling_factor, - scaling_vector => $instance->scaling_vector, rotation => $instance->rotation, - x_rotation => $instance->x_rotation, - y_rotation => $instance->y_rotation, ); $self->{print}->objects->[$obj_idx]->add_copy($instance->offset); } @@ -3387,10 +3383,10 @@ sub make_thumbnail { my $mesh = $model->objects->[$obj_idx]->raw_mesh; # Apply x, y rotations and scaling vector in case of reading a 3MF model object. - my $model_instance = $model->objects->[$obj_idx]->instances->[0]; - $mesh->rotate_x($model_instance->x_rotation); - $mesh->rotate_y($model_instance->y_rotation); - $mesh->scale_xyz($model_instance->scaling_vector); + #my $model_instance = $model->objects->[$obj_idx]->instances->[0]; + #$mesh->rotate_x($model_instance->x_rotation); + #$mesh->rotate_y($model_instance->y_rotation); + #$mesh->scale_xyz($model_instance->scaling_vector); if ($mesh->facets_count <= 5000) { # remove polygons with area <= 1mm diff --git a/lib/Slic3r/Model.pm b/lib/Slic3r/Model.pm index 8f75e91ab..8cd34a08d 100644 --- a/lib/Slic3r/Model.pm +++ b/lib/Slic3r/Model.pm @@ -128,18 +128,18 @@ sub add_instance { $new_instance->set_rotation($args{rotation}) if defined $args{rotation}; - $new_instance->set_x_rotation($args{x_rotation}) - if defined $args{x_rotation}; - $new_instance->set_y_rotation($args{y_rotation}) - if defined $args{y_rotation}; +# $new_instance->set_x_rotation($args{x_rotation}) +# if defined $args{x_rotation}; +# $new_instance->set_y_rotation($args{y_rotation}) +# if defined $args{y_rotation}; $new_instance->set_scaling_factor($args{scaling_factor}) if defined $args{scaling_factor}; - $new_instance->set_scaling_vector($args{scaling_vector}) - if defined $args{scaling_vector}; +# $new_instance->set_scaling_vector($args{scaling_vector}) +# if defined $args{scaling_vector}; $new_instance->set_offset($args{offset}) if defined $args{offset}; - $new_instance->set_z_translation($args{z_translation}) - if defined $args{z_translation}; +# $new_instance->set_z_translation($args{z_translation}) +# if defined $args{z_translation}; return $new_instance; } diff --git a/xs/src/libslic3r/IO/TMF.cpp b/xs/src/libslic3r/IO/TMF.cpp index a8a2a7e8c..b22423398 100644 --- a/xs/src/libslic3r/IO/TMF.cpp +++ b/xs/src/libslic3r/IO/TMF.cpp @@ -845,17 +845,17 @@ void TMFParserContext::apply_transformation(ModelInstance *instance, std::vector &transformations) { // Apply scale. - instance->scaling_vector = Pointf3(transformations[3], transformations[4], transformations[5]);; + // instance->scaling_vector = Pointf3(transformations[3], transformations[4], transformations[5]);; // Apply x, y & z rotation. instance->rotation = transformations[8]; - instance->x_rotation = transformations[6]; - instance->y_rotation = transformations[7]; + // instance->x_rotation = transformations[6]; + // instance->y_rotation = transformations[7]; // Apply translation. instance->offset.x = transformations[0]; instance->offset.y = transformations[1]; - instance->z_translation = transformations[2]; + // instance->z_translation = transformations[2]; return; } diff --git a/xs/xsp/Model.xsp b/xs/xsp/Model.xsp index 67bca3fd3..be41c328e 100644 --- a/xs/xsp/Model.xsp +++ b/xs/xsp/Model.xsp @@ -315,33 +315,17 @@ ModelMaterial::attributes() double rotation() %code%{ RETVAL = THIS->rotation; %}; - double x_rotation() - %code%{ RETVAL = THIS->x_rotation; %}; - double y_rotation() - %code%{ RETVAL = THIS->y_rotation; %}; double scaling_factor() %code%{ RETVAL = THIS->scaling_factor; %}; - Ref scaling_vector() - %code%{ RETVAL = &THIS->scaling_vector; %}; Ref offset() %code%{ RETVAL = &THIS->offset; %}; - double z_translation() - %code%{ RETVAL = THIS->z_translation; %}; void set_rotation(double val) %code%{ THIS->rotation = val; %}; - void set_x_rotation(double val) - %code%{ THIS->x_rotation = val; %}; - void set_y_rotation(double val) - %code%{ THIS->y_rotation = val; %}; void set_scaling_factor(double val) %code%{ THIS->scaling_factor = val; %}; - void set_scaling_vector(Pointf3 *vec) - %code%{ THIS->scaling_vector = *vec; %}; void set_offset(Pointf *offset) %code%{ THIS->offset = *offset; %}; - void set_z_translation(double val) - %code%{ THIS->z_translation = val; %}; void transform_mesh(TriangleMesh* mesh, bool dont_translate = false) const; void transform_polygon(Polygon* polygon) const;