Refactoring: new Slic3r::Model class to represent files

This commit is contained in:
Alessandro Ranellucci 2012-08-29 16:49:38 +02:00
parent c0322ec703
commit f90520ed06
14 changed files with 255 additions and 88 deletions

View file

@ -25,12 +25,12 @@ my %opt = ();
}
{
my $mesh = Slic3r::Format::AMF->read_file($ARGV[0]);
my $model = Slic3r::Format::AMF->read_file($ARGV[0]);
my $output_file = $ARGV[0];
$output_file =~ s/\.amf(?:\.xml)?$/\.stl/i;
printf "Writing to %s\n", basename($output_file);
Slic3r::Format::STL->write_file($output_file, $mesh, !$opt{ascii});
Slic3r::Format::STL->write_file($output_file, $model, binary => !$opt{ascii});
}

View file

@ -25,15 +25,20 @@ my %opt = ();
}
{
my $mesh = Slic3r::Format::STL->read_file($ARGV[0]);
my $model = Slic3r::Format::STL->read_file($ARGV[0]);
my $basename = $ARGV[0];
$basename =~ s/\.stl$//i;
my $part_count = 0;
foreach my $new_mesh ($mesh->split_mesh) {
foreach my $new_mesh ($model->mesh->split_mesh) {
my $new_model = Slic3r::Model->new;
$new_model
->add_object(vertices => $new_mesh->vertices)
->add_volume(facets => $new_mesh->facets);
my $output_file = sprintf '%s_%02d.stl', $basename, ++$part_count;
printf "Writing to %s\n", basename($output_file);
Slic3r::Format::STL->write_file($output_file, $new_mesh, !$opt{ascii});
Slic3r::Format::STL->write_file($output_file, $new_model, binary => !$opt{ascii});
}
}

View file

@ -18,29 +18,49 @@ my %opt = ();
{
my %options = (
'help' => sub { usage() },
'distinct-materials' => \$opt{distinct_materials},
);
GetOptions(%options) or usage(1);
$ARGV[0] or usage(1);
}
{
my @meshes = map Slic3r::Format::STL->read_file($_), @ARGV;
my @models = map Slic3r::Format::STL->read_file($_), @ARGV;
my $output_file = $ARGV[0];
$output_file =~ s/\.stl$/.amf.xml/i;
my $materials = {};
my $meshes_by_material = {};
if (@meshes == 1) {
$meshes_by_material->{_} = $meshes[0];
my $new_model = Slic3r::Model->new;
if ($opt{distinct_materials} && @models > 1) {
my $new_object = $new_model->add_object;
for my $m (0 .. $#models) {
my $model = $models[$m];
my $v_offset = @{$new_object->vertices};
push @{$new_object->vertices}, @{$model->objects->[0]->vertices};
my @new_facets = map {
my $f = [@$_];
$f->[$_] += $v_offset for -3..-1;
$f;
} @{ $model->objects->[0]->volumes->[0]->facets };
push @{$new_model->materials}, { Name => basename($ARGV[$m]) };
$new_object->add_volume(
material_id => $#{$new_model->materials},
facets => [@new_facets],
);
}
} else {
for (0..$#meshes) {
$materials->{$_+1} = { Name => basename($ARGV[$_]) };
$meshes_by_material->{$_+1} = $meshes[$_];
foreach my $model (@models) {
$new_model->add_object(
vertices => $model->objects->[0]->vertices,
)->add_volume(
facets => $model->objects->[0]->volumes->[0]->facets,
);
}
}
printf "Writing to %s\n", basename($output_file);
Slic3r::Format::AMF->write_file($output_file, $materials, $meshes_by_material);
Slic3r::Format::AMF->write_file($output_file, $new_model);
}
@ -51,6 +71,7 @@ sub usage {
Usage: amf-to-stl.pl [ OPTIONS ] file.stl [ file2.stl [ file3.stl ] ]
--help Output this usage screen and exit
--distinct-materials Assign each STL file to a different material
EOF
exit ($exit_code || 0);