diff --git a/EGkSurfAux.h b/EGkSurfAux.h index 15254a2..9a64191 100644 --- a/EGkSurfAux.h +++ b/EGkSurfAux.h @@ -59,3 +59,8 @@ struct SNurbsSurfData //! Trasforma una superficie Nurbs standard in una nuova superficie di Bezier semplice o composta EGK_EXPORT bool NurbsSurfaceCanonicalize( SNurbsSurfData& snData) ; EGK_EXPORT ISurf* NurbsToBezierSurface( const SNurbsSurfData& snData) ; +//! Per rendere uniforme lo spazio parametrico passando da Nurbs a MultiBezier +EGK_EXPORT bool MakeUniform( ISurfFlatRegion*& pSfr, bool& bRescaled, const DBLVECTOR& vU0, const DBLVECTOR& vV0, + int nDegU, int nDegV, double dScaleU, double dScaleV, bool bRetry) ; +//! Per identificare su che edge è il punto +EGK_EXPORT bool OnWhichEdge( double u0, double u1, double v0, double v1, const Point3d& ptToAssign, int& nEdge) ; diff --git a/EGkSurfBezier.h b/EGkSurfBezier.h index 391f9ee..d7a87cc 100644 --- a/EGkSurfBezier.h +++ b/EGkSurfBezier.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2020-2020 +// EgalTech 2020-2024 //---------------------------------------------------------------------------- -// File : EGkSurfBezier.h Data : 22.03.20 Versione : 2.2c3 +// File : EGkSurfBezier.h Data : 10.04.24 Versione : 2.6d2 // Contenuto : Dichiarazione della interfaccia ISurfBezier. // // @@ -73,8 +73,6 @@ class __declspec( novtable) ISurfBezier : public ISurf virtual bool IncreaseUV( double& dU, double dx, bool bUOrV, double* dUVCopy = nullptr, bool bModifyOrig = true) const = 0 ; virtual bool IncreaseUV( Point3d& ptUV, Vector3d vtH , Point3d* ptUVCopy, bool bModifyOrig) const = 0 ; virtual bool GetLoops( ICRVCOMPOPOVECTOR& vCC, bool bLineOrBezier, int nEdge = -1) const = 0 ; - virtual bool MakeUniform( ISurfFlatRegion** sfr, DBLVECTOR& vU, DBLVECTOR& vV, double dScaleU, double dScaleV, bool& bRescaled, bool bRetry) const = 0 ; - virtual bool OnWhichEdge( double u0, double u1, double v0, double v1, int& nEdge, Point3d ptToAssign) const = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EInAPI.h b/EInAPI.h index 6e0441f..bd59232 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -119,7 +119,7 @@ EIN_EXPORT BOOL __stdcall EgtImportStl( const wchar_t* wsFilePath, double dScale EIN_EXPORT BOOL __stdcall EgtImport3MF( const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtImport3dm( const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtAdvancedImportIsEnabled( void) ; -EIN_EXPORT BOOL __stdcall EgtAdvancedImport( const wchar_t* wsFilePath, double dLinToler) ; +EIN_EXPORT BOOL __stdcall EgtAdvancedImport( const wchar_t* wsFilePath, double dLinToler, int nFlag) ; EIN_EXPORT BOOL __stdcall EgtExportDxf( int nId, const wchar_t* wsFilePath, int nFlag, int nFilter) ; EIN_EXPORT BOOL __stdcall EgtExportStl( int nId, const wchar_t* wsFilePath, int nFilter) ; EIN_EXPORT BOOL __stdcall EgtExport3MF( int nId, const wchar_t* wsFilePath, int nFilter) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 2bf02af..c4810b0 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -127,7 +127,7 @@ EXE_EXPORT bool ExeImportStl( const std::string& sFilePath, double dScaleFactor) EXE_EXPORT bool ExeImport3MF( const std::string& sFilePath) ; EXE_EXPORT bool ExeImport3dm( const std::string& sFilePath) ; EXE_EXPORT bool ExeAdvancedImportIsEnabled( void) ; -EXE_EXPORT bool ExeAdvancedImport( const std::string& sFilePath, double dToler = 0.1) ; +EXE_EXPORT bool ExeAdvancedImport( const std::string& sFilePath, double dToler = 0.1, int nFlag = 0) ; EXE_EXPORT bool ExeExportDxf( int nId, const std::string& sFilePath, int nFlag = 1, int nFilter = 393) ; EXE_EXPORT bool ExeExportStl( int nId, const std::string& sFilePath, int nFilter = 393) ; EXE_EXPORT bool ExeExport3MF( int nId, const std::string& sFilePath, int nFilter = 393) ;