diff --git a/EgtGraphics.rc b/EgtGraphics.rc index a729a6a..d117324 100644 Binary files a/EgtGraphics.rc and b/EgtGraphics.rc differ diff --git a/SceExecutor.cpp b/SceExecutor.cpp index 72792b2..8d6cc1d 100644 --- a/SceExecutor.cpp +++ b/SceExecutor.cpp @@ -79,9 +79,7 @@ SceExecutor::Execute( const string& sCmd1, const string& sCmd2, const STRVECTOR& } // esecuzione comando - if ( sCmd1 == "PAUSE") - return ExecutePause( sCmd2, vsParams) ; - else if ( sCmd1 == "RD" || sCmd1 == "REDRAW") + if ( sCmd1 == "RD" || sCmd1 == "REDRAW") return ExecuteRedraw( sCmd2, vsParams) ; else if ( sCmd1 == "ZM" || sCmd1 == "ZOOM") return ExecuteZoom( sCmd2, vsParams) ; @@ -95,30 +93,6 @@ SceExecutor::Execute( const string& sCmd1, const string& sCmd2, const STRVECTOR& return false ; } -//---------------------------------------------------------------------------- -bool -SceExecutor::ExecutePause( const string& sCmd2, const STRVECTOR& vsParams) -{ - const int MIN_TIME = 0 ; - const int MAX_TIME = 10000 ; - - // 1 parametro : durata della pausa in ms - if ( vsParams.size() != 1) - return false ; - // tempo di attesa - int nTime ; - if ( ! FromString( vsParams[0], nTime)) - return false ; - if ( nTime < MIN_TIME) - nTime = MIN_TIME ; - else if ( nTime > MAX_TIME) - nTime = MAX_TIME ; - // eseguo - Sleep( nTime) ; - - return true ; -} - //---------------------------------------------------------------------------- bool SceExecutor::ExecuteRedraw( const string& sCmd2, const STRVECTOR& vsParams) diff --git a/SceExecutor.h b/SceExecutor.h index cd46c78..eda5c0b 100644 --- a/SceExecutor.h +++ b/SceExecutor.h @@ -20,18 +20,21 @@ //---------------------------------------------------------------------------- class SceExecutor : public ISceExecutor { - public : + public : // ICmdExecutor virtual bool SetCmdParser( ICmdParser* pParser) ; virtual bool AddExecutor( ICmdExecutor* pOtherExec) ; + virtual bool AddStandardVariables( void) + { return true ; } virtual bool Execute( const std::string& sCmd1, const std::string& sCmd2, const STRVECTOR& vsParams) ; + + public : // ISceExecutor + ~SceExecutor( void) ; virtual bool SetScene( IEGrScene* pScene) ; public : SceExecutor( void) ; - ~SceExecutor( void) ; private : - bool ExecutePause( const std::string& sCmd2, const STRVECTOR& vsParams) ; bool ExecuteRedraw( const std::string& sCmd2, const STRVECTOR& vsParams) ; bool ExecuteZoom( const std::string& sCmd2, const STRVECTOR& vsParams) ; bool ExecuteCenter( const std::string& sCmd2, const STRVECTOR& vsParams) ; diff --git a/SceneBasic.cpp b/SceneBasic.cpp index 1e1a744..dacb8b1 100644 --- a/SceneBasic.cpp +++ b/SceneBasic.cpp @@ -623,7 +623,7 @@ Scene::Draw( void) // aggiorno il colore di default if ( m_pGeomDB != nullptr) - m_pGeomDB->GetDefaultColor( m_colDef) ; + m_pGeomDB->GetDefaultMaterial( m_colDef) ; // imposto la dimensione standard dei punti glPointSize( 3) ; diff --git a/SceneGeom.cpp b/SceneGeom.cpp index 037ce24..880fbbd 100644 --- a/SceneGeom.cpp +++ b/SceneGeom.cpp @@ -183,7 +183,7 @@ Scene::DrawGeoObj( const IGdbIterator& iIter, int nObjStat) int nGeoType = pGeoObj->GetType() ; // recupero il colore Color cCol ; - if ( ! iIter.GetCalcColor( cCol)) + if ( ! iIter.GetCalcMaterial( cCol)) cCol = m_colDef ; // se vettore if ( nGeoType == GEO_VECT3D) {