OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-13 14:27:08 +03:00
Code Activity

0028966: Coding Rules - remove Adaptor2d_HCurve2d, Adaptor3d_HCurve and Adaptor3d_HSurface classes

Browse Source 
Adaptor2d_Curve2d, Adaptor3d_Curve and Adaptor3d_Surface now inherit Standard_Transient.
Interfaces Adaptor2d_HCurve2d, Adaptor3d_HCurve, Adaptor3d_HSurface and their subclasses
are now aliases to Adaptor2d_Curve2d, Adaptor3d_Curve and Adaptor3d_Surface.
Removed numerous unsafe reinterpret casts.

Generic classes Adaptor3d_GenHCurve, Adaptor3d_GenHSurface, Adaptor2d_GenHCurve2d have been removed.
Several redundant .lxx files have been merged into .hxx.

Removed obsolete adaptor classes with H suffix.
This commit is contained in:
kgv
2020-12-03 17:36:19 +03:00
committed by bugmaster
parent 266877a7c3
commit c22b52d60e
710 changed files with 6144 additions and 14175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/IntPolyh/IntPolyh_Intersection.cxx
View File

@@ -17,7 +17,7 @@
#include <IntPolyh_Intersection.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <IntPolyh_Couple.hxx>
#include <IntPolyh_CoupleMapHasher.hxx>
@@ -39,8 +39,8 @@ static Standard_Boolean AnalyzeIntersection(IntPolyh_PMaillageAffinage& theMaill
//function : IntPolyh_Intersection
//purpose :
//=======================================================================
IntPolyh_Intersection::IntPolyh_Intersection(const Handle(Adaptor3d_HSurface)& theS1,
const Handle(Adaptor3d_HSurface)& theS2)
IntPolyh_Intersection::IntPolyh_Intersection(const Handle(Adaptor3d_Surface)& theS1,
const Handle(Adaptor3d_Surface)& theS2)
{
mySurf1 = theS1;
mySurf2 = theS2;
@@ -58,10 +58,10 @@ IntPolyh_Intersection::IntPolyh_Intersection(const Handle(Adaptor3d_HSurface)& t
//function : IntPolyh_Intersection
//purpose :
//=======================================================================
IntPolyh_Intersection::IntPolyh_Intersection(const Handle(Adaptor3d_HSurface)& theS1,
IntPolyh_Intersection::IntPolyh_Intersection(const Handle(Adaptor3d_Surface)& theS1,
const Standard_Integer theNbSU1,
const Standard_Integer theNbSV1,
const Handle(Adaptor3d_HSurface)& theS2,
const Handle(Adaptor3d_Surface)& theS2,
const Standard_Integer theNbSU2,
const Standard_Integer theNbSV2)
{
@@ -81,10 +81,10 @@ IntPolyh_Intersection::IntPolyh_Intersection(const Handle(Adaptor3d_HSurface)& t
//function : IntPolyh_Intersection
//purpose :
//=======================================================================
IntPolyh_Intersection::IntPolyh_Intersection(const Handle(Adaptor3d_HSurface)& theS1,
IntPolyh_Intersection::IntPolyh_Intersection(const Handle(Adaptor3d_Surface)& theS1,
const TColStd_Array1OfReal& theUPars1,
const TColStd_Array1OfReal& theVPars1,
const Handle(Adaptor3d_HSurface)& theS2,
const Handle(Adaptor3d_Surface)& theS2,
const TColStd_Array1OfReal& theUPars2,
const TColStd_Array1OfReal& theVPars2)
{

24
src/IntPolyh/IntPolyh_Intersection.hxx
View File

@@ -17,19 +17,13 @@
#ifndef _IntPolyh_Intersection_HeaderFile
#define _IntPolyh_Intersection_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Adaptor3d_Surface.hxx>
#include <IntPolyh_ArrayOfPointNormal.hxx>
#include <IntPolyh_ArrayOfSectionLines.hxx>
#include <IntPolyh_ArrayOfTangentZones.hxx>
#include <IntPolyh_ListOfCouples.hxx>
#include <IntPolyh_PMaillageAffinage.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Real.hxx>
class Adaptor3d_HSurface;
//! API algorithm for intersection of two surfaces by intersection
//! of their triangulations.
@@ -56,27 +50,27 @@ public: //! @name Constructors
//! Constructor for intersection of two surfaces with default parameters.
//! Performs intersection.
Standard_EXPORT IntPolyh_Intersection(const Handle(Adaptor3d_HSurface)& theS1,
const Handle(Adaptor3d_HSurface)& theS2);
Standard_EXPORT IntPolyh_Intersection(const Handle(Adaptor3d_Surface)& theS1,
const Handle(Adaptor3d_Surface)& theS2);
//! Constructor for intersection of two surfaces with the given
//! size of the sampling nets:
//! - <theNbSU1> x <theNbSV1> - for the first surface <theS1>;
//! - <theNbSU2> x <theNbSV2> - for the second surface <theS2>.
//! Performs intersection.
Standard_EXPORT IntPolyh_Intersection(const Handle(Adaptor3d_HSurface)& theS1,
Standard_EXPORT IntPolyh_Intersection(const Handle(Adaptor3d_Surface)& theS1,
const Standard_Integer theNbSU1,
const Standard_Integer theNbSV1,
const Handle(Adaptor3d_HSurface)& theS2,
const Handle(Adaptor3d_Surface)& theS2,
const Standard_Integer theNbSU2,
const Standard_Integer theNbSV2);
//! Constructor for intersection of two surfaces with the precomputed sampling.
//! Performs intersection.
Standard_EXPORT IntPolyh_Intersection(const Handle(Adaptor3d_HSurface)& theS1,
Standard_EXPORT IntPolyh_Intersection(const Handle(Adaptor3d_Surface)& theS1,
const TColStd_Array1OfReal& theUPars1,
const TColStd_Array1OfReal& theVPars1,
const Handle(Adaptor3d_HSurface)& theS2,
const Handle(Adaptor3d_Surface)& theS2,
const TColStd_Array1OfReal& theUPars2,
const TColStd_Array1OfReal& theVPars2);
@@ -196,8 +190,8 @@ private: //! @name Performing the intersection
private: //! @name Fields
// Inputs
Handle(Adaptor3d_HSurface) mySurf1; //!< First surface
Handle(Adaptor3d_HSurface) mySurf2; //!< Second surface
Handle(Adaptor3d_Surface) mySurf1; //!< First surface
Handle(Adaptor3d_Surface) mySurf2; //!< Second surface
Standard_Integer myNbSU1; //!< Number of samples in U direction for first surface
Standard_Integer myNbSV1; //!< Number of samples in V direction for first surface
Standard_Integer myNbSU2; //!< Number of samples in U direction for second surface

32
src/IntPolyh/IntPolyh_MaillageAffinage.cxx
View File

@@ -23,7 +23,7 @@
// Modified by skv - Thu Sep 25 17:42:42 2003 OCC567
// modified by ofv Thu Apr 8 14:58:13 2004 fip
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Bnd_BoundSortBox.hxx>
#include <Bnd_Box.hxx>
#include <Bnd_HArray1OfBox.hxx>
@@ -122,14 +122,14 @@ static
const Standard_Boolean Prepend=Standard_False);
static
Standard_Boolean IsDegenerated(const Handle(Adaptor3d_HSurface)& aS,
Standard_Boolean IsDegenerated(const Handle(Adaptor3d_Surface)& aS,
const Standard_Integer aIndex,
const Standard_Real aTol2,
Standard_Real& aDegX);
static
void DegeneratedIndex(const TColStd_Array1OfReal& Xpars,
const Standard_Integer aNbX,
const Handle(Adaptor3d_HSurface)& aS,
const Handle(Adaptor3d_Surface)& aS,
const Standard_Integer aIsoDirection,
Standard_Integer& aI1,
Standard_Integer& aI2);
@@ -281,8 +281,8 @@ static
//purpose :
//=======================================================================
IntPolyh_MaillageAffinage::IntPolyh_MaillageAffinage
(const Handle(Adaptor3d_HSurface)& Surface1,
const Handle(Adaptor3d_HSurface)& Surface2,
(const Handle(Adaptor3d_Surface)& Surface1,
const Handle(Adaptor3d_Surface)& Surface2,
const Standard_Integer )
:
MaSurface1(Surface1),
@@ -303,10 +303,10 @@ IntPolyh_MaillageAffinage::IntPolyh_MaillageAffinage
//purpose :
//=======================================================================
IntPolyh_MaillageAffinage::IntPolyh_MaillageAffinage
(const Handle(Adaptor3d_HSurface)& Surface1,
(const Handle(Adaptor3d_Surface)& Surface1,
const Standard_Integer NbSU1,
const Standard_Integer NbSV1,
const Handle(Adaptor3d_HSurface)& Surface2,
const Handle(Adaptor3d_Surface)& Surface2,
const Standard_Integer NbSU2,
const Standard_Integer NbSV2,
const Standard_Integer )
@@ -385,7 +385,7 @@ void IntPolyh_MaillageAffinage::FillArrayOfPnt
aNbU=(SurfID==1)? NbSamplesU1 : NbSamplesU2;
aNbV=(SurfID==1)? NbSamplesV1 : NbSamplesV2;
Bnd_Box& aBox = (SurfID==1) ? MyBox1 : MyBox2;
Handle(Adaptor3d_HSurface)& aS=(SurfID==1)? MaSurface1:MaSurface2;
Handle(Adaptor3d_Surface)& aS=(SurfID==1)? MaSurface1:MaSurface2;
IntPolyh_ArrayOfPoints &TPoints=(SurfID==1)? TPoints1:TPoints2;
//
aJD1=0;
@@ -441,7 +441,7 @@ void IntPolyh_MaillageAffinage::FillArrayOfPnt(const Standard_Integer SurfID,
const TColStd_Array1OfReal& theVPars,
const Standard_Real theDeflTol)
{
Handle(Adaptor3d_HSurface) aS = (SurfID == 1) ? MaSurface1 : MaSurface2;
Handle(Adaptor3d_Surface) aS = (SurfID == 1) ? MaSurface1 : MaSurface2;
IntPolyh_ArrayOfPoints& TPoints = (SurfID == 1) ? TPoints1 : TPoints2;
Standard_Integer aNbU = (SurfID == 1) ? NbSamplesU1 : NbSamplesU2;
Standard_Integer aNbV = (SurfID == 1) ? NbSamplesV1 : NbSamplesV2;
@@ -505,7 +505,7 @@ void IntPolyh_MaillageAffinage::FillArrayOfPnt
const TColStd_Array1OfReal& Vpars,
const Standard_Real *theDeflTol)
{
Handle(Adaptor3d_HSurface) aS = (SurfID == 1) ? MaSurface1 : MaSurface2;
Handle(Adaptor3d_Surface) aS = (SurfID == 1) ? MaSurface1 : MaSurface2;
// Compute the tolerance
Standard_Real aTol = theDeflTol != NULL ? * theDeflTol :
IntPolyh_Tools::ComputeDeflection(aS, Upars, Vpars);
@@ -934,7 +934,7 @@ void IntPolyh_MaillageAffinage::LocalSurfaceRefinement(const Standard_Integer Su
void IntPolyh_MaillageAffinage::ComputeDeflections
(const Standard_Integer SurfID)
{
Handle(Adaptor3d_HSurface) aSurface=(SurfID==1)? MaSurface1:MaSurface2;
Handle(Adaptor3d_Surface) aSurface=(SurfID==1)? MaSurface1:MaSurface2;
IntPolyh_ArrayOfPoints &TPoints=(SurfID==1)? TPoints1:TPoints2;
IntPolyh_ArrayOfTriangles &TTriangles=(SurfID==1)? TTriangles1:TTriangles2;
Standard_Real &FlecheMin=(SurfID==1)? FlecheMin1:FlecheMin2;
@@ -959,12 +959,12 @@ void IntPolyh_MaillageAffinage::ComputeDeflections
//purpose : Refinement of the triangles depending on the deflection
//=======================================================================
static
void TrianglesDeflectionsRefinement(const Handle(Adaptor3d_HSurface)& theS1,
void TrianglesDeflectionsRefinement(const Handle(Adaptor3d_Surface)& theS1,
IntPolyh_ArrayOfTriangles& theTriangles1,
IntPolyh_ArrayOfEdges& theEdges1,
IntPolyh_ArrayOfPoints& thePoints1,
const Standard_Real theFlecheCritique1,
const Handle(Adaptor3d_HSurface)& theS2,
const Handle(Adaptor3d_Surface)& theS2,
IntPolyh_ArrayOfTriangles& theTriangles2,
IntPolyh_ArrayOfEdges& theEdges2,
IntPolyh_ArrayOfPoints& thePoints2,
@@ -1027,7 +1027,7 @@ static
// much smaller then the other.
//=======================================================================
static
void LargeTrianglesDeflectionsRefinement(const Handle(Adaptor3d_HSurface)& theS,
void LargeTrianglesDeflectionsRefinement(const Handle(Adaptor3d_Surface)& theS,
IntPolyh_ArrayOfTriangles& theTriangles,
IntPolyh_ArrayOfEdges& theEdges,
IntPolyh_ArrayOfPoints& thePoints,
@@ -2912,7 +2912,7 @@ Standard_Real IntPolyh_MaillageAffinage::GetMaxDeflection(const Standard_Integer
//=======================================================================
void DegeneratedIndex(const TColStd_Array1OfReal& aXpars,
const Standard_Integer aNbX,
const Handle(Adaptor3d_HSurface)& aS,
const Handle(Adaptor3d_Surface)& aS,
const Standard_Integer aIsoDirection,
Standard_Integer& aI1,
Standard_Integer& aI2)
@@ -2959,7 +2959,7 @@ void DegeneratedIndex(const TColStd_Array1OfReal& aXpars,
//function : IsDegenerated
//purpose :
//=======================================================================
Standard_Boolean IsDegenerated(const Handle(Adaptor3d_HSurface)& aS,
Standard_Boolean IsDegenerated(const Handle(Adaptor3d_Surface)& aS,
const Standard_Integer aIndex,
const Standard_Real aTol2,
Standard_Real& aDegX)

24
src/IntPolyh/IntPolyh_MaillageAffinage.hxx
View File

@@ -17,29 +17,19 @@
#ifndef _IntPolyh_MaillageAffinage_HeaderFile
#define _IntPolyh_MaillageAffinage_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Bnd_Box.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx>
#include <IntPolyh_ArrayOfPoints.hxx>
#include <IntPolyh_ArrayOfEdges.hxx>
#include <IntPolyh_ArrayOfTriangles.hxx>
#include <IntPolyh_ListOfCouples.hxx>
#include <Standard_Boolean.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <IntPolyh_ArrayOfPointNormal.hxx>
#include <IntPolyh_ArrayOfSectionLines.hxx>
#include <IntPolyh_ArrayOfTangentZones.hxx>
class Adaptor3d_HSurface;
class Bnd_Box;
class IntPolyh_Point;
class IntPolyh_StartPoint;
class IntPolyh_Triangle;
class IntPolyh_SectionLine;
class Bnd_Box;
class IntPolyh_StartPoint;
//! Low-level algorithm to compute intersection of the surfaces
//! by computing the intersection of their triangulations.
@@ -50,9 +40,9 @@ public:
DEFINE_STANDARD_ALLOC
Standard_EXPORT IntPolyh_MaillageAffinage(const Handle(Adaptor3d_HSurface)& S1, const Standard_Integer NbSU1, const Standard_Integer NbSV1, const Handle(Adaptor3d_HSurface)& S2, const Standard_Integer NbSU2, const Standard_Integer NbSV2, const Standard_Integer PRINT);
Standard_EXPORT IntPolyh_MaillageAffinage(const Handle(Adaptor3d_Surface)& S1, const Standard_Integer NbSU1, const Standard_Integer NbSV1, const Handle(Adaptor3d_Surface)& S2, const Standard_Integer NbSU2, const Standard_Integer NbSV2, const Standard_Integer PRINT);
Standard_EXPORT IntPolyh_MaillageAffinage(const Handle(Adaptor3d_HSurface)& S1, const Handle(Adaptor3d_HSurface)& S2, const Standard_Integer PRINT);
Standard_EXPORT IntPolyh_MaillageAffinage(const Handle(Adaptor3d_Surface)& S1, const Handle(Adaptor3d_Surface)& S2, const Standard_Integer PRINT);
//! Makes the sampling of the surface -
@@ -204,8 +194,8 @@ protected:
private:
Handle(Adaptor3d_HSurface) MaSurface1;
Handle(Adaptor3d_HSurface) MaSurface2;
Handle(Adaptor3d_Surface) MaSurface1;
Handle(Adaptor3d_Surface) MaSurface2;
Bnd_Box MyBox1;
Bnd_Box MyBox2;
Standard_Integer NbSamplesU1;

4
src/IntPolyh/IntPolyh_Point.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <IntPolyh_Point.hxx>
#include <stdio.h>
@@ -24,7 +24,7 @@
//function : Middle
//purpose :
//=======================================================================
void IntPolyh_Point::Middle(const Handle(Adaptor3d_HSurface)& MySurface,
void IntPolyh_Point::Middle(const Handle(Adaptor3d_Surface)& MySurface,
const IntPolyh_Point & Point1,
const IntPolyh_Point & Point2){
myU = (Point1.U()+Point2.U())*0.5;

11
src/IntPolyh/IntPolyh_Point.hxx
View File

@@ -17,14 +17,7 @@
#ifndef _IntPolyh_Point_HeaderFile
#define _IntPolyh_Point_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Boolean.hxx>
class Adaptor3d_HSurface;
#include <Adaptor3d_Surface.hxx>
//! The class represents the point on the surface with
//! both 3D and 2D points.
@@ -125,7 +118,7 @@ public:
myPOC = ii;
}
//! Creates middle point from P1 and P2 and stores it to this
Standard_EXPORT void Middle (const Handle(Adaptor3d_HSurface)& MySurface, const IntPolyh_Point& P1, const IntPolyh_Point& P2);
Standard_EXPORT void Middle (const Handle(Adaptor3d_Surface)& MySurface, const IntPolyh_Point& P1, const IntPolyh_Point& P2);
//! Addition
Standard_EXPORT IntPolyh_Point Add (const IntPolyh_Point& P1) const;
IntPolyh_Point operator + (const IntPolyh_Point& P1) const

12
src/IntPolyh/IntPolyh_Tools.cxx
View File

@@ -14,7 +14,7 @@
#include <IntPolyh_Tools.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Precision.hxx>
#include <IntCurveSurface_ThePolyhedronOfHInter.hxx>
@@ -22,7 +22,7 @@
//function : IsEnlargePossible
//purpose :
//=======================================================================
void IntPolyh_Tools::IsEnlargePossible(const Handle(Adaptor3d_HSurface)& theSurf,
void IntPolyh_Tools::IsEnlargePossible(const Handle(Adaptor3d_Surface)& theSurf,
Standard_Boolean& theUEnlarge,
Standard_Boolean& theVEnlarge)
{
@@ -62,7 +62,7 @@ void IntPolyh_Tools::IsEnlargePossible(const Handle(Adaptor3d_HSurface)& theSurf
//function : EnlargeZone
//purpose : Enlarges the sampling zone of the surface
//=======================================================================
static void EnlargeZone(const Handle(Adaptor3d_HSurface)& theSurf,
static void EnlargeZone(const Handle(Adaptor3d_Surface)& theSurf,
Standard_Real &u0,
Standard_Real &u1,
Standard_Real &v0,
@@ -90,7 +90,7 @@ static void EnlargeZone(const Handle(Adaptor3d_HSurface)& theSurf,
//function : MakeSampling
//purpose :
//=======================================================================
void IntPolyh_Tools::MakeSampling(const Handle(Adaptor3d_HSurface)& theSurf,
void IntPolyh_Tools::MakeSampling(const Handle(Adaptor3d_Surface)& theSurf,
const Standard_Integer theNbSU,
const Standard_Integer theNbSV,
const Standard_Boolean theEnlargeZone,
@@ -141,7 +141,7 @@ void IntPolyh_Tools::MakeSampling(const Handle(Adaptor3d_HSurface)& theSurf,
//function : ComputeDeflection
//purpose :
//=======================================================================
Standard_Real IntPolyh_Tools::ComputeDeflection(const Handle(Adaptor3d_HSurface)& theSurf,
Standard_Real IntPolyh_Tools::ComputeDeflection(const Handle(Adaptor3d_Surface)& theSurf,
const TColStd_Array1OfReal& theUPars,
const TColStd_Array1OfReal& theVPars)
{
@@ -154,7 +154,7 @@ Standard_Real IntPolyh_Tools::ComputeDeflection(const Handle(Adaptor3d_HSurface)
//function : FillArrayOfPointNormal
//purpose :
//=======================================================================
void IntPolyh_Tools::FillArrayOfPointNormal(const Handle(Adaptor3d_HSurface)& theSurf,
void IntPolyh_Tools::FillArrayOfPointNormal(const Handle(Adaptor3d_Surface)& theSurf,
const TColStd_Array1OfReal& theUPars,
const TColStd_Array1OfReal& theVPars,
IntPolyh_ArrayOfPointNormal& thePoints)

10
src/IntPolyh/IntPolyh_Tools.hxx
View File

@@ -15,17 +15,17 @@
#ifndef _IntPolyh_Tools_HeaderFile
#define _IntPolyh_Tools_HeaderFile
#include <Adaptor3d_Surface.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <IntPolyh_ArrayOfPointNormal.hxx>
class Adaptor3d_HSurface;
//! The class provides tools for surface sampling.
class IntPolyh_Tools
{
public:
//! Checks if the surface can be enlarged in U or V direction.
Standard_EXPORT static void IsEnlargePossible(const Handle(Adaptor3d_HSurface)& theSurf,
Standard_EXPORT static void IsEnlargePossible(const Handle(Adaptor3d_Surface)& theSurf,
Standard_Boolean& theUEnlarge,
Standard_Boolean& theVEnlarge);
@@ -35,7 +35,7 @@ public:
//! sampling zone on the surface.
//! The parameters of the sampling points are stored into
//! <theUPars> and <theVPars> arrays.
Standard_EXPORT static void MakeSampling(const Handle(Adaptor3d_HSurface)& theSurf,
Standard_EXPORT static void MakeSampling(const Handle(Adaptor3d_Surface)& theSurf,
const Standard_Integer theNbSU,
const Standard_Integer theNbSV,
const Standard_Boolean theEnlargeZone,
@@ -43,13 +43,13 @@ public:
TColStd_Array1OfReal& theVPars);
//! Computes the deflection tolerance on the surface for the given sampling.
Standard_EXPORT static Standard_Real ComputeDeflection(const Handle(Adaptor3d_HSurface)& theSurf,
Standard_EXPORT static Standard_Real ComputeDeflection(const Handle(Adaptor3d_Surface)& theSurf,
const TColStd_Array1OfReal& theUPars,
const TColStd_Array1OfReal& theVPars);
//! Fills the array <thePoints> with the points (triangulation nodes) on the surface
//! and normal directions of the surface in these points.
Standard_EXPORT static void FillArrayOfPointNormal(const Handle(Adaptor3d_HSurface)& theSurf,
Standard_EXPORT static void FillArrayOfPointNormal(const Handle(Adaptor3d_Surface)& theSurf,
const TColStd_Array1OfReal& theUPars,
const TColStd_Array1OfReal& theVPars,
IntPolyh_ArrayOfPointNormal& thePoints);

12
src/IntPolyh/IntPolyh_Triangle.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Bnd_Box.hxx>
#include <IntPolyh_Edge.hxx>
#include <IntPolyh_Point.hxx>
@@ -40,7 +40,7 @@ static
const Standard_Integer P2,
const Standard_Integer P3,
IntPolyh_ArrayOfTriangles &TTriangles,
const Handle(Adaptor3d_HSurface)& MySurface,
const Handle(Adaptor3d_Surface)& MySurface,
IntPolyh_ArrayOfPoints &TPoints);
static
void NewEdge(const Standard_Integer P1,
@@ -61,7 +61,7 @@ static
// barycenter of the triangle in UV space.
//=======================================================================
Standard_Real
IntPolyh_Triangle::ComputeDeflection(const Handle(Adaptor3d_HSurface)& theSurface,
IntPolyh_Triangle::ComputeDeflection(const Handle(Adaptor3d_Surface)& theSurface,
const IntPolyh_ArrayOfPoints& TPoints)
{
myDeflection = 0.;
@@ -218,7 +218,7 @@ void NewTriangle(const Standard_Integer P1,
const Standard_Integer P2,
const Standard_Integer P3,
IntPolyh_ArrayOfTriangles &TTriangles,
const Handle(Adaptor3d_HSurface)& MySurface,
const Handle(Adaptor3d_Surface)& MySurface,
IntPolyh_ArrayOfPoints &TPoints) {
const Standard_Integer FinTT = TTriangles.NbItems();
TTriangles[FinTT].SetFirstPoint(P1);
@@ -270,7 +270,7 @@ void OldEdge(const Standard_Integer EdgeN,
//purpose :
//=======================================================================
void IntPolyh_Triangle::MiddleRefinement(const Standard_Integer NumTri,
const Handle(Adaptor3d_HSurface)& MySurface,
const Handle(Adaptor3d_Surface)& MySurface,
IntPolyh_ArrayOfPoints &TPoints,
IntPolyh_ArrayOfTriangles &TTriangles,
IntPolyh_ArrayOfEdges & TEdges)
@@ -567,7 +567,7 @@ void IntPolyh_Triangle::MiddleRefinement(const Standard_Integer NumTri,
void IntPolyh_Triangle::MultipleMiddleRefinement(const Standard_Real theRefineCriterion,
const Bnd_Box& theBox,
const Standard_Integer theTriangleNumber,
const Handle(Adaptor3d_HSurface)& theSurface,
const Handle(Adaptor3d_Surface)& theSurface,
IntPolyh_ArrayOfPoints& TPoints,
IntPolyh_ArrayOfTriangles& TTriangles,
IntPolyh_ArrayOfEdges& TEdges)

15
src/IntPolyh/IntPolyh_Triangle.hxx
View File

@@ -17,17 +17,12 @@
#ifndef _IntPolyh_Triangle_HeaderFile
#define _IntPolyh_Triangle_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Bnd_Box.hxx>
#include <IntPolyh_ArrayOfPoints.hxx>
#include <IntPolyh_ArrayOfTriangles.hxx>
#include <IntPolyh_ArrayOfEdges.hxx>
class Adaptor3d_HSurface;
class IntPolyh_StartPoint;
//! The class represents the triangle built from three IntPolyh points
@@ -227,7 +222,7 @@ public:
}
//! Computes the deflection for the triangle
Standard_EXPORT Standard_Real ComputeDeflection(const Handle(Adaptor3d_HSurface)& theSurface,
Standard_EXPORT Standard_Real ComputeDeflection(const Handle(Adaptor3d_Surface)& theSurface,
const IntPolyh_ArrayOfPoints& thePoints);
//! Gets the adjacent triangle
@@ -237,7 +232,7 @@ public:
//! Splits the triangle on two to decrease its deflection
Standard_EXPORT void MiddleRefinement(const Standard_Integer theTriangleNumber,
const Handle(Adaptor3d_HSurface)& theSurface,
const Handle(Adaptor3d_Surface)& theSurface,
IntPolyh_ArrayOfPoints& TPoints,
IntPolyh_ArrayOfTriangles& TTriangles,
IntPolyh_ArrayOfEdges& TEdges);
@@ -247,7 +242,7 @@ public:
Standard_EXPORT void MultipleMiddleRefinement(const Standard_Real theRefineCriterion,
const Bnd_Box& theBox,
const Standard_Integer theTriangleNumber,
const Handle(Adaptor3d_HSurface)& theSurface,
const Handle(Adaptor3d_Surface)& theSurface,
IntPolyh_ArrayOfPoints& TPoints,
IntPolyh_ArrayOfTriangles& TTriangles,
IntPolyh_ArrayOfEdges& TEdges);