Part: Make 3rd party libraries into PCH
This commit is contained in:
committed by
abdullahtahiriyo
parent
43bdef67d6
commit
a56658489b
@@ -22,54 +22,60 @@
|
||||
|
||||
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
#include <algorithm>
|
||||
#include <iterator>
|
||||
#include <Geom_Surface.hxx>
|
||||
#include <Geom_RectangularTrimmedSurface.hxx>
|
||||
#include <GeomAdaptor_Surface.hxx>
|
||||
#include <Geom_Plane.hxx>
|
||||
#include <Geom_CylindricalSurface.hxx>
|
||||
#include <gp_Ax3.hxx>
|
||||
#include <Geom_BSplineSurface.hxx>
|
||||
#include <gp_Pln.hxx>
|
||||
#include <gp_Cylinder.hxx>
|
||||
#include <TColgp_Array2OfPnt.hxx>
|
||||
#include <TColStd_Array1OfReal.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopoDS_Compound.hxx>
|
||||
#include <TopoDS.hxx>
|
||||
#include <TopExp.hxx>
|
||||
#include <TopExp_Explorer.hxx>
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <BRepLib_MakeWire.hxx>
|
||||
#include <BRepLib_FuseEdges.hxx>
|
||||
#include <BRepBuilderAPI_MakeFace.hxx>
|
||||
#include <BRepBuilderAPI_MakeSolid.hxx>
|
||||
#include <BRepBuilderAPI_Sewing.hxx>
|
||||
#include <Geom_Conic.hxx>
|
||||
#include <ShapeBuild_ReShape.hxx>
|
||||
#include <ShapeFix_Face.hxx>
|
||||
#include <TopTools_ListOfShape.hxx>
|
||||
#include <TopTools_ListIteratorOfListOfShape.hxx>
|
||||
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
|
||||
#include <TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape.hxx>
|
||||
#include <BRep_Builder.hxx>
|
||||
#include <Bnd_Box.hxx>
|
||||
#include <BRepBndLib.hxx>
|
||||
#include <ShapeAnalysis_Edge.hxx>
|
||||
#include <ShapeAnalysis_Curve.hxx>
|
||||
#include <BRepAdaptor_Curve.hxx>
|
||||
#include <TColgp_SequenceOfPnt.hxx>
|
||||
#include <GeomAPI_ProjectPointOnSurf.hxx>
|
||||
#include <BRepGProp.hxx>
|
||||
#include <GProp_GProps.hxx>
|
||||
#include <Standard_Version.hxx>
|
||||
#endif
|
||||
# include <algorithm>
|
||||
# include <iterator>
|
||||
# include <Geom_Surface.hxx>
|
||||
# include <Geom_RectangularTrimmedSurface.hxx>
|
||||
# include <GeomAdaptor_Surface.hxx>
|
||||
# include <Geom_Plane.hxx>
|
||||
# include <Geom_CylindricalSurface.hxx>
|
||||
# include <gp_Ax3.hxx>
|
||||
# include <Geom_BSplineSurface.hxx>
|
||||
# include <gp_Pln.hxx>
|
||||
# include <gp_Cylinder.hxx>
|
||||
# include <TColgp_Array2OfPnt.hxx>
|
||||
# include <TColStd_Array1OfReal.hxx>
|
||||
# include <TopoDS_Shape.hxx>
|
||||
# include <TopoDS_Compound.hxx>
|
||||
# include <TopoDS.hxx>
|
||||
# include <TopExp.hxx>
|
||||
# include <TopExp_Explorer.hxx>
|
||||
# include <BRep_Tool.hxx>
|
||||
# include <BRepLib_MakeWire.hxx>
|
||||
# include <BRepLib_FuseEdges.hxx>
|
||||
# include <BRepBuilderAPI_MakeFace.hxx>
|
||||
# include <BRepBuilderAPI_MakeSolid.hxx>
|
||||
# include <BRepBuilderAPI_Sewing.hxx>
|
||||
# include <Geom_Conic.hxx>
|
||||
# include <ShapeBuild_ReShape.hxx>
|
||||
# include <ShapeFix_Face.hxx>
|
||||
# include <TopTools_ListOfShape.hxx>
|
||||
# include <TopTools_ListIteratorOfListOfShape.hxx>
|
||||
# include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
|
||||
# include <TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape.hxx>
|
||||
# include <BRep_Builder.hxx>
|
||||
# include <Bnd_Box.hxx>
|
||||
# include <BRepBndLib.hxx>
|
||||
# include <ShapeAnalysis_Edge.hxx>
|
||||
# include <ShapeAnalysis_Curve.hxx>
|
||||
# include <BRepAdaptor_Curve.hxx>
|
||||
# include <TColgp_SequenceOfPnt.hxx>
|
||||
# include <GeomAPI_ProjectPointOnSurf.hxx>
|
||||
# include <BRepGProp.hxx>
|
||||
# include <GProp_GProps.hxx>
|
||||
# include <Standard_Version.hxx>
|
||||
#endif // _PreComp_
|
||||
|
||||
#include <Base/Tools.h>
|
||||
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Tools.h>
|
||||
|
||||
#include "modelRefine.h"
|
||||
|
||||
|
||||
using namespace ModelRefine;
|
||||
|
||||
|
||||
@@ -466,7 +472,7 @@ bool FaceTypedCylinder::isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &f
|
||||
return false;//probably need an error
|
||||
gp_Cylinder cylinderOne = surfaceOne->Cylinder();
|
||||
gp_Cylinder cylinderTwo = surfaceTwo->Cylinder();
|
||||
|
||||
|
||||
if (fabs(cylinderOne.Radius() - cylinderTwo.Radius()) > Precision::Confusion())
|
||||
return false;
|
||||
if (!cylinderOne.Axis().IsCoaxial(cylinderTwo.Axis(), Precision::Angular(), Precision::Confusion()) &&
|
||||
@@ -617,7 +623,7 @@ bool wireEncirclesAxis(const TopoDS_Wire& wire, const Handle(Geom_CylindricalSur
|
||||
}
|
||||
|
||||
TopoDS_Face FaceTypedCylinder::buildFace(const FaceVectorType &faces) const
|
||||
{
|
||||
{
|
||||
static TopoDS_Face dummy;
|
||||
std::vector<EdgeVectorType> boundaries;
|
||||
boundarySplit(faces, boundaries);
|
||||
@@ -649,7 +655,7 @@ TopoDS_Face FaceTypedCylinder::buildFace(const FaceVectorType &faces) const
|
||||
if (surface.IsNull())
|
||||
return dummy;
|
||||
std::vector<TopoDS_Wire> innerWires, encirclingWires;
|
||||
std::vector<TopoDS_Wire>::iterator wireIt;
|
||||
std::vector<TopoDS_Wire>::iterator wireIt;
|
||||
for (wireIt = allWires.begin(); wireIt != allWires.end(); ++wireIt) {
|
||||
if (wireEncirclesAxis(*wireIt, surface))
|
||||
encirclingWires.push_back(*wireIt);
|
||||
@@ -789,7 +795,7 @@ void collectConicEdges(const TopoDS_Shell &shell, TopTools_IndexedMapOfShape &ma
|
||||
{
|
||||
TopTools_IndexedMapOfShape edges;
|
||||
TopExp::MapShapes(shell, TopAbs_EDGE, edges);
|
||||
|
||||
|
||||
for (int index = 1; index <= edges.Extent(); ++index)
|
||||
{
|
||||
const TopoDS_Edge ¤tEdge = TopoDS::Edge(edges.FindKey(index));
|
||||
@@ -942,7 +948,7 @@ bool FaceTypedBSpline::isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &fa
|
||||
stream << "FaceTypedBSpline::isEqual: Unknown Error" << std::endl;
|
||||
Base::Console().Message(stream.str().c_str());
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1118,7 +1124,7 @@ bool FaceUniter::process()
|
||||
for(sewIt = facesToSew.begin(); sewIt != facesToSew.end(); ++sewIt)
|
||||
builder.Add(workShell, *sewIt);
|
||||
}
|
||||
|
||||
|
||||
BRepLib_FuseEdges edgeFuse(workShell);
|
||||
// TODO: change this version after occ fix. Freecad Mantis 1450
|
||||
#if OCC_VERSION_HEX <= 0x7fffff
|
||||
|
||||
Reference in New Issue
Block a user