3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed parsing of AMF material metadata

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-07-11 19:48:03 +02:00
parent 2ca0d4627a
commit 4d67f902b6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Slic3r/Format/AMF/Parser.pm
View file

@ -41,7 +41,7 @@ sub start_element {
$self->{_material} = $self->{_model}->set_material($material_id); $self->{_material} = $self->{_model}->set_material($material_id);
} elsif ($data->{LocalName} eq 'metadata' && $self->{_tree}[-1] eq 'material') { } elsif ($data->{LocalName} eq 'metadata' && $self->{_tree}[-1] eq 'material') {
$self->{_material_metadata_type} = $self->_get_attribute($data, 'type'); $self->{_material_metadata_type} = $self->_get_attribute($data, 'type');
$self->{_material}->attributes->{ $self->{_material_metadata_type} } = ""; $self->{_material}->set_attribute($self->{_material_metadata_type}, "");
} elsif ($data->{LocalName} eq 'constellation') { } elsif ($data->{LocalName} eq 'constellation') {
$self->{_constellation} = 1; # we merge all constellations as we don't support more than one $self->{_constellation} = 1; # we merge all constellations as we don't support more than one
} elsif ($data->{LocalName} eq 'instance' && $self->{_constellation}) { } elsif ($data->{LocalName} eq 'instance' && $self->{_constellation}) {
@ -64,7 +64,9 @@ sub characters {
} elsif ($self->{_triangle} && defined $self->{_vertex_idx}) { } elsif ($self->{_triangle} && defined $self->{_vertex_idx}) {
$self->{_triangle}[ $self->{_vertex_idx} ] .= $data->{Data}; $self->{_triangle}[ $self->{_vertex_idx} ] .= $data->{Data};
} elsif ($self->{_material_metadata_type}) { } elsif ($self->{_material_metadata_type}) {
$self->{_material}->attributes->{ $self->{_material_metadata_type} } .= $data->{Data}; my $value = $self->{_material}->get_attribute($self->{_material_metadata_type});
$value .= $data->{Data};
$self->{_material}->set_attribute($self->{_material_metadata_type}, $value);
} elsif ($self->{_instance_property}) { } elsif ($self->{_instance_property}) {
$self->{_instance}{ $self->{_instance_property} } .= $data->{Data}; $self->{_instance}{ $self->{_instance_property} } .= $data->{Data};
} }
@ -100,7 +102,7 @@ sub end_element {
if ($self->{_material_metadata_type} =~ /^slic3r\.(.+)/) { if ($self->{_material_metadata_type} =~ /^slic3r\.(.+)/) {
my $opt_key = $1; my $opt_key = $1;
if (exists $Slic3r::Config::Options->{$opt_key}) { if (exists $Slic3r::Config::Options->{$opt_key}) {
$self->{_material}->config->set_deserialize($opt_key, $self->{_material}->attributes->{"slic3r.$opt_key"}); $self->{_material}->config->set_deserialize($opt_key, $self->{_material}->get_attribute("slic3r.$opt_key"));
} }
} }
$self->{_material_metadata_type} = undef; $self->{_material_metadata_type} = undef;