diff --git a/EGrScene.h b/EGrScene.h index d021e6b..9fa68ee 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -121,12 +121,14 @@ class IEGrScene virtual bool GetLastSnapDir( Vector3d& vtDir) const = 0 ; virtual bool GetPlaneSnapPoint( const Point3d& ptWin, const Plane3d& plPlane, Point3d& ptSel) const = 0 ; // Texture + virtual bool SetTextureMaxLinPixels( int nMaxLinPix) = 0 ; virtual bool LoadTexture( const std::string& sName, const std::string& sFile, double dMMxPix, double dDimX, double dDimY, int nRepeat) = 0 ; virtual bool UnloadTexture( const std::string& sName) = 0 ; virtual bool UnloadAllTextures( void) = 0 ; virtual bool ExistsTexture( const std::string& sName) const = 0 ; virtual bool GetTexturePixels( const std::string& sName, int& nWidth, int& nHeight) const = 0 ; + virtual bool GetTextureImagePixels( const std::string& sName, int& nWidth, int& nHeight) const = 0 ; virtual bool GetTextureDimensions( const std::string& sName, double& dDimX, double& dDimY) const = 0 ; virtual bool ChangeTextureDimensions( const std::string& sName, double dDimX, double dDimY) = 0 ; // Image diff --git a/EInAPI.h b/EInAPI.h index a2d046a..24aa927 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -582,6 +582,8 @@ EIN_EXPORT BOOL __stdcall EgtRemoveRawPart( int nRawId) ; EIN_EXPORT BOOL __stdcall EgtMoveToCornerRawPart( int nRawId, const double ptCorner[3], int nFlag) ; EIN_EXPORT BOOL __stdcall EgtMoveRawPart( int nRawId, const double vtMove[3]) ; EIN_EXPORT BOOL __stdcall EgtRotateRawPart( int nRawId, const double vtAx[3], double dAngDeg) ; +EIN_EXPORT BOOL __stdcall EgtGetRawPartCenter( int nRawId, double ptCen[3]) ; +EIN_EXPORT BOOL __stdcall EgtGetRawPartBBox( int nRawId, double ptMin[3], double ptMax[3]) ; EIN_EXPORT int __stdcall EgtSplitFlatRawPartWithMachinings( int nRawId, int nNumMchId, const int nMchIds[]) ; EIN_EXPORT int __stdcall EgtGetPartInRawPartCount( int nRawId) ; EIN_EXPORT int __stdcall EgtGetFirstPartInRawPart( int nRawId) ; @@ -800,10 +802,12 @@ EIN_EXPORT BOOL __stdcall EgtGetGenericView( double* pdAngVertDeg, double* pdAng EIN_EXPORT BOOL __stdcall EgtGetViewUp( double vtUp[3]) ; EIN_EXPORT BOOL __stdcall EgtProjectPoint( const double ptP[3], double ptWin[3]) ; EIN_EXPORT BOOL __stdcall EgtUnProjectPoint( int nWinX, int nWinY, double ptP[3]) ; +EIN_EXPORT BOOL __stdcall EgtSetTextureMaxLinPixels( int nMaxLinPix) ; EIN_EXPORT BOOL __stdcall EgtLoadTexture( const wchar_t* wsName, const wchar_t* wsFile, double dMMxPix, double dDimX, double dDimY, int nRepeat) ; EIN_EXPORT BOOL __stdcall EgtUnloadTexture( const wchar_t* wsName) ; EIN_EXPORT BOOL __stdcall EgtGetTexturePixels( const wchar_t* wsName, int* pnWidth, int* pnHeight) ; +EIN_EXPORT BOOL __stdcall EgtGetTextureImagePixels( const wchar_t* wsName, int* pnWidth, int* pnHeight) ; EIN_EXPORT BOOL __stdcall EgtGetTextureDimensions( const wchar_t* wsName, double* pdDimX, double* pdDimY) ; EIN_EXPORT BOOL __stdcall EgtChangeTextureDimensions( const wchar_t* wsName, double dDimX, double dDimY) ; EIN_EXPORT BOOL __stdcall EgtGetImage( int nShowMode, const int TopCol[4], const int BottomCol[4], @@ -813,13 +817,18 @@ EIN_EXPORT BOOL __stdcall EgtGetImage( int nShowMode, const int TopCol[4], const EIN_EXPORT int __stdcall EgtAddPhoto( const wchar_t* wsName, const wchar_t* wsFile, const double ptOri[3], const double ptCen[3], double dMMxPixel, int nParentId, const double ptMin[3], const double ptMax[3]) ; +EIN_EXPORT int __stdcall EgtAddPhoto2( const wchar_t* wsName, const wchar_t* wsFile, + const double ptOri[3], const double ptCen[3], double DimX, double dDimY, + int nParentId, const double ptMin[3], const double ptMax[3]) ; +EIN_EXPORT BOOL __stdcall EgtMovePhoto( int nId, const double vtMove[3]) ; +EIN_EXPORT BOOL __stdcall EgtRotatePhoto( int nId, const double ptAx[3], const double vtAx[3], double dAngDeg) ; EIN_EXPORT BOOL __stdcall EgtGetPhotoPath( int nId, wchar_t*& wsFile) ; EIN_EXPORT BOOL __stdcall EgtChangePhotoPath( int nId, const wchar_t* wsFile) ; EIN_EXPORT BOOL __stdcall EgtGetPhotoOrigin( int nId, double ptOri[3]) ; EIN_EXPORT BOOL __stdcall EgtGetPhotoCenter( int nId, double ptCen[3]) ; -EIN_EXPORT BOOL __stdcall EgtGetPhotoMMxPixel( int nId, double* pdMMxPixel) ; EIN_EXPORT BOOL __stdcall EgtGetPhotoDimensions( int nId, double* pdDimX, double* pdDimY) ; EIN_EXPORT BOOL __stdcall EgtGetPhotoPixels( int nId, int* pnPixelX, int* pnPixelY) ; +EIN_EXPORT BOOL __stdcall EgtGetPhotoImagePixels( int nId, int* pnPixelX, int* pnPixelY) ; // Geo Base EIN_EXPORT BOOL __stdcall EgtVectorNormalize( double* pdX, double* pdY, double* pdZ, double dEps = 0.001) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 5e45b06..75f626c 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -871,11 +871,13 @@ EXE_EXPORT bool ExeGetGenericView( double* pdAngVertDeg, double* pdAngHorizDeg) EXE_EXPORT bool ExeGetViewUp( Vector3d& vtUp) ; EXE_EXPORT bool ExeProjectPoint( const Point3d& ptP, Point3d& ptWin) ; EXE_EXPORT bool ExeUnProjectPoint( int nWinX, int nWinY, Point3d& ptP) ; +EXE_EXPORT bool ExeSetTextureMaxLinPixels( int nMaxLinPix) ; EXE_EXPORT bool ExeLoadTexture( const std::string& sName, const std::string& sFile, double dMMxPix, double dDimX, double dDimY, int nRepeat) ; EXE_EXPORT bool ExeUnloadTexture( const std::string& sName) ; EXE_EXPORT bool ExeExistsTexture( const std::string& sName) ; EXE_EXPORT bool ExeGetTexturePixels( const std::string& sName, int& nWidth, int& nHeight) ; +EXE_EXPORT bool ExeGetTextureImagePixels( const std::string& sName, int& nWidth, int& nHeight) ; EXE_EXPORT bool ExeGetTextureDimensions( const std::string& sName, double& dDimX, double& dDimY) ; EXE_EXPORT bool ExeChangeTextureDimensions( const std::string& sName, double dDimX, double dDimY) ; EXE_EXPORT bool ExeGetImage( int nShowMode, Color colBackTop, Color colBackBottom, @@ -888,13 +890,18 @@ EXE_EXPORT bool ExeGetImagePixels( const std::string& sFile, int& nPixelX, int& EXE_EXPORT int ExeAddPhoto( const std::string& sName, const std::string& sPath, const Point3d& ptOri, const Point3d& ptCen, double dMMxPixel, int nParentId, const Point3d& ptMin, const Point3d& ptMax) ; +EXE_EXPORT int ExeAddPhoto( const std::string& sName, const std::string& sPath, + const Point3d& ptOri, const Point3d& ptCen, double dDimX, double dDimY, + int nParentId, const Point3d& ptMin, const Point3d& ptMax) ; +EXE_EXPORT bool ExeMovePhoto( int nId, const Vector3d& vtMove) ; +EXE_EXPORT bool ExeRotatePhoto( int nId, const Point3d& ptAx, const Vector3d& vtAx, double dAngDeg) ; EXE_EXPORT bool ExeGetPhotoPath( int nId, std::string& sPath) ; EXE_EXPORT bool ExeChangePhotoPath( int nId, const std::string& sPath) ; EXE_EXPORT bool ExeGetPhotoOrigin( int nId, Point3d& ptOri) ; EXE_EXPORT bool ExeGetPhotoCenter( int nId, Point3d& ptCen) ; -EXE_EXPORT bool ExeGetPhotoMMxPixel( int nId, double& dMMxPixel) ; EXE_EXPORT bool ExeGetPhotoDimensions( int nId, double& dDimX, double& dDimY) ; EXE_EXPORT bool ExeGetPhotoPixels( int nId, int& nPixelX, int& nPixelY) ; +EXE_EXPORT bool ExeGetPhotoImagePixels( int nId, int& nPixelX, int& nPixelY) ; // Messages EXE_EXPORT bool ExeLoadMessages( const std::string& sMsgFilePath) ;