Egalware/Include
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.steamware.net/egaltech/Include

Browse Source
This commit is contained in:
LorenzoM
2021-08-04 10:04:30 +02:00
parent 2b6a18a778 0d0fccf1d4
commit b16d9b0aaa
10 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EExBeamMgr.h
+5 -5
View File
@@ -1,13 +1,13 @@
//----------------------------------------------------------------------------
// EgalTech 2020-2020
// EgalTech 2020-2021
//----------------------------------------------------------------------------
// File : EExBeamMgr.h Data : 30.08.20 Versione : 2.2i1
// File : EExBeamMgr.h Data : 01.06.21 Versione : 2.2f1
// Contenuto : Dichiarazione della interfaccia IBeamMgr.
//
//
//
// Modifiche : 30.08.20 DS Creazione modulo.
//
// 01.06.21 DS Aggiunti parametri vsUAtt per Process.
//
//----------------------------------------------------------------------------
@@ -41,9 +41,9 @@ class __declspec( novtable) IBeamMgr
virtual bool SetPartCount( int nCount) = 0 ;
virtual bool SetPartBox( double dLength, double dHeight, double dWidth, bool bUpdate = true) = 0 ;
virtual int AddProcess( int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId,
const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) = 0 ;
const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) = 0 ;
virtual int ModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId,
const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) = 0 ;
const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) = 0 ;
virtual bool EraseProcess( int nGeomId, bool bUpdate = true) = 0 ;
virtual bool EnableProcess( int nGeomId, bool bEnable, bool bUpdate = true) = 0 ;
virtual bool CalcSolid( int nPartId, bool bRecalc = false) = 0 ;
EGkCDeConeFrustumClosedSurfTm.h
+1 -1
View File
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------------
// EgalTech 2020-2020
//----------------------------------------------------------------------------
// File : EGkCDeConeClosedSurfTm.h Data : 09.11.20 Versione :
// File : EGkCDeConeFrustumClosedSurfTm.h Data : 09.11.20 Versione :
// Contenuto : Dichiarazione funzione verifica collisione tra
// Cone e Closed SurfTriMesh.
//
EGkCurveComposite.h
+4 -4
View File
@@ -1,13 +1,13 @@
//----------------------------------------------------------------------------
// EgalTech 2013-2021
//----------------------------------------------------------------------------
// File : EgkCurveComposite.h Data : 03.04.21 Versione : 2.3d1
// File : EgkCurveComposite.h Data : 03.04.21 Versione : 2.3g2
// Contenuto : Dichiarazione della interfaccia ICurveComposite.
//
//
//
// Modifiche : 22.11.13 DS Creazione modulo.
//
// 21.07.21 LM Aggiunto parametro opzionale a Set/GetCurveTempProp.
//
//----------------------------------------------------------------------------
@@ -58,8 +58,8 @@ class __declspec( novtable) ICurveComposite : public ICurve
virtual bool IsAPoint( void) const = 0 ;
virtual bool IsALine( double dLinTol, Point3d& ptStart, Point3d& ptEnd) const = 0 ;
virtual bool IsACircle( double dLinTol, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW) const = 0 ;
virtual bool SetCurveTempProp( int nCrv, int nProp, int nPropNum = 0) = 0 ;
virtual bool GetCurveTempProp( int nCrv, int& nProp, int nPropNum = 0) const = 0 ;
virtual bool SetCurveTempProp( int nCrv, int nProp, int nPropInd = 0) = 0 ;
virtual bool GetCurveTempProp( int nCrv, int& nProp, int nPropInd = 0) const = 0 ;
} ;
//-----------------------------------------------------------------------------
EGkGdbConst.h
+3
View File
@@ -60,6 +60,9 @@ enum GdbStatus { GDB_ST_OFF = 0,
enum GdbMark { GDB_MK_OFF = 0,
GDB_MK_ON = 1} ;
//----------------- Costante per numero proprietà temporanee -------------------
const int GDB_NUM_TEMP_PROP = 2 ;
//----------------- Costanti materiale oggetti del DB geometrico ---------------
enum GdbMaterial { GDB_MT_COLOR = -1,
GDB_MT_PARENT = 0} ;
EGkGeoObj.h
+5 -4
View File
@@ -1,13 +1,14 @@
//----------------------------------------------------------------------------
// EgalTech 2013-2014
// EgalTech 2013-2021
//----------------------------------------------------------------------------
// File : EGkGeoObj.h Data : 14.04.14 Versione : 1.5d5
// File : EGkGeoObj.h Data : 21.07.21 Versione : 2.3g2
// Contenuto : Dichiarazione della interfaccia IGeoObj.
//
//
//
// Modifiche : 20.11.13 DS Creazione modulo.
// 14.04.14 DS Tolti metodi GetKey, Save e Load.
// 21.07.21 LM Aggiunto parametro opzionale a Set/GetTempProp.
//
//----------------------------------------------------------------------------
@@ -53,8 +54,8 @@ class __declspec( novtable) IGeoObj
virtual void SetObjGraphics( IObjGraphics* pOGr) = 0 ;
virtual IObjGraphics* GetObjGraphics( void) = 0 ;
virtual const IObjGraphics* GetObjGraphics( void) const = 0 ;
virtual void SetTempProp( int nProp, int nPropNum = 0) = 0 ;
virtual int GetTempProp( int nPropNum = 0) const = 0 ;
virtual void SetTempProp( int nProp, int nPropInd = 0) = 0 ;
virtual int GetTempProp( int nPropInd = 0) const = 0 ;
} ;
//-----------------------------------------------------------------------------
EInAPI.h
+2 -2
View File
@@ -126,10 +126,10 @@ EIN_EXPORT BOOL __stdcall EgtBeamSetPartCount( int nCount) ;
EIN_EXPORT BOOL __stdcall EgtBeamSetPartBox( double dLength, double dHeight, double dWidth, BOOL bUpdate) ;
EIN_EXPORT int __stdcall EgtBeamAddProcess( int nGroup, int nProc, int nSide, const wchar_t* wsDes, int nProcId,
const double ptOrig[3], const double vX[3], const double vY[3], const double vZ[3],
int nPar, const double vPar[], const wchar_t* wsPar, BOOL bUpdate) ;
int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts, BOOL bUpdate) ;
EIN_EXPORT int __stdcall EgtBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const wchar_t* wsDes, int nProcId,
const double ptOrig[3], const double vX[3], const double vY[3], const double vZ[3],
int nPar, const double vPar[], const wchar_t* wsPar, BOOL bUpdate) ;
int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts, BOOL bUpdate) ;
EIN_EXPORT BOOL __stdcall EgtBeamEraseProcess( int nGeomId, BOOL bUpdate) ;
EIN_EXPORT BOOL __stdcall EgtBeamEnableProcess( int nGeomId, BOOL bEnable, BOOL bUpdate) ;
EIN_EXPORT BOOL __stdcall EgtBeamCalcSolid( int nPartId, BOOL bRecalc) ;
EMkMachMgr.h
+1 -1
View File
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------------
// EgalTech 2015-2021
//----------------------------------------------------------------------------
// File : EMkMachMgr.h Data : 13.01.21 Versione : 2.3a3
// File : EMkMachMgr.h Data : 24.05.21 Versione : 2.3e3
// Contenuto : Dichiarazione della interfaccia IMachMgr.
//
//
EMkSimuGenConst.h
+2 -1
View File
@@ -34,7 +34,8 @@ enum SimUiStat { MCH_UISIM_NULL = 0,
enum SimCollObjType { MCH_SIM_COB_NULL = 0,
MCH_SIM_COB_BOX = 1,
MCH_SIM_COB_CYL = 2,
MCH_SIM_COB_SPHE = 3} ;
MCH_SIM_COB_SPHE = 3,
MCH_SIM_COB_CONE = 4} ;
//------------------------ Stato di visualizzazione della macchina ------------
enum MachLook { MCH_LOOK_NONE = -1,
EXeExecutor.h
+3 -2
View File
@@ -49,6 +49,7 @@ EXE_EXPORT bool ExeGetIniFile( std::string& sIniFile) ;
EXE_EXPORT bool ExeSetCommandLogger( const std::string& sLogFile) ;
EXE_EXPORT bool ExeEnableCommandLogger( void) ;
EXE_EXPORT bool ExeDisableCommandLogger( void) ;
EXE_EXPORT bool ExeGetExecutableVersion( std::string& sVer) ;
EXE_EXPORT bool ExeGetVersionInfo( std::string& sVer, const char* szNewLine) ;
EXE_EXPORT bool ExeGetKeyInfo( std::string& sKey) ;
EXE_EXPORT bool ExeSetLockType( int nType) ;
@@ -131,9 +132,9 @@ EXE_EXPORT bool ExeBeamSetPartName( const std::string& sName) ;
EXE_EXPORT bool ExeBeamSetPartCount( int nCount) ;
EXE_EXPORT bool ExeBeamSetPartBox( double dLength, double dHeight, double dWidth, bool bUpdate = true) ;
EXE_EXPORT int ExeBeamAddProcess( int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId,
const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) ;
const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) ;
EXE_EXPORT int ExeBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId,
const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) ;
const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) ;
EXE_EXPORT bool ExeBeamEraseProcess( int nGeomId, bool bUpdate = true) ;
EXE_EXPORT bool ExeBeamEnableProcess( int nGeomId, bool bEnable, bool bUpdate = true) ;
EXE_EXPORT bool ExeBeamCalcSolid( int nPartId, bool bRecalc = false) ;
EgtKeyCodes.h
+3 -3
View File
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------------
// EgalTech 2015-2020
// EgalTech 2015-2021
//----------------------------------------------------------------------------
// File : EgtKeyCodes.h Data : 04.08.20 Versione : 2.2h1
// File : EgtKeyCodes.h Data : 31.07.21 Versione : 2.3h1
// Contenuto : Costanti per codici di protezione librerie di base.
//
//
@@ -21,7 +21,7 @@
//----------------------------------------------------------------------------
const int KEY_BASELIB_PROD = 207 ;
const int KEY_BASELIB_VER = 2305 ;
const int KEY_BASELIB_VER = 2308 ;
const int KEY_BASELIB_LEV = 1 ;
//----------------------------------------------------------------------------