diff options
| author | bubnikv <bubnikv@gmail.com> | 2017-02-26 23:54:42 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2017-02-26 23:54:42 +0300 |
| commit | b7aeeb968b4fc6d1725816b264e1238df9d0a17a (patch) | |
| tree | 08d0f09ea52f0095ec74e5a5d93ee7678bb6a9ea /lib | |
| parent | 121b3c31d2eb4c882d7798d118ccd68573f8fdb9 (diff) | |
Using the C++ file loaders.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Slic3r/Model.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/Slic3r/Model.pm b/lib/Slic3r/Model.pm index 39daa753f..466303222 100644 --- a/lib/Slic3r/Model.pm +++ b/lib/Slic3r/Model.pm @@ -1,6 +1,7 @@ # extends C++ class Slic3r::Model package Slic3r::Model; +use File::Basename qw(basename); use List::Util qw(first max any); use Slic3r::Geometry qw(X Y Z move_points); @@ -8,9 +9,10 @@ sub read_from_file { my $class = shift; my ($input_file) = @_; - my $model = $input_file =~ /\.stl$/i ? Slic3r::Format::STL->read_file($input_file) - : $input_file =~ /\.obj$/i ? Slic3r::Format::OBJ->read_file($input_file) - : $input_file =~ /\.amf(\.xml)?$/i ? Slic3r::Format::AMF->read_file($input_file) + my $model = $input_file =~ /\.stl$/i ? Slic3r::Model->load_stl(Slic3r::encode_path($input_file), basename($input_file)) + : $input_file =~ /\.obj$/i ? Slic3r::Model->load_obj(Slic3r::encode_path($input_file), basename($input_file)) + : $input_file =~ /\.amf(\.xml)?$/i ? Slic3r::Model->load_amf(Slic3r::encode_path($input_file)) + : $input_file =~ /\.prus$/i ? Slic3r::Model->load_prus(Slic3r::encode_path($input_file)) : die "Input file must have .stl, .obj or .amf(.xml) extension\n"; die "The supplied file couldn't be read because it's empty.\n" |