From b3f26419aeb2360cd48dd1c66fa108ba09eaabdc Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 19 Sep 2019 13:49:23 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGrScene.h | 5 +++-- EMkToolConst.h | 2 ++ EXeExecutor.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/EGrScene.h b/EGrScene.h index 36a9c4f..12b3cdc 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2013-2014 +// EgalTech 2014-2019 //---------------------------------------------------------------------------- -// File : EGrScene.h Data : 13.02.14 Versione : 1.5b1 +// File : EGrScene.h Data : 13.02.14 Versione : 2.1i2 // Contenuto : Dichiarazione della interfaccia IEGrScene per scena OpenGL. // // @@ -50,6 +50,7 @@ class IEGrScene virtual bool RedrawWindow( void) = 0 ; virtual bool Resize( int nW, int nH) = 0 ; virtual bool SetBackground( Color colBackTop, Color colBackBottom) = 0 ; + virtual bool GetBackground( Color& colBackTop, Color& colBackBottom) = 0 ; virtual bool Draw( void) = 0 ; virtual bool Project( const Point3d& ptWorld, Point3d& ptView) const = 0 ; virtual bool UnProject( const Point3d& ptView, Point3d& ptWorld) const = 0 ; diff --git a/EMkToolConst.h b/EMkToolConst.h index eab08b6..b44f723 100644 --- a/EMkToolConst.h +++ b/EMkToolConst.h @@ -61,6 +61,7 @@ const int TPA_DOU = 0x4000 ; const int TPA_STR = 0x8000 ; // Costanti tipo parametri modificabili direttamente negli utensili enum TpaType { TPA_NONE = 0, + TPA_ACTIVE = ( TPA_BOOL + 0), TPA_CORR = ( TPA_INT + 0), TPA_EXIT = ( TPA_INT + 1), TPA_TYPE = ( TPA_INT + 2), @@ -103,6 +104,7 @@ const int TD_CUSTOMDRAW_ERR = 997 ; // Costanti per info in note di sistema const std::string TSI_THLEN = "THH" ; // lunghezza portautensile da naso mandrino const std::string TSI_THDIAM = "THD" ; // diametro massimo portautensile +const std::string TSI_ACTIVE = "ACTIVE" ; // flag di utensile attivo //---------------------------------------------------------------------------- // Costanti per info in portautensili diff --git a/EXeExecutor.h b/EXeExecutor.h index 5b7f9c4..8a54fc4 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -933,6 +933,7 @@ EXE_EXPORT bool ExeSetMachineLook( int nFlag) ; EXE_EXPORT bool ExeInitScene( HWND hWnd, int nDriver, bool b2Buff, int nColorBits, int nDepthBits) ; EXE_EXPORT bool ExeGetSceneInfo( std::string& sInfo) ; EXE_EXPORT bool ExeSetBackground( Color TopCol, Color BottomCol, bool bRedraw) ; +EXE_EXPORT bool ExeGetBackground( Color& TopCol, Color& BottomCol) ; EXE_EXPORT bool ExeSetMarkAttribs( Color MarkCol) ; EXE_EXPORT bool ExeSetSelSurfAttribs( Color SelSurfCol) ; EXE_EXPORT bool ExeSetGeoLineAttribs( Color GlCol) ;