3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-06 05:24:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactor the AMF parser so that it popolates a Model object directly. Also read constellations

Browse source
This commit is contained in:
Alessandro Ranellucci 2012-08-29 18:23:34 +02:00
parent 23f6842bd4
commit f29d455319
4 changed files with 59 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/Slic3r/Format/AMF.pm
View file

@ -12,28 +12,12 @@ sub read_file {
open my $fh, '<', $file or die "Failed to open $file\n";
my $vertices = [];
my $materials = {};
my $meshes_by_material = {};
my $model = Slic3r::Model->new;
XML::SAX::PurePerl
->new(Handler => Slic3r::Format::AMF::Parser->new(
_vertices => $vertices,
_materials => $materials,
_meshes_by_material => $meshes_by_material,
))
->new(Handler => Slic3r::Format::AMF::Parser->new(_model => $model))
->parse_file($fh);
close $fh;
my $model = Slic3r::Model->new;
my $object = $model->add_object(vertices => $vertices);
foreach my $material (keys %$meshes_by_material) {
push @{$model->materials}, $material; # TODO: we should not add duplicate materials
$object->add_volume(
material_id => $#{$model->materials},
facets => $meshes_by_material->{$material},
);
}
return $model;
}
@ -48,8 +32,8 @@ sub write_file {
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 (0 .. $#{ $model->materials }) {
my $material = $model->materials->[$material_id];
for my $material_id (sort keys %{ $model->materials }) {
my $material = $model->materials->{$material_id};
printf $fh qq{ <material id="%d">\n}, $material_id;
for (keys %$material) {
printf $fh qq{ <metadata type=\"%s\">%s</metadata>\n}, $_, $material->{$_};