GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-16 02:31:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

New --rotate-x and --rotate-y CLI options

Browse Source
This commit is contained in:
Alessandro Ranellucci 2016-12-18 00:42:43 +01:00
parent c79444a3d7
commit d0f22196ad
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r.cpp
View File

@ -89,7 +89,10 @@ main(const int argc, const char **argv)
if (cli_config.scale_to_fit.is_positive_volume()) if (cli_config.scale_to_fit.is_positive_volume())
(*o)->scale_to_fit(cli_config.scale_to_fit.value); (*o)->scale_to_fit(cli_config.scale_to_fit.value);
// TODO: honor option order?
(*o)->scale(cli_config.scale.value); (*o)->scale(cli_config.scale.value);
(*o)->rotate(Geometry::deg2rad(cli_config.rotate_x.value), X);
(*o)->rotate(Geometry::deg2rad(cli_config.rotate_y.value), Y);
(*o)->rotate(Geometry::deg2rad(cli_config.rotate.value), Z); (*o)->rotate(Geometry::deg2rad(cli_config.rotate.value), Z);
} }

2
xs/src/libslic3r/Model.cpp
View File

@ -617,6 +617,7 @@ ModelObject::scale(float factor)
void void
ModelObject::scale(const Pointf3 &versor) ModelObject::scale(const Pointf3 &versor)
{ {
if (versor.x == 1 && versor.y == 1 && versor.z == 1) return;
for (ModelVolumePtrs::const_iterator v = this->volumes.begin(); v != this->volumes.end(); ++v) { for (ModelVolumePtrs::const_iterator v = this->volumes.begin(); v != this->volumes.end(); ++v) {
(*v)->mesh.scale(versor); (*v)->mesh.scale(versor);
} }
@ -643,6 +644,7 @@ ModelObject::scale_to_fit(const Sizef3 &size)
void void
ModelObject::rotate(float angle, const Axis &axis) ModelObject::rotate(float angle, const Axis &axis)
{ {
if (angle == 0) return;
for (ModelVolumePtrs::const_iterator v = this->volumes.begin(); v != this->volumes.end(); ++v) { for (ModelVolumePtrs::const_iterator v = this->volumes.begin(); v != this->volumes.end(); ++v) {
(*v)->mesh.rotate(angle, axis); (*v)->mesh.rotate(angle, axis);
} }

12
xs/src/libslic3r/PrintConfig.cpp
View File

@ -1464,6 +1464,18 @@ CLIConfigDef::CLIConfigDef()
def->cli = "rotate"; def->cli = "rotate";
def->default_value = new ConfigOptionFloat(0); def->default_value = new ConfigOptionFloat(0);
def = this->add("rotate_x", coFloat);
def->label = "Rotate around X";
def->tooltip = "Rotation angle around the X axis in degrees (0-360, default: 0).";
def->cli = "rotate-x";
def->default_value = new ConfigOptionFloat(0);
def = this->add("rotate_y", coFloat);
def->label = "Rotate around Y";
def->tooltip = "Rotation angle around the Y axis in degrees (0-360, default: 0).";
def->cli = "rotate-y";
def->default_value = new ConfigOptionFloat(0);
def = this->add("save", coString); def = this->add("save", coString);
def->label = "Save config file"; def->label = "Save config file";
def->tooltip = "Save configuration to the specified file."; def->tooltip = "Save configuration to the specified file.";

4
xs/src/libslic3r/PrintConfig.hpp
View File

@ -600,6 +600,8 @@ class CLIConfig
ConfigOptionStrings load; ConfigOptionStrings load;
ConfigOptionString output; ConfigOptionString output;
ConfigOptionFloat rotate; ConfigOptionFloat rotate;
ConfigOptionFloat rotate_x;
ConfigOptionFloat rotate_y;
ConfigOptionString save; ConfigOptionString save;
ConfigOptionFloat scale; ConfigOptionFloat scale;
ConfigOptionPoint3 scale_to_fit; ConfigOptionPoint3 scale_to_fit;
@ -621,6 +623,8 @@ class CLIConfig
OPT_PTR(load); OPT_PTR(load);
OPT_PTR(output); OPT_PTR(output);
OPT_PTR(rotate); OPT_PTR(rotate);
OPT_PTR(rotate_x);
OPT_PTR(rotate_y);
OPT_PTR(save); OPT_PTR(save);
OPT_PTR(scale); OPT_PTR(scale);
OPT_PTR(scale_to_fit); OPT_PTR(scale_to_fit);