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

Fixed everything in the XS port

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-08-26 17:58:37 +02:00
parent 49040db9a3
commit 443d4e52cb
8 changed files with 62 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Slic3r/ExPolygon.pm
View file

@ -60,11 +60,6 @@ sub offset_ex {
return Slic3r::Geometry::Clipper::offset_ex(\@$self, @_); return Slic3r::Geometry::Clipper::offset_ex(\@$self, @_);
} }
sub safety_offset {
my $self = shift;
return Slic3r::Geometry::Clipper::safety_offset_ex(\@$self, @_);
}
sub noncollapsing_offset_ex { sub noncollapsing_offset_ex {
my $self = shift; my $self = shift;
my ($distance, @params) = @_; my ($distance, @params) = @_;

8
lib/Slic3r/GUI/Plater.pm
View file

@ -956,7 +956,7 @@ sub repaint {
@{$parent->{object_previews}} = (); @{$parent->{object_previews}} = ();
for my $obj_idx (0 .. $#{$parent->{objects}}) { for my $obj_idx (0 .. $#{$parent->{objects}}) {
my $object = $parent->{objects}[$obj_idx]; my $object = $parent->{objects}[$obj_idx];
next unless defined $object->thumbnail && @{$object->thumbnail}; next unless defined $object->thumbnail;
for my $instance_idx (0 .. $#{$object->instances}) { for my $instance_idx (0 .. $#{$object->instances}) {
my $instance = $object->instances->[$instance_idx]; my $instance = $object->instances->[$instance_idx];
@ -973,7 +973,7 @@ sub repaint {
} else { } else {
$dc->SetBrush($parent->{objects_brush}); $dc->SetBrush($parent->{objects_brush});
} }
$dc->DrawPolygon($parent->_y($_), 0, 0) for map $_->contour, @{ $parent->{object_previews}->[-1][2] }; $dc->DrawPolygon($parent->_y($_), 0, 0) for map $_->contour->pp, @{ $parent->{object_previews}->[-1][2] };
# if sequential printing is enabled and we have more than one object # if sequential printing is enabled and we have more than one object
if ($parent->{config}->complete_objects && (map @{$_->instances}, @{$parent->{objects}}) > 1) { if ($parent->{config}->complete_objects && (map @{$_->instances}, @{$parent->{objects}}) > 1) {
@ -988,7 +988,7 @@ sub repaint {
# draw skirt # draw skirt
if (@{$parent->{object_previews}} && $parent->{config}->skirts) { if (@{$parent->{object_previews}} && $parent->{config}->skirts) {
my $convex_hull = Slic3r::Polygon->new(@{convex_hull([ map @{$_->contour}, map @{$_->[2]}, @{$parent->{object_previews}} ])}); my $convex_hull = Slic3r::Polygon->new(@{convex_hull([ map @{$_->contour->pp}, map @{$_->[2]}, @{$parent->{object_previews}} ])});
($convex_hull) = @{offset([$convex_hull], $parent->{config}->skirt_distance * $parent->{scaling_factor}, 100, JT_ROUND)}; ($convex_hull) = @{offset([$convex_hull], $parent->{config}->skirt_distance * $parent->{scaling_factor}, 100, JT_ROUND)};
$dc->SetPen($parent->{skirt_pen}); $dc->SetPen($parent->{skirt_pen});
$dc->SetBrush($parent->{transparent_brush}); $dc->SetBrush($parent->{transparent_brush});
@ -1003,7 +1003,7 @@ sub mouse_event {
my $parent = $self->GetParent; my $parent = $self->GetParent;
my $point = $event->GetPosition; my $point = $event->GetPosition;
my $pos = $parent->_y([[$point->x, $point->y]])->[0]; #]] my $pos = Slic3r::Point->new(map @$_, map @$_, $parent->_y([[$point->x, $point->y]])); #]]
if ($event->ButtonDown(&Wx::wxMOUSE_BTN_LEFT)) { if ($event->ButtonDown(&Wx::wxMOUSE_BTN_LEFT)) {
$parent->{selected_objects} = []; $parent->{selected_objects} = [];
$parent->{list}->Select($parent->{list}->GetFirstSelected, 0); $parent->{list}->Select($parent->{list}->GetFirstSelected, 0);

17
lib/Slic3r/Geometry/Clipper.pm
View file

@ -4,7 +4,7 @@ use warnings;
require Exporter; require Exporter;
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
our @EXPORT_OK = qw(safety_offset safety_offset_ex offset offset_ex collapse_ex our @EXPORT_OK = qw(offset offset_ex
diff_ex diff union_ex intersection_ex xor_ex PFT_EVENODD JT_MITER JT_ROUND diff_ex diff union_ex intersection_ex xor_ex PFT_EVENODD JT_MITER JT_ROUND
JT_SQUARE is_counter_clockwise union_pt offset2 offset2_ex traverse_pt JT_SQUARE is_counter_clockwise union_pt offset2 offset2_ex traverse_pt
intersection union); intersection union);
@ -13,31 +13,20 @@ use Math::Clipper 1.22 qw(:cliptypes :polyfilltypes :jointypes is_counter_clockw
use Slic3r::Geometry qw(scale); use Slic3r::Geometry qw(scale);
our $clipper = Math::Clipper->new; our $clipper = Math::Clipper->new;
sub safety_offset { sub _safety_offset {
my ($polygons, $factor) = @_; my ($polygons, $factor) = @_;
return [ map Slic3r::Polygon->new(@$_), return [ map Slic3r::Polygon->new(@$_),
@{Math::Clipper::int_offset(_convert($polygons), $factor // (scale 1e-05), 100000, JT_MITER, 2)} ]; @{Math::Clipper::int_offset(_convert($polygons), $factor // (scale 1e-05), 100000, JT_MITER, 2)} ];
} }
sub safety_offset_ex {
my ($polygons, $factor) = @_;
return map Slic3r::ExPolygon->new($_->{outer}, @{$_->{holes}}),
@{Math::Clipper::ex_int_offset(_convert($polygons), $factor // (scale 1e-05), 100000, JT_MITER, 2)};
}
sub union_pt { sub union_pt {
my ($polygons, $jointype, $safety_offset) = @_; my ($polygons, $jointype, $safety_offset) = @_;
$jointype = PFT_NONZERO unless defined $jointype; $jointype = PFT_NONZERO unless defined $jointype;
$clipper->clear; $clipper->clear;
$clipper->add_subject_polygons($safety_offset ? _convert(safety_offset($polygons)) : _convert($polygons)); $clipper->add_subject_polygons($safety_offset ? _convert(_safety_offset($polygons)) : _convert($polygons));
return $clipper->pt_execute(CT_UNION, $jointype, $jointype); return $clipper->pt_execute(CT_UNION, $jointype, $jointype);
} }
sub collapse_ex {
my ($polygons, $width) = @_;
return offset2_ex($polygons, -$width/2, +$width/2);
}
sub traverse_pt { sub traverse_pt {
my ($polynodes) = @_; my ($polynodes) = @_;

2
lib/Slic3r/Layer/Region.pm
View file

@ -4,7 +4,7 @@ use Moo;
use List::Util qw(sum first); use List::Util qw(sum first);
use Slic3r::ExtrusionPath ':roles'; use Slic3r::ExtrusionPath ':roles';
use Slic3r::Geometry qw(PI A B scale chained_path_items points_coincide); use Slic3r::Geometry qw(PI A B scale chained_path_items points_coincide);
use Slic3r::Geometry::Clipper qw(safety_offset union_ex diff_ex intersection_ex use Slic3r::Geometry::Clipper qw(union_ex diff_ex intersection_ex
offset offset2 offset2_ex PFT_EVENODD union_pt traverse_pt diff intersection offset offset2 offset2_ex PFT_EVENODD union_pt traverse_pt diff intersection
union diff); union diff);
use Slic3r::Surface ':types'; use Slic3r::Surface ':types';

2
lib/Slic3r/TriangleMesh.pm
View file

@ -565,7 +565,7 @@ sub horizontal_projection {
$_->make_counter_clockwise for @f; # do this after scaling, as winding order might change while doing that $_->make_counter_clockwise for @f; # do this after scaling, as winding order might change while doing that
# the offset factor was tuned using groovemount.stl # the offset factor was tuned using groovemount.stl
return union_ex([ offset(\@f, Slic3r::Geometry::scale 0.01) ], 1); return union_ex(offset(\@f, Slic3r::Geometry::scale 0.01), 1);
} }
1; 1;

61
xs/src/ClipperUtils.cpp
View file

@ -194,7 +194,7 @@ offset2_ex(Slic3r::Polygons &polygons, Slic3r::ExPolygons &retval, const float d
template <class T> template <class T>
void _clipper_do(const ClipperLib::ClipType clipType, Slic3r::Polygons &subject, void _clipper_do(const ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3r::Polygons &clip, T &retval, const bool safety_offset) Slic3r::Polygons &clip, T &retval, const bool safety_offset_)
{ {
// read input // read input
ClipperLib::Polygons* input_subject = new ClipperLib::Polygons(); ClipperLib::Polygons* input_subject = new ClipperLib::Polygons();
@ -203,11 +203,11 @@ void _clipper_do(const ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3rPolygons_to_ClipperPolygons(clip, *input_clip); Slic3rPolygons_to_ClipperPolygons(clip, *input_clip);
// perform safety offset // perform safety offset
if (safety_offset) { if (safety_offset_) {
if (clipType == ClipperLib::ctUnion) { if (clipType == ClipperLib::ctUnion) {
// SafetyOffset(*input_subject); safety_offset(input_subject);
} else { } else {
// SafetyOffset(*input_clip); safety_offset(input_clip);
} }
} }
@ -226,11 +226,11 @@ void _clipper_do(const ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
} }
void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject, void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset) Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset_)
{ {
// perform operation // perform operation
ClipperLib::Polygons* output = new ClipperLib::Polygons(); ClipperLib::Polygons* output = new ClipperLib::Polygons();
_clipper_do<ClipperLib::Polygons>(clipType, subject, clip, *output, safety_offset); _clipper_do<ClipperLib::Polygons>(clipType, subject, clip, *output, safety_offset_);
// convert into Polygons // convert into Polygons
ClipperPolygons_to_Slic3rPolygons(*output, retval); ClipperPolygons_to_Slic3rPolygons(*output, retval);
@ -238,11 +238,11 @@ void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
} }
void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject, void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset) Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset_)
{ {
// perform operation // perform operation
ClipperLib::PolyTree* polytree = new ClipperLib::PolyTree(); ClipperLib::PolyTree* polytree = new ClipperLib::PolyTree();
_clipper_do<ClipperLib::PolyTree>(clipType, subject, clip, *polytree, safety_offset); _clipper_do<ClipperLib::PolyTree>(clipType, subject, clip, *polytree, safety_offset_);
// convert into ExPolygons // convert into ExPolygons
PolyTreeToExPolygons(*polytree, retval); PolyTreeToExPolygons(*polytree, retval);
@ -250,35 +250,35 @@ void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
} }
template <class T> template <class T>
void diff(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset) void diff(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset_)
{ {
_clipper(ClipperLib::ctDifference, subject, clip, retval, safety_offset); _clipper(ClipperLib::ctDifference, subject, clip, retval, safety_offset_);
} }
template void diff<Slic3r::ExPolygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset); template void diff<Slic3r::ExPolygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset_);
template void diff<Slic3r::Polygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset); template void diff<Slic3r::Polygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset_);
template <class T> template <class T>
void intersection(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset) void intersection(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset_)
{ {
_clipper(ClipperLib::ctIntersection, subject, clip, retval, safety_offset); _clipper(ClipperLib::ctIntersection, subject, clip, retval, safety_offset_);
} }
template void intersection<Slic3r::ExPolygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset); template void intersection<Slic3r::ExPolygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset_);
template void intersection<Slic3r::Polygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset); template void intersection<Slic3r::Polygons>(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset_);
void xor_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, void xor_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval,
bool safety_offset) bool safety_offset_)
{ {
_clipper(ClipperLib::ctXor, subject, clip, retval, safety_offset); _clipper(ClipperLib::ctXor, subject, clip, retval, safety_offset_);
} }
template <class T> template <class T>
void union_(Slic3r::Polygons &subject, T &retval, bool safety_offset) void union_(Slic3r::Polygons &subject, T &retval, bool safety_offset_)
{ {
Slic3r::Polygons p; Slic3r::Polygons p;
_clipper(ClipperLib::ctUnion, subject, p, retval, safety_offset); _clipper(ClipperLib::ctUnion, subject, p, retval, safety_offset_);
} }
template void union_<Slic3r::ExPolygons>(Slic3r::Polygons &subject, Slic3r::ExPolygons &retval, bool safety_offset); template void union_<Slic3r::ExPolygons>(Slic3r::Polygons &subject, Slic3r::ExPolygons &retval, bool safety_offset_);
template void union_<Slic3r::Polygons>(Slic3r::Polygons &subject, Slic3r::Polygons &retval, bool safety_offset); template void union_<Slic3r::Polygons>(Slic3r::Polygons &subject, Slic3r::Polygons &retval, bool safety_offset_);
void simplify_polygons(Slic3r::Polygons &subject, Slic3r::Polygons &retval) void simplify_polygons(Slic3r::Polygons &subject, Slic3r::Polygons &retval)
{ {
@ -295,4 +295,21 @@ void simplify_polygons(Slic3r::Polygons &subject, Slic3r::Polygons &retval)
delete output; delete output;
} }
void safety_offset(ClipperLib::Polygons* &subject)
{
// scale input
scaleClipperPolygons(*subject, CLIPPER_OFFSET_SCALE);
// perform offset (delta = scale 1e-05)
ClipperLib::Polygons* retval = new ClipperLib::Polygons();
ClipperLib::OffsetPolygons(*subject, *retval, 10.0 * CLIPPER_OFFSET_SCALE, ClipperLib::jtMiter, 2);
// unscale output
scaleClipperPolygons(*retval, 1.0/CLIPPER_OFFSET_SCALE);
// delete original data and switch pointer
delete subject;
subject = retval;
}
} }

17
xs/src/ClipperUtils.hpp
View file

@ -8,6 +8,7 @@
namespace Slic3r { namespace Slic3r {
#define CLIPPER_OFFSET_SCALE 100000.0
//----------------------------------------------------------- //-----------------------------------------------------------
// legacy code from Clipper documentation // legacy code from Clipper documentation
@ -45,26 +46,28 @@ void offset2_ex(Slic3r::Polygons &polygons, Slic3r::ExPolygons &retval, const fl
template <class T> template <class T>
void _clipper_do(ClipperLib::ClipType clipType, Slic3r::Polygons &subject, void _clipper_do(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3r::Polygons &clip, T &retval, bool safety_offset); Slic3r::Polygons &clip, T &retval, bool safety_offset_);
void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject, void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset); Slic3r::Polygons &clip, Slic3r::Polygons &retval, bool safety_offset_);
void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject, void _clipper(ClipperLib::ClipType clipType, Slic3r::Polygons &subject,
Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset); Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, bool safety_offset_);
template <class T> template <class T>
void diff(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset); void diff(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset_);
template <class T> template <class T>
void intersection(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset); void intersection(Slic3r::Polygons &subject, Slic3r::Polygons &clip, T &retval, bool safety_offset_);
void xor_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval, void xor_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygons &retval,
bool safety_offset = false); bool safety_offset_ = false);
template <class T> template <class T>
void union_(Slic3r::Polygons &subject, T &retval, bool safety_offset = false); void union_(Slic3r::Polygons &subject, T &retval, bool safety_offset_ = false);
void simplify_polygons(Slic3r::Polygons &subject, Slic3r::Polygons &retval); void simplify_polygons(Slic3r::Polygons &subject, Slic3r::Polygons &retval);
void safety_offset(ClipperLib::Polygons* &subject);
} }
#endif #endif

8
xs/xsp/Clipper.xsp
View file

@ -11,7 +11,7 @@
%{ %{
Polygons Polygons
offset(polygons, delta, scale = 100000, joinType = ClipperLib::jtMiter, miterLimit = 3) offset(polygons, delta, scale = CLIPPER_OFFSET_SCALE, joinType = ClipperLib::jtMiter, miterLimit = 3)
Polygons polygons Polygons polygons
const float delta const float delta
double scale double scale
@ -23,7 +23,7 @@ offset(polygons, delta, scale = 100000, joinType = ClipperLib::jtMiter, miterLim
RETVAL RETVAL
ExPolygons ExPolygons
offset_ex(polygons, delta, scale = 100000, joinType = ClipperLib::jtMiter, miterLimit = 3) offset_ex(polygons, delta, scale = CLIPPER_OFFSET_SCALE, joinType = ClipperLib::jtMiter, miterLimit = 3)
Polygons polygons Polygons polygons
const float delta const float delta
double scale double scale
@ -35,7 +35,7 @@ offset_ex(polygons, delta, scale = 100000, joinType = ClipperLib::jtMiter, miter
RETVAL RETVAL
Polygons Polygons
offset2(polygons, delta1, delta2, scale = 100000, joinType = ClipperLib::jtMiter, miterLimit = 3) offset2(polygons, delta1, delta2, scale = CLIPPER_OFFSET_SCALE, joinType = ClipperLib::jtMiter, miterLimit = 3)
Polygons polygons Polygons polygons
const float delta1 const float delta1
const float delta2 const float delta2
@ -48,7 +48,7 @@ offset2(polygons, delta1, delta2, scale = 100000, joinType = ClipperLib::jtMiter
RETVAL RETVAL
ExPolygons ExPolygons
offset2_ex(polygons, delta1, delta2, scale = 100000, joinType = ClipperLib::jtMiter, miterLimit = 3) offset2_ex(polygons, delta1, delta2, scale = CLIPPER_OFFSET_SCALE, joinType = ClipperLib::jtMiter, miterLimit = 3)
Polygons polygons Polygons polygons
const float delta1 const float delta1
const float delta2 const float delta2