diff --git a/EExExportThreeJS.h b/EExExportThreeJS.h index 7909441..280c331 100644 --- a/EExExportThreeJS.h +++ b/EExExportThreeJS.h @@ -1,12 +1,12 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2014 +// EgalTech 2022-2022 //---------------------------------------------------------------------------- -// File : EExExportStl.h Data : 07.08.14 Versione : 1.5h2 +// File : EExExportThreeJS.h Data : 22.10.22 Versione : 2.4j1 // Contenuto : Dichiarazione della interfaccia IExportStl. // // // -// Modifiche : 07.08.14 DS Creazione modulo. +// Modifiche : 22.10.22 DS Creazione modulo. // // //---------------------------------------------------------------------------- @@ -27,16 +27,16 @@ #endif //----------------------------------------------------------------------------- -class __declspec(novtable) IExportThreeJS +class __declspec( novtable) IExportThreeJS { public: virtual ~IExportThreeJS( void) {} virtual bool SetOptions( int nFilter) = 0 ; - virtual bool Export( IGeomDB* pGDB, int nId, const std::string& sFile, IEGrScene* pScene, bool bUdm) = 0 ; -}; + virtual bool Export( IGeomDB* pGDB, int nId, IEGrScene* pScene, bool bUdm, const std::string& sFile) = 0 ; +} ; //----------------------------------------------------------------------------- extern "C" { - EEX_EXPORT bool SetThreeJSAuxDir( const std::string& sThreeJSAuxDir) ; + EEX_EXPORT bool SetThreeJSLibDir( const std::string& sThreeJSLibDir) ; EEX_EXPORT IExportThreeJS* CreateExportThreeJS( void) ; } diff --git a/EGrScene.h b/EGrScene.h index cc27b30..c61756d 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2019 +// EgalTech 2014-2022 //---------------------------------------------------------------------------- -// File : EGrScene.h Data : 13.02.14 Versione : 2.1i2 +// File : EGrScene.h Data : 22.10.22 Versione : 2.4j1 // Contenuto : Dichiarazione della interfaccia IEGrScene per scena OpenGL. // // @@ -95,7 +95,7 @@ class IEGrScene virtual bool SetGridGeo( double dSnapStep, int nMinLineSstep, int nMajLineSstep, int nExtSstep) = 0 ; virtual bool SetGridColor( Color colMinLine, Color colMajLine) = 0 ; virtual void GetGridParam( double& dSnapStep, int& nExtStep) const = 0 ; - virtual bool GetShowGrid() = 0 ; + virtual bool GetShowGrid( void) = 0 ; // Glob Frame virtual bool SetGlobFrameShow( bool bShow) = 0 ; // Direct @@ -142,8 +142,6 @@ class IEGrScene // Image virtual bool GetImage( int nShowMode, Color colBackTop, Color colBackBottom, int nDestWidth, int nDestHeight, const std::string& sFile) = 0 ; - - } ; //----------------------------------------------------------------------------- diff --git a/EInAPI.h b/EInAPI.h index 3bcfa3f..5b5c6d5 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -118,6 +118,8 @@ EIN_EXPORT BOOL __stdcall EgtExportDxf( int nId, const wchar_t* wsFilePath, int EIN_EXPORT BOOL __stdcall EgtExportStl( int nId, const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtExport3MF( int nId, const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtExportSvg( int nId, const wchar_t* wsFilePath) ; +EIN_EXPORT BOOL __stdcall EgtSetThreeJSLibDir( const wchar_t* wsThreeJSLibDir) ; +EIN_EXPORT BOOL __stdcall EgtExportThreeJS( int nId, const wchar_t* wsFilePath) ; // BeamManager EIN_EXPORT BOOL __stdcall EgtInitBeamMgr( int nFlag) ; diff --git a/EXeConst.h b/EXeConst.h index 2c2bd81..88568e6 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -36,6 +36,7 @@ enum FileType { FT_NULL = 0, FT_JT = 35, FT_VRML = 36, FT_C3D = 37, + FT_HTML = 51, FT_TSC = 101, FT_LUA = 102} ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 40acddf..35d519a 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -111,7 +111,6 @@ EXE_EXPORT bool ExeSaveMachGroupToFile( int nMGroupId, const std::string& sFileP // Exchange EXE_EXPORT int ExeGetFileType( const std::string& sFilePath) ; EXE_EXPORT bool ExeSetBtlAuxDir( const std::string& sBtlAuxDir) ; -EXE_EXPORT bool ExeSetThreeJSAuxDir( const std::string & sThreeJSAuxDir) ; EXE_EXPORT bool ExeImportBtl( const std::string& sFilePath, int nFlag) ; EXE_EXPORT bool ExeImportBtlx( const std::string& sFilePath, int nFlag) ; EXE_EXPORT bool ExeImportCnc( const std::string& sFilePath, int nFlag) ; @@ -126,6 +125,7 @@ EXE_EXPORT bool ExeExportDxf( int nId, const std::string& sFilePath, int nFlag = EXE_EXPORT bool ExeExportStl( int nId, const std::string& sFilePath) ; EXE_EXPORT bool ExeExport3MF( int nId, const std::string& sFilePath) ; EXE_EXPORT bool ExeExportSvg( int nId, const std::string& sFilePath, int nFilter = 393) ; +EXE_EXPORT bool ExeSetThreeJSLibDir( const std::string & sThreeJSLibDir) ; EXE_EXPORT bool ExeExportThreeJS( int nId, const std::string& sFilePath, int nFilter = 393) ; // BeamManager