kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fix -Wextra in Mesh

Browse Source
This commit is contained in:
wmayer
2016-09-23 17:24:00 +02:00
parent d88ecd5f56
commit f6e1cb6025
33 changed files with 646 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Mod/Mesh/App/Mesh.cpp
View File

@@ -107,7 +107,7 @@ unsigned long MeshObject::countSubElements(const char* Type) const
return 0;
}
Data::Segment* MeshObject::getSubElement(const char* Type, unsigned long n) const
Data::Segment* MeshObject::getSubElement(const char* Type, unsigned long /*n*/) const
{
//TODO
std::string element(Type);
@@ -118,9 +118,9 @@ Data::Segment* MeshObject::getSubElement(const char* Type, unsigned long n) cons
return 0;
}
void MeshObject::getFacesFromSubelement(const Data::Segment* segm,
void MeshObject::getFacesFromSubelement(const Data::Segment* /*segm*/,
std::vector<Base::Vector3d> &Points,
std::vector<Base::Vector3d> &PointNormals,
std::vector<Base::Vector3d> &/*PointNormals*/,
std::vector<Facet> &faces) const
{
//TODO
@@ -289,7 +289,7 @@ Mesh::Facet MeshObject::getFacet(unsigned long index) const
}
void MeshObject::getFaces(std::vector<Base::Vector3d> &Points,std::vector<Facet> &Topo,
float Accuracy, uint16_t flags) const
float /*Accuracy*/, uint16_t /*flags*/) const
{
unsigned long ctpoints = _kernel.CountPoints();
Points.reserve(ctpoints);
@@ -314,7 +314,7 @@ unsigned int MeshObject::getMemSize (void) const
return _kernel.GetMemSize();
}
void MeshObject::Save (Base::Writer &writer) const
void MeshObject::Save (Base::Writer &/*writer*/) const
{
// this is handled by the property class
}
@@ -324,7 +324,7 @@ void MeshObject::SaveDocFile (Base::Writer &writer) const
_kernel.Write(writer.Stream());
}
void MeshObject::Restore(Base::XMLReader &reader)
void MeshObject::Restore(Base::XMLReader &/*reader*/)
{
// this is handled by the property class
}
@@ -1659,7 +1659,7 @@ MeshObject* MeshObject::meshFromSegment(const std::vector<unsigned long>& indice
return new MeshObject(kernel, _Mtrx);
}
std::vector<Segment> MeshObject::getSegmentsFromType(MeshObject::GeometryType type, const Segment& aSegment,
std::vector<Segment> MeshObject::getSegmentsFromType(MeshObject::GeometryType type,
float dev, unsigned long minFacets) const
{
std::vector<Segment> segm;
@@ -1667,17 +1667,31 @@ std::vector<Segment> MeshObject::getSegmentsFromType(MeshObject::GeometryType ty
return segm;
MeshCore::MeshSegmentAlgorithm finder(this->_kernel);
MeshCore::MeshDistanceSurfaceSegment* surf;
surf = new MeshCore::MeshDistancePlanarSegment(this->_kernel, minFacets, dev);
std::vector<MeshCore::MeshSurfaceSegment*> surfaces;
surfaces.push_back(surf);
finder.FindSegments(surfaces);
const std::vector<MeshCore::MeshSegment>& data = surf->GetSegments();
for (std::vector<MeshCore::MeshSegment>::const_iterator it = data.begin(); it != data.end(); ++it) {
segm.push_back(Segment(const_cast<MeshObject*>(this), *it, false));
std::unique_ptr<MeshCore::MeshDistanceSurfaceSegment> surf;
switch (type) {
case PLANE:
surf.reset(new MeshCore::MeshDistancePlanarSegment(this->_kernel, minFacets, dev));
break;
// todo!
case CYLINDER:
break;
case SPHERE:
break;
default:
break;
}
delete surf;
if (surf.get()) {
std::vector<MeshCore::MeshSurfaceSegment*> surfaces;
surfaces.push_back(surf.get());
finder.FindSegments(surfaces);
const std::vector<MeshCore::MeshSegment>& data = surf->GetSegments();
for (std::vector<MeshCore::MeshSegment>::const_iterator it = data.begin(); it != data.end(); ++it) {
segm.push_back(Segment(const_cast<MeshObject*>(this), *it, false));
}
}
return segm;
}