diff --git a/EGkIntersLineSurfTm.h b/EGkIntersLineSurfTm.h index 2aa5250..cdfbe9a 100644 --- a/EGkIntersLineSurfTm.h +++ b/EGkIntersLineSurfTm.h @@ -45,8 +45,5 @@ struct IntLinStmInfo { typedef std::vector ILSIVECTOR ; //----------------------------------------------------------------------------- -// Per ora si considerano solo intersezioni semplici, ovvero che attraversano la superficie. -//EGK_EXPORT int IntersLineSurfTm( const Point3d& ptL1, const Point3d& ptL2, const Triangle3d& trTria, -// Point3d& ptInt) ; EGK_EXPORT bool IntersLineSurfTm( const Point3d& ptL, const Vector3d& vtL, double dLen, const ISurfTriMesh& Stm, ILSIVECTOR& vInfo) ; diff --git a/EGkIntersLineTria.h b/EGkIntersLineTria.h index a7e899c..3628979 100644 --- a/EGkIntersLineTria.h +++ b/EGkIntersLineTria.h @@ -36,4 +36,4 @@ enum IntLineTriaType { ILTT_NO = 0, // non c' ILTT_SEGM_ON_EDGE = 2, // una parte di linea appartiene ad un lato del triangolo ILTT_VERT = 3, // intersezione coincide con un vertice ILTT_EDGE = 4, // intersezione coincide con interno di un lato - ILTT_IN = 5} ; // intersezione coincide con interno del triangolo + ILTT_IN = 5} ; // intersezione in interno del triangolo diff --git a/EGkVolZmap.h b/EGkVolZmap.h index 0c199b4..cfc8b89 100644 --- a/EGkVolZmap.h +++ b/EGkVolZmap.h @@ -16,6 +16,7 @@ #include "/EgtDev/Include/EGkGeoObj.h" #include "/EgtDev/Include/EGkPolyLine.h" #include "/EgtDev/Include/EGkCurveComposite.h" +#include "/EgtDev/Include/EGkSurfFlatRegion.h" #include "/EgtDev/Include/EGkTriangle3d.h" @@ -24,7 +25,8 @@ class __declspec( novtable) IVolZmap : public IGeoObj { public : virtual bool CopyFrom( const IGeoObj* pGObjSrc) = 0 ; - virtual bool CreateMap( const Point3d& ptO, double dLenX, double dLenY, double dLenZ, double dPrec) = 0 ; + virtual bool CreateMap( const Point3d& ptO, double dDimX, double dDimY, double dDimZ, double dPrec) = 0 ; + virtual bool CreateMapFromFlatRegion( const ISurfFlatRegion& Surf, double dDimZ, double dPrec) = 0 ; virtual bool GetAllTriangles( TRIA3DLIST& lstTria) const = 0 ; virtual bool GetDexelLines( int nDir, int nPos1, int nPos2, POLYLINELIST& lstPL) const = 0 ; virtual bool SetTolerances( double dLinTol, double dAngTolDeg = 90) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 4cd98af..c792b94 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -259,6 +259,7 @@ EXE_EXPORT int ExeCreateSurfTmBySewing( int nParentId, const INTVECTOR& vIds, b // GeomDB Create Volume EXE_EXPORT int ExeCreateVolZmap( int nParentId, const Point3d& ptIni, double dDimX, double dDimY, double dDimZ, double dPrec, int nRefType) ; +EXE_EXPORT int ExeCreateVolZmapByRegionExtrusion( int nParentId, int nSfrId, double dDimZ, double dPrec) ; // GeomDB PartLayer EXE_EXPORT bool ExeIsPart( int nPartId) ;