diff --git a/EGkGdbIterator.h b/EGkGdbIterator.h index cdda32f..117aaa5 100644 --- a/EGkGdbIterator.h +++ b/EGkGdbIterator.h @@ -142,6 +142,12 @@ class __declspec( novtable) IGdbIterator virtual bool GetInfo( const std::string& sKey, STRVECTOR& vsInfo) const = 0 ; virtual bool ExistsInfo( const std::string& sKey) const = 0 ; virtual bool RemoveInfo( const std::string& sKey) = 0 ; + // TextureData + virtual bool SetTextureName( const std::string& sTxrName) = 0 ; + virtual bool SetTextureFrame( const Frame3d& frTxrRef) = 0 ; + virtual bool RemoveTextureData( void) = 0 ; + virtual bool GetTextureName( std::string& sTxrName) const = 0 ; + virtual bool GetTextureFrame( Frame3d& frTxrRef) const = 0 ; // UserObj virtual bool SetUserObj( IUserObj* pUserObj) = 0 ; virtual IUserObj* GetUserObj( void) = 0 ; diff --git a/EGkGeomDB.h b/EGkGeomDB.h index 92875be..ea69920 100644 --- a/EGkGeomDB.h +++ b/EGkGeomDB.h @@ -175,6 +175,13 @@ class __declspec( novtable) IGeomDB virtual bool GetInfo( int nId, const std::string& sKey, STRVECTOR& vsInfo) const = 0 ; virtual bool ExistsInfo( int nId, const std::string& sKey) const = 0 ; virtual bool RemoveInfo( int nId, const std::string& sKey) = 0 ; + // TextureData + virtual bool DumpTextureData( int nId, std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const = 0 ; + virtual bool SetTextureName( int nId, const std::string& sTxrName) = 0 ; + virtual bool SetTextureFrame( int nId, const Frame3d& frTxrRef) = 0 ; + virtual bool RemoveTextureData( int nId) = 0 ; + virtual bool GetTextureName( int nId, std::string& sTxrName) const = 0 ; + virtual bool GetTextureFrame( int nId, Frame3d& frTxrRef) const = 0 ; // UserObj virtual bool SetUserObj( int nId, IUserObj* pUserObj) = 0 ; virtual IUserObj* GetUserObj( int nId) = 0 ; diff --git a/EGnFileUtils.h b/EGnFileUtils.h index 59d822a..f7c226d 100644 --- a/EGnFileUtils.h +++ b/EGnFileUtils.h @@ -32,5 +32,7 @@ EGN_EXPORT bool EraseFile( const std::string& sFile) ; EGN_EXPORT std::string ChangeFileExtension( const std::string& sFile, const std::string& sNewExt) ; EGN_EXPORT bool FileExtensionMatches( const std::string& sFile, const std::string& sExt) ; EGN_EXPORT bool FindFirstFileEgt( const std::string& sFileSpec, std::string& sFileName) ; +EGN_EXPORT std::string GetFileName( const std::string& sPath) ; +EGN_EXPORT std::string GetDirectory( const std::string& sPath) ; EGN_EXPORT bool ExistsDirectory( const std::string& sDir) ; EGN_EXPORT bool EmptyDirectory( const std::string& sDir) ; diff --git a/EGrScene.h b/EGrScene.h index f4a9faf..41316af 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -117,8 +117,10 @@ class IEGrScene virtual bool GetLastSnapDir( Vector3d& vtDir) = 0 ; // Texture virtual bool LoadTexture( const std::string& sName, const std::string& sFile, - double dMMxPix, double dDimX, double dDimY, bool bRepeat) = 0 ; + 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) = 0 ; virtual bool GetTexturePixels( const std::string& sName, int& nWidth, int& nHeight) = 0 ; virtual bool GetTextureDimensions( const std::string& sName, double& dDimX, double& dDimY) = 0 ; virtual bool ChangeTextureDimensions( const std::string& sName, double dDimX, double dDimY) = 0 ; @@ -162,4 +164,8 @@ enum SnapPoint { SP_NONE = 0, SP_INTERS = 8, SP_TANG = 9, SP_PERP = 10, - SP_MINDIST = 11} ; \ No newline at end of file + SP_MINDIST = 11} ; +//------------------------ Costanti per textures ----------------------------- +enum TxrRepeat { TXR_CLAMP = 0, + TXR_REPEAT = 1, + TXR_MIRROR = 2} ; diff --git a/EInAPI.h b/EInAPI.h index f2c951b..5638f40 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -316,6 +316,13 @@ EIN_EXPORT BOOL __stdcall EgtGetInfoFrame( int nId, const wchar_t* wsKey, double double vtX[3], double vtY[3], double vtZ[3]) ; EIN_EXPORT BOOL __stdcall EgtExistsInfo( int nId, const wchar_t* wsKey) ; EIN_EXPORT BOOL __stdcall EgtRemoveInfo( int nId, const wchar_t* wsKey) ; +EIN_EXPORT BOOL __stdcall EgtSetTextureName( int nId, const wchar_t* wsTxrName) ; +EIN_EXPORT BOOL __stdcall EgtSetTextureFrame( int nId, const double vOrig[3], + const double vX[3], const double vY[3], const double vZ[3], int nRefType) ; +EIN_EXPORT BOOL __stdcall EgtRemoveTextureData( int nId) ; +EIN_EXPORT BOOL __stdcall EgtGetTextureName( int nId, wchar_t*& wsTxrName) ; +EIN_EXPORT BOOL __stdcall EgtGetTextureFrame( int nId, int nRefId, double vOrig[3], + double vX[3], double vY[3], double vZ[3]) ; // GeomDb Obj Selection EIN_EXPORT BOOL __stdcall EgtSelectObj( int nId) ; @@ -528,12 +535,19 @@ EIN_EXPORT BOOL __stdcall EgtGetGenericView( double* pdAngVertDeg, double* pdAng 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 EgtLoadTexture( const wchar_t* wsName, const wchar_t* wsFile, - double dMMxPix, double dDimX, double dDimY, BOOL bRepeat) ; + 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 EgtGetTextureDimensions( const wchar_t* wsName, double* pdDimX, double* pdDimY) ; EIN_EXPORT BOOL __stdcall EgtChangeTextureDimensions( const wchar_t* wsName, double dDimX, double dDimY) ; +// Photo +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 BOOL __stdcall EgtGetPhotoPath( int nId, wchar_t*& wsFile) ; +EIN_EXPORT BOOL __stdcall EgtChangePhotoPath( int nId, const wchar_t* wsFile) ; + // Geo Base EIN_EXPORT BOOL __stdcall EgtVectorNormalize( double* pdX, double* pdY, double* pdZ, double dEps = 0.001) ; EIN_EXPORT BOOL __stdcall EgtVectorRotate( double* pdX, double* pdY, double* pdZ, diff --git a/EXeExecutor.h b/EXeExecutor.h index d10fe0e..2e9b156 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -315,6 +315,11 @@ EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, std::string& sInfo EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, Frame3d& frFrame) ; EXE_EXPORT bool ExeExistsInfo( int nId, const std::string& sKey) ; EXE_EXPORT bool ExeRemoveInfo( int nId, const std::string& sKey) ; +EXE_EXPORT bool ExeSetTextureName( int nId, const std::string& sTxrName) ; +EXE_EXPORT bool ExeSetTextureFrame( int nId, const Frame3d& frTxrRef, int nRefType) ; +EXE_EXPORT bool ExeRemoveTextureData( int nId) ; +EXE_EXPORT bool ExeGetTextureName( int nId, std::string& sTxrName) ; +EXE_EXPORT bool ExeGetTextureFrame( int nId, int nRefId, Frame3d& frTxrRef) ; // GeomDb Obj Selection EXE_EXPORT bool ExeSelectObj( int nId) ; @@ -568,12 +573,20 @@ EXE_EXPORT bool ExeGetGenericView( double* pdAngVertDeg, double* pdAngHorizDeg) EXE_EXPORT bool ExeProjectPoint( const Point3d& ptP, Point3d& ptWin) ; EXE_EXPORT bool ExeUnProjectPoint( int nWinX, int nWinY, Point3d& ptP) ; EXE_EXPORT bool ExeLoadTexture( const std::string& sName, const std::string& sFile, - double dMMxPix, double dDimX, double dDimY, bool bRepeat) ; + 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 ExeGetTextureDimensions( const std::string& sName, double& dDimX, double& dDimY) ; EXE_EXPORT bool ExeChangeTextureDimensions( const std::string& sName, double dDimX, double dDimY) ; +// Photo +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 bool ExeGetPhotoPath( int nId, std::string& sPath) ; +EXE_EXPORT bool ExeChangePhotoPath( int nId, const std::string& sPath) ; + // Messages EXE_EXPORT bool ExeLoadMessages( const std::string& sMsgFilePath) ; EXE_EXPORT const std::string& ExeGetLanguage( void) ;