diff options
author | bubnikv <bubnikv@gmail.com> | 2017-02-27 03:03:00 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2017-02-27 03:03:00 +0300 |
commit | ee619701d8a275d6ab782ed53de3f8134c8a4e56 (patch) | |
tree | e737dae5a0443b6debc470bcf3e5725557f7075e /lib | |
parent | f0f550783febed5d34d19959bab96afcbaa7069b (diff) |
Got rid of the Perl Format::STL, Format::AMF, Format::OBJ for good.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Slic3r.pm | 2 | ||||
-rw-r--r-- | lib/Slic3r/Format/AMF.pm | 116 | ||||
-rw-r--r-- | lib/Slic3r/Format/STL.pm | 19 | ||||
-rw-r--r-- | lib/Slic3r/GUI/Plater.pm | 6 |
4 files changed, 3 insertions, 140 deletions
diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm index 9719f1d32..198a52825 100644 --- a/lib/Slic3r.pm +++ b/lib/Slic3r.pm @@ -61,8 +61,6 @@ use Slic3r::ExPolygon; use Slic3r::ExtrusionLoop; use Slic3r::ExtrusionPath; use Slic3r::Flow; -use Slic3r::Format::AMF; -use Slic3r::Format::STL; use Slic3r::GCode::ArcFitting; use Slic3r::GCode::MotionPlanner; use Slic3r::GCode::PressureRegulator; diff --git a/lib/Slic3r/Format/AMF.pm b/lib/Slic3r/Format/AMF.pm deleted file mode 100644 index 603a4014a..000000000 --- a/lib/Slic3r/Format/AMF.pm +++ /dev/null @@ -1,116 +0,0 @@ -package Slic3r::Format::AMF; -use Moo; - -use Slic3r::Geometry qw(X Y Z); - -sub write_file { - my $self = shift; - my ($file, $model, %params) = @_; - - my %vertices_offset = (); - - Slic3r::open(\my $fh, '>', $file); - binmode $fh, ':utf8'; - printf $fh qq{<?xml version="1.0" encoding="UTF-8"?>\n}; - printf $fh qq{<amf unit="millimeter">\n}; - printf $fh qq{ <metadata type="cad">Slic3r %s</metadata>\n}, $Slic3r::VERSION; - for my $material_id (sort @{ $model->material_names }) { - next if $material_id eq ''; - my $material = $model->get_material($material_id); - # note that material-id must never be 0 since it's reserved by the AMF spec - printf $fh qq{ <material id="%s">\n}, $material_id; - for (keys %{$material->attributes}) { - printf $fh qq{ <metadata type=\"%s\">%s</metadata>\n}, $_, $material->attributes->{$_}; - } - my $config = $material->config; - foreach my $opt_key (@{$config->get_keys}) { - printf $fh qq{ <metadata type=\"slic3r.%s\">%s</metadata>\n}, $opt_key, $config->serialize($opt_key); - } - printf $fh qq{ </material>\n}; - } - my $instances = ''; - for my $object_id (0 .. $#{ $model->objects }) { - my $object = $model->objects->[$object_id]; - printf $fh qq{ <object id="%d">\n}, $object_id; - - my $config = $object->config; - foreach my $opt_key (@{$config->get_keys}) { - printf $fh qq{ <metadata type=\"slic3r.%s\">%s</metadata>\n}, $opt_key, $config->serialize($opt_key); - } - if ($object->name) { - printf $fh qq{ <metadata type=\"name\">%s</metadata>\n}, $object->name; - } - my $layer_height_profile = $object->layer_height_profile(); - my $layer_height_profile_pts = int(@{$layer_height_profile}); - if ($layer_height_profile_pts >= 4 && $layer_height_profile_pts % 2 == 0) { - # Store the layer height profile as a single semicolon separated list. - print $fh ' <metadata type="slic3r.layer_height_profile">', join(';', @{$layer_height_profile}), "</metadata>\n"; - } - #FIXME Store the layer height ranges (ModelObject::layer_height_ranges) - - printf $fh qq{ <mesh>\n}; - printf $fh qq{ <vertices>\n}; - my @vertices_offset = (); - { - my $vertices_offset = 0; - foreach my $volume (@{ $object->volumes }) { - push @vertices_offset, $vertices_offset; - my $vertices = $volume->mesh->vertices; - foreach my $vertex (@$vertices) { - printf $fh qq{ <vertex>\n}; - printf $fh qq{ <coordinates>\n}; - printf $fh qq{ <x>%s</x>\n}, $vertex->[X]; - printf $fh qq{ <y>%s</y>\n}, $vertex->[Y]; - printf $fh qq{ <z>%s</z>\n}, $vertex->[Z]; - printf $fh qq{ </coordinates>\n}; - printf $fh qq{ </vertex>\n}; - } - $vertices_offset += scalar(@$vertices); - } - } - printf $fh qq{ </vertices>\n}; - foreach my $volume (@{ $object->volumes }) { - my $vertices_offset = shift @vertices_offset; - printf $fh qq{ <volume%s>\n}, - ($volume->material_id eq '') ? '' : (sprintf ' materialid="%s"', $volume->material_id); - - my $config = $volume->config; - foreach my $opt_key (@{$config->get_keys}) { - printf $fh qq{ <metadata type=\"slic3r.%s\">%s</metadata>\n}, $opt_key, $config->serialize($opt_key); - } - if ($volume->name) { - printf $fh qq{ <metadata type=\"name\">%s</metadata>\n}, $volume->name; - } - if ($volume->modifier) { - printf $fh qq{ <metadata type=\"slic3r.modifier\">1</metadata>\n}; - } - - foreach my $facet (@{$volume->mesh->facets}) { - printf $fh qq{ <triangle>\n}; - printf $fh qq{ <v%d>%d</v%d>\n}, $_, $facet->[$_-1] + $vertices_offset, $_ for 1..3; - printf $fh qq{ </triangle>\n}; - } - printf $fh qq{ </volume>\n}; - } - printf $fh qq{ </mesh>\n}; - printf $fh qq{ </object>\n}; - if ($object->instances) { - foreach my $instance (@{$object->instances}) { - $instances .= sprintf qq{ <instance objectid="%d">\n}, $object_id; - $instances .= sprintf qq{ <deltax>%s</deltax>\n}, $instance->offset->[X]; - $instances .= sprintf qq{ <deltay>%s</deltay>\n}, $instance->offset->[Y]; - $instances .= sprintf qq{ <rz>%s</rz>\n}, $instance->rotation; - $instances .= sprintf qq{ </instance>\n}; - } - } - } - if ($instances) { - printf $fh qq{ <constellation id="1">\n}; - printf $fh $instances; - printf $fh qq{ </constellation>\n}; - } - printf $fh qq{</amf>\n}; - close $fh; -} - -1; diff --git a/lib/Slic3r/Format/STL.pm b/lib/Slic3r/Format/STL.pm deleted file mode 100644 index a6a1836e4..000000000 --- a/lib/Slic3r/Format/STL.pm +++ /dev/null @@ -1,19 +0,0 @@ -package Slic3r::Format::STL; -use Moo; - -use File::Basename qw(basename); - -sub write_file { - my $self = shift; - my ($file, $mesh, %params) = @_; - - $mesh = $mesh->mesh if $mesh->isa('Slic3r::Model'); - - my $path = Slic3r::encode_path($file); - - $params{binary} - ? $mesh->write_binary($path) - : $mesh->write_ascii($path); -} - -1; diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index a59fa7e31..17fa1aafe 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -1499,7 +1499,7 @@ sub export_stl { return if !@{$self->{objects}}; my $output_file = $self->_get_export_file('STL') or return; - Slic3r::Format::STL->write_file($output_file, $self->{model}, binary => 1); + $self->{model}->store_stl(Slic3r::encode_path($output_file), 1); $self->statusbar->SetStatusText("STL file exported to $output_file"); } @@ -1546,7 +1546,7 @@ sub export_object_stl { my $model_object = $self->{model}->objects->[$obj_idx]; my $output_file = $self->_get_export_file('STL') or return; - Slic3r::Format::STL->write_file($output_file, $model_object->mesh, binary => 1); + $model_object->mesh->write_binary(Slic3r::encode_path($output_file)); $self->statusbar->SetStatusText("STL file exported to $output_file"); } @@ -1556,7 +1556,7 @@ sub export_amf { return if !@{$self->{objects}}; my $output_file = $self->_get_export_file('AMF') or return; - Slic3r::Format::AMF->write_file($output_file, $self->{model}); + $self->{model}->store_amf(Slic3r::encode_path($output_file)); $self->statusbar->SetStatusText("AMF file exported to $output_file"); } |