diff --git a/API_MachMgr.cpp b/API_MachMgr.cpp index a1bfd18..517b263 100644 --- a/API_MachMgr.cpp +++ b/API_MachMgr.cpp @@ -337,6 +337,33 @@ __stdcall EgtRotateRawPart( int nRawId, const double vtAx[3], double dAngDeg) return ( ExeRotateRawPart( nRawId, vtAx, dAngDeg) ? TRUE : FALSE) ; } +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtGetRawPartCenter( int nRawId, double ptCen[3]) +{ + // recupero il centro + Point3d ptTmp ; + if ( ! ExeGetRawPartCenter( nRawId, ptTmp)) + return FALSE ; + // ritorno il centro + VEC_FROM_3D( ptCen, ptTmp) + return TRUE ; +} + +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtGetRawPartBBox( int nRawId, double ptMin[3], double ptMax[3]) +{ + // recupero il bounding box + BBox3d b3Raw ; + if ( ! ExeGetRawPartBBox( nRawId, b3Raw)) + return FALSE ; + // ritorno gli estremi del box + VEC_FROM_3D( ptMin, b3Raw.GetMin()) + VEC_FROM_3D( ptMax, b3Raw.GetMax()) + return TRUE ; +} + //----------------------------------------------------------------------------- int __stdcall EgtSplitFlatRawPartWithMachinings( int nRawId, int nNumMchId, const int nMchIds[]) diff --git a/API_Photo.cpp b/API_Photo.cpp index 9766a23..c352df3 100644 --- a/API_Photo.cpp +++ b/API_Photo.cpp @@ -30,6 +30,30 @@ __stdcall EgtAddPhoto( const wchar_t* wsName, const wchar_t* wsFile, ptOri, ptCen, dMMxPixel, nParentId, ptMin, ptMax) ; } +//----------------------------------------------------------------------------- +int +__stdcall EgtAddPhoto2( const wchar_t* wsName, const wchar_t* wsFile, + const double ptOri[3], const double ptCen[3], double dDimX, double dDimY, + int nParentId, const double ptMin[3], const double ptMax[3]) +{ + return ExeAddPhoto( wstrztoA( wsName), wstrztoA( wsFile), + ptOri, ptCen, dDimX, dDimY, nParentId, ptMin, ptMax) ; +} + +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtMovePhoto( int nId, const double vtMove[3]) +{ + return ( ExeMovePhoto( nId, vtMove) ? TRUE : FALSE) ; +} + +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtRotatePhoto( int nId, const double ptAx[3], const double vtAx[3], double dAngDeg) +{ + return ( ExeRotatePhoto( nId, ptAx, vtAx, dAngDeg) ? TRUE : FALSE) ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtGetPhotoPath( int nId, wchar_t*& wsFile) @@ -76,15 +100,6 @@ __stdcall EgtGetPhotoCenter( int nId, double ptCen[3]) return TRUE ; } -//----------------------------------------------------------------------------- -BOOL -__stdcall EgtGetPhotoMMxPixel( int nId, double* pdMMxPixel) -{ - if ( pdMMxPixel == nullptr) - return FALSE ; - return ( ExeGetPhotoMMxPixel( nId, *pdMMxPixel) ? TRUE : FALSE) ; -} - //----------------------------------------------------------------------------- BOOL __stdcall EgtGetPhotoDimensions( int nId, double* pdDimX, double* pdDimY) @@ -102,3 +117,12 @@ __stdcall EgtGetPhotoPixels( int nId, int* pnPixelX, int* pnPixelY) return FALSE ; return ( ExeGetPhotoPixels( nId, *pnPixelX, *pnPixelY) ? TRUE : FALSE) ; } + +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtGetPhotoImagePixels( int nId, int* pnPixelX, int* pnPixelY) +{ + if ( pnPixelX == nullptr || pnPixelY == nullptr) + return FALSE ; + return ( ExeGetPhotoImagePixels( nId, *pnPixelX, *pnPixelY) ? TRUE : FALSE) ; +} diff --git a/API_Scene.cpp b/API_Scene.cpp index ba31c3f..9e94710 100644 --- a/API_Scene.cpp +++ b/API_Scene.cpp @@ -462,6 +462,13 @@ __stdcall EgtUnProjectPoint( int nWinX, int nWinY, double ptP[3]) return TRUE ; } +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtSetTextureMaxLinPixels( int nMaxLinPix) +{ + return ( ExeSetTextureMaxLinPixels( nMaxLinPix) ? TRUE : FALSE) ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtLoadTexture( const wchar_t* wsName, const wchar_t* wsFile, @@ -492,6 +499,20 @@ __stdcall EgtGetTexturePixels( const wchar_t* wsName, int* pnWidth, int* pnHeigh return TRUE ; } +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtGetTextureImagePixels( const wchar_t* wsName, int* pnWidth, int* pnHeight) +{ + int nWidth, nHeight ; + if ( ! ExeGetTextureImagePixels( wstrztoA( wsName), nWidth, nHeight)) + return FALSE ; + if ( pnWidth != nullptr) + *pnWidth = nWidth ; + if ( pnHeight != nullptr) + *pnHeight = nHeight ; + return TRUE ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtGetTextureDimensions( const wchar_t* wsName, double* pdDimX, double* pdDimY) diff --git a/EgtInterface.rc b/EgtInterface.rc index f89edd2..d33cfdf 100644 Binary files a/EgtInterface.rc and b/EgtInterface.rc differ