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

Ported ExtrusionPath::Collection

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-07-18 19:09:07 +02:00
parent 0efea9e442
commit c030e38908
18 changed files with 181 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xs/lib/Slic3r/XS.pm
View file

@ -38,6 +38,11 @@ use overload
'@{}' => sub { $_[0]->arrayref },
'fallback' => 1;
package Slic3r::ExtrusionPath::Collection;
use overload
'@{}' => sub { $_[0]->arrayref },
'fallback' => 1;
package Slic3r::ExtrusionLoop;
use overload
'@{}' => sub { $_[0]->arrayref },

1
xs/src/ExPolygon.hpp
View file

@ -23,6 +23,7 @@ class ExPolygon
};
typedef std::vector<ExPolygon> ExPolygons;
typedef std::vector<ExPolygon*> ExPolygonsPtr;
}

12
xs/src/ExPolygonCollection.cpp
View file

@ -5,24 +5,24 @@ namespace Slic3r {
void
ExPolygonCollection::scale(double factor)
{
for (ExPolygons::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
(*it).scale(factor);
for (ExPolygonsPtr::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
(**it).scale(factor);
}
}
void
ExPolygonCollection::translate(double x, double y)
{
for (ExPolygons::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
(*it).translate(x, y);
for (ExPolygonsPtr::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
(**it).translate(x, y);
}
}
void
ExPolygonCollection::rotate(double angle, Point* center)
{
for (ExPolygons::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
(*it).rotate(angle, center);
for (ExPolygonsPtr::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
(**it).rotate(angle, center);
}
}

3
xs/src/ExPolygonCollection.hpp
View file

@ -9,8 +9,7 @@ namespace Slic3r {
class ExPolygonCollection
{
public:
ExPolygons expolygons;
SV* arrayref();
ExPolygonsPtr expolygons;
void scale(double factor);
void translate(double x, double y);
void rotate(double angle, Point* center);

3
xs/src/ExtrusionEntity.hpp
View file

@ -25,11 +25,14 @@ enum ExtrusionRole {
class ExtrusionEntity
{
public:
virtual ~ExtrusionEntity() {};
ExtrusionRole role;
double height; // vertical thickness of the extrusion expressed in mm
double flow_spacing;
};
typedef std::vector<ExtrusionEntity*> ExtrusionEntitiesPtr;
class ExtrusionPath : public ExtrusionEntity
{
public:

18
xs/src/ExtrusionEntityCollection.hpp Normal file
View file

@ -0,0 +1,18 @@
#ifndef slic3r_ExtrusionEntityCollection_hpp_
#define slic3r_ExtrusionEntityCollection_hpp_
#include <myinit.h>
#include "ExtrusionEntity.hpp"
namespace Slic3r {
class ExtrusionEntityCollection
{
public:
ExtrusionEntitiesPtr entities;
bool no_sort;
};
}
#endif

3
xs/src/Surface.hpp
View file

@ -19,6 +19,9 @@ class Surface
bool in_collection;
};
typedef std::vector<Surface> Surfaces;
typedef std::vector<Surface*> SurfacesPtr;
}
#endif

5
xs/src/SurfaceCollection.hpp
View file

@ -5,13 +5,10 @@
namespace Slic3r {
typedef std::vector<Surface> Surfaces;
class SurfaceCollection
{
public:
Surfaces surfaces;
SV* arrayref();
SurfacesPtr surfaces;
};
}

37
xs/t/12_extrusionpathcollection.t Normal file
View file

@ -0,0 +1,37 @@
#!/usr/bin/perl
use strict;
use warnings;
use Slic3r::XS;
use Test::More tests => 5;
my $points = [
[100, 100],
[200, 100],
[200, 200],
];
my $path = Slic3r::ExtrusionPath->new(
polyline => Slic3r::Polyline->new(@$points),
role => Slic3r::ExtrusionPath::EXTR_ROLE_EXTERNAL_PERIMETER,
);
my $loop = Slic3r::ExtrusionLoop->new(
polygon => Slic3r::Polygon->new(@$points),
role => Slic3r::ExtrusionPath::EXTR_ROLE_FILL,
);
my $collection = Slic3r::ExtrusionPath::Collection->new;
isa_ok $collection, 'Slic3r::ExtrusionPath::Collection', 'collection object';
$collection->append($path);
is scalar(@$collection), 1, 'append ExtrusionPath';
$collection->append($loop);
is scalar(@$collection), 2, 'append ExtrusionLoop';
isa_ok $collection->[0], 'Slic3r::ExtrusionPath', 'correct object returned for path';
isa_ok $collection->[1], 'Slic3r::ExtrusionLoop', 'correct object returned for loop';
__END__

19
xs/xsp/ExPolygonCollection.xsp
View file

@ -24,8 +24,9 @@ ExPolygonCollection::new(...)
RETVAL->expolygons.resize(items-1);
for (unsigned int i = 1; i < items; i++) {
// Note: a COPY of the input is stored
RETVAL->expolygons[i-1].from_SV_check(ST(i));
RETVAL->expolygons[i-1].in_collection = true;
RETVAL->expolygons[i-1] = new ExPolygon;
RETVAL->expolygons[i-1]->from_SV_check(ST(i));
RETVAL->expolygons[i-1]->in_collection = true;
}
OUTPUT:
RETVAL
@ -36,9 +37,9 @@ ExPolygonCollection::arrayref()
AV* av = newAV();
av_fill(av, THIS->expolygons.size()-1);
int i = 0;
for (ExPolygons::iterator it = THIS->expolygons.begin(); it != THIS->expolygons.end(); ++it) {
for (ExPolygonsPtr::iterator it = THIS->expolygons.begin(); it != THIS->expolygons.end(); ++it) {
SV* sv = newSV(0);
sv_setref_pv( sv, "Slic3r::ExPolygon", &*it );
sv_setref_pv( sv, "Slic3r::ExPolygon", *it );
av_store(av, i++, sv);
}
RETVAL = newRV_noinc((SV*)av);
@ -51,8 +52,8 @@ ExPolygonCollection::pp()
AV* av = newAV();
av_fill(av, THIS->expolygons.size()-1);
int i = 0;
for (ExPolygons::iterator it = THIS->expolygons.begin(); it != THIS->expolygons.end(); ++it) {
av_store(av, i++, (*it).to_SV_pureperl());
for (ExPolygonsPtr::iterator it = THIS->expolygons.begin(); it != THIS->expolygons.end(); ++it) {
av_store(av, i++, (*it)->to_SV_pureperl());
}
RETVAL = newRV_noinc((SV*)av);
OUTPUT:
@ -62,9 +63,9 @@ void
ExPolygonCollection::append(...)
CODE:
for (unsigned int i = 1; i < items; i++) {
ExPolygon expolygon;
expolygon.from_SV_check( ST(i) );
expolygon.in_collection = true;
ExPolygon* expolygon = new ExPolygon;
expolygon->from_SV_check( ST(i) );
expolygon->in_collection = true;
THIS->expolygons.push_back(expolygon);
}

59
xs/xsp/ExtrusionEntityCollection.xsp Normal file
View file

@ -0,0 +1,59 @@
%module{Slic3r::XS};
%{
#include <myinit.h>
#include "ExtrusionEntityCollection.hpp"
%}
%name{Slic3r::ExtrusionPath::Collection} class ExtrusionEntityCollection {
ExtrusionEntityCollection();
~ExtrusionEntityCollection();
void clear()
%code{% THIS->entities.clear(); %};
%{
SV*
ExtrusionEntityCollection::arrayref()
CODE:
AV* av = newAV();
av_fill(av, THIS->entities.size()-1);
int i = 0;
for (ExtrusionEntitiesPtr::iterator it = THIS->entities.begin(); it != THIS->entities.end(); ++it) {
SV* sv = newSV(0);
// return COPIES
if (ExtrusionPath* path = dynamic_cast<ExtrusionPath*>(*it)) {
sv_setref_pv( sv, "Slic3r::ExtrusionPath", new ExtrusionPath(*(ExtrusionPath*)*it) );
} else {
sv_setref_pv( sv, "Slic3r::ExtrusionLoop", new ExtrusionLoop(*(ExtrusionLoop*)*it) );
}
av_store(av, i++, sv);
}
RETVAL = newRV_noinc((SV*)av);
OUTPUT:
RETVAL
void
ExtrusionEntityCollection::append(...)
CODE:
for (unsigned int i = 1; i < items; i++) {
ExtrusionEntity* entity = (ExtrusionEntity *)SvIV((SV*)SvRV( ST(i) ));
// append COPIES
if (ExtrusionPath* path = dynamic_cast<ExtrusionPath*>(entity)) {
THIS->entities.push_back( new ExtrusionPath(*path) );
} else {
THIS->entities.push_back( new ExtrusionLoop(*(ExtrusionLoop*)entity) );
}
}
bool
ExtrusionEntityCollection::no_sort(...)
CODE:
if (items > 1) {
THIS->no_sort = SvTRUE(ST(1));
}
RETVAL = THIS->no_sort;
OUTPUT:
RETVAL
%}
};

12
xs/xsp/SurfaceCollection.xsp
View file

@ -19,8 +19,8 @@ SurfaceCollection::new(...)
RETVAL->surfaces.resize(items-1);
for (unsigned int i = 1; i < items; i++) {
// Note: a COPY of the input is stored
RETVAL->surfaces[i-1] = *(Surface *)SvIV((SV*)SvRV( ST(i) ));
RETVAL->surfaces[i-1].in_collection = true;
RETVAL->surfaces[i-1] = (Surface *)SvIV((SV*)SvRV( ST(i) ));
RETVAL->surfaces[i-1]->in_collection = true;
}
OUTPUT:
RETVAL
@ -31,9 +31,9 @@ SurfaceCollection::arrayref()
AV* av = newAV();
av_fill(av, THIS->surfaces.size()-1);
int i = 0;
for (Surfaces::iterator it = THIS->surfaces.begin(); it != THIS->surfaces.end(); ++it) {
for (SurfacesPtr::iterator it = THIS->surfaces.begin(); it != THIS->surfaces.end(); ++it) {
SV* sv = newSV(0);
sv_setref_pv( sv, "Slic3r::Surface", &*it );
sv_setref_pv( sv, "Slic3r::Surface", *it );
av_store(av, i++, sv);
}
RETVAL = newRV_noinc((SV*)av);
@ -44,8 +44,8 @@ void
SurfaceCollection::append(...)
CODE:
for (unsigned int i = 1; i < items; i++) {
THIS->surfaces.push_back(*(Surface *)SvIV((SV*)SvRV( ST(i) )));
THIS->surfaces.back().in_collection = true;
THIS->surfaces.push_back((Surface *)SvIV((SV*)SvRV( ST(i) )));
THIS->surfaces.back()->in_collection = true;
}
%}

1
xs/xsp/my.map
View file

@ -6,6 +6,7 @@ Polyline* O_OBJECT
Polygon* O_OBJECT
ExPolygon* O_OBJECT
ExPolygonCollection* O_OBJECT
ExtrusionEntityCollection* O_OBJECT
ExtrusionPath* O_OBJECT
ExtrusionLoop* O_OBJECT
Surface* O_OBJECT

1
xs/xsp/typemap.xspt
View file

@ -7,6 +7,7 @@
%typemap{ExPolygon*};
%typemap{Polyline*};
%typemap{Polygon*};
%typemap{ExtrusionEntityCollection*};
%typemap{ExtrusionPath*};
%typemap{ExtrusionLoop*};
%typemap{Lines};