diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index 11744ea..3510e12 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -70,9 +70,7 @@ class __declspec( novtable) ISurfTriMesh : public ISurf virtual bool GetVertex( int nId, Point3d& ptP) const = 0 ; virtual bool GetVertexParam( int nId, double& dU, double& dV) const = 0 ; virtual int GetFirstVertex( Point3d& ptP) const = 0 ; - virtual int GetFirstVertexParam( int nId, double& dU, double& dV) const = 0 ; virtual int GetNextVertex( int nId, Point3d& ptP) const = 0 ; - virtual int GetNextVertexParam( int nId, double& dU, double& dV) const = 0 ; virtual bool GetTriangle( int nId, int nIdVert[3]) const = 0 ; virtual int GetFirstTriangle( int nIdVert[3]) const = 0 ; virtual int GetNextTriangle( int nId, int nIdVert[3]) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 633161d..3338e72 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -807,6 +807,8 @@ EXE_EXPORT bool ExeLineBoxInters( const Point3d& ptP, const Vector3d& vtDir, con INTDBLVECTOR& vInters) ; EXE_EXPORT bool ExeLineSurfTmInters( const Point3d& ptP, const Vector3d& vtDir, int nId, int nRefType, INTDBLVECTOR& vInters) ; +EXE_EXPORT bool ExeLineSurfBzInters( const Point3d& ptP, const Vector3d& vtDir, int nId, int nRefType, + INTDBLVECTOR& vInters) ; EXE_EXPORT bool ExeLineVolZmapInters( const Point3d& ptP, const Vector3d& vtDir, int nId, int nRefType, INTDBLVECTOR& vInters) ; EXE_EXPORT int ExePlaneCurveInters( const Point3d& ptOn, const Vector3d& vtN, const int nId, const int nDestGrpId, const int nRefType, diff --git a/EgkIntersLineSurfBez.h b/EgkIntersLineSurfBez.h index 168ac9c..69ef158 100644 --- a/EgkIntersLineSurfBez.h +++ b/EgkIntersLineSurfBez.h @@ -16,6 +16,7 @@ #include "/EgtDev/Include/EGkSurfTriMesh.h" #include "/EgtDev/Include/EGkIntersLineTria.h" #include "/EgtDev/Include/EGkHashGrids2d.h" +#include "/EgtDev/Include/EGkSurfBezier.h" //----------------------- Macro per import/export ---------------------------- #undef EGK_EXPORT @@ -48,7 +49,7 @@ struct IntLinSbzInfo { typedef std::vector ILSBIVECTOR ; //----------------------------------------------------------------------------- -EGK_EXPORT bool IntersLineSurfBz( const Point3d& ptL, const Vector3d& vtL, double dLen, const ISurfBezier& SBz, +EGK_EXPORT bool IntersLineSurfBz( const Point3d& ptL, const Vector3d& vtL, double dLen, const ISurfBezier* pSBz, ILSBIVECTOR& vInfo, bool bFinite = true) ; //-----------------------------------------------------------------------------