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

Perform additional checks before merging solid surfaces (i.e. take flow and fill pattern into account)

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-02-10 13:19:44 +01:00
parent 634ccb33ab
commit 3d483722c6
8 changed files with 62 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xs/src/Surface.cpp
View file

@ -16,6 +16,13 @@ Surface::is_solid() const
|| this->surface_type == stInternalSolid;
}
bool
Surface::is_external() const
{
return this->surface_type == stTop
|| this->surface_type == stBottom;
}
bool
Surface::is_bridge() const
{

1
xs/src/Surface.hpp
View file

@ -18,6 +18,7 @@ class Surface
unsigned short extra_perimeters;
double area() const;
bool is_solid() const;
bool is_external() const;
bool is_bridge() const;
#ifdef SLIC3RXS

4
xs/src/SurfaceCollection.cpp
View file

@ -21,14 +21,14 @@ SurfaceCollection::simplify(double tolerance)
/* group surfaces by common properties */
void
SurfaceCollection::group(std::vector<SurfacesPtr> *retval, bool merge_solid)
SurfaceCollection::group(std::vector<SurfacesPtr> *retval)
{
for (Surfaces::iterator it = this->surfaces.begin(); it != this->surfaces.end(); ++it) {
// find a group with the same properties
SurfacesPtr* group = NULL;
for (std::vector<SurfacesPtr>::iterator git = retval->begin(); git != retval->end(); ++git) {
Surface* gkey = git->front();
if ((gkey->surface_type == it->surface_type || (merge_solid && gkey->is_solid() && it->is_solid()))
if ( gkey->surface_type == it->surface_type
&& gkey->thickness == it->thickness
&& gkey->thickness_layers == it->thickness_layers
&& gkey->bridge_angle == it->bridge_angle) {

2
xs/src/SurfaceCollection.hpp
View file

@ -11,7 +11,7 @@ class SurfaceCollection
public:
Surfaces surfaces;
void simplify(double tolerance);
void group(std::vector<SurfacesPtr> *retval, bool merge_solid = false);
void group(std::vector<SurfacesPtr> *retval);
};
}