From c589fe9256c53acda3a377b71c36041e1ee5b064 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 8 Mar 2019 17:59:59 +0000 Subject: [PATCH] EgtGraphics : - modifiche per cambio colore di Zmap. --- ObjMultiGraphics.cpp | 10 ++++++++++ ObjMultiGraphics.h | 1 + ObjNewGraphics.h | 2 ++ ObjOldGraphics.h | 2 ++ SceneGeom.cpp | 2 +- 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ObjMultiGraphics.cpp b/ObjMultiGraphics.cpp index e6c6df4..7c32a34 100644 --- a/ObjMultiGraphics.cpp +++ b/ObjMultiGraphics.cpp @@ -36,6 +36,16 @@ ObjMultiGraphics::Reset( void) m_nCurr = - 1 ; } +//---------------------------------------------------------------------------- +void +ObjMultiGraphics::ResetAll( void) +{ + Reset() ; + // reset contatori dei blocchi + for ( auto& nCnt : m_Counter) + nCnt = 0 ; +} + //---------------------------------------------------------------------------- void ObjMultiGraphics::SetScene( Scene* pScene) diff --git a/ObjMultiGraphics.h b/ObjMultiGraphics.h index 7763359..7cadaad 100644 --- a/ObjMultiGraphics.h +++ b/ObjMultiGraphics.h @@ -22,6 +22,7 @@ class ObjMultiGraphics : public ObjEGrGraphics public : // IObjGraphics ~ObjMultiGraphics( void) override ; void Reset( void) override ; + void ResetAll( void) override ; public : // ObjEGrGraphics bool IsValid( void) override diff --git a/ObjNewGraphics.h b/ObjNewGraphics.h index aba3ee9..ba68817 100644 --- a/ObjNewGraphics.h +++ b/ObjNewGraphics.h @@ -57,6 +57,8 @@ class ObjNewGraphics : public ObjEGrGraphics public : // IObjGraphics ~ObjNewGraphics( void) override ; void Reset( void) override ; + void ResetAll( void) override + { Reset() ; } public : // ObjEGrGraphics bool IsValid( void) override diff --git a/ObjOldGraphics.h b/ObjOldGraphics.h index 74949bc..d176936 100644 --- a/ObjOldGraphics.h +++ b/ObjOldGraphics.h @@ -62,6 +62,8 @@ class ObjOldGraphics : public ObjEGrGraphics public : // IObjGraphics ~ObjOldGraphics( void) override ; void Reset( void) override ; + void ResetAll( void) override + { Reset() ; } public : // ObjEGrGraphics bool IsValid( void) override diff --git a/SceneGeom.cpp b/SceneGeom.cpp index aa3e78a..182afa7 100644 --- a/SceneGeom.cpp +++ b/SceneGeom.cpp @@ -353,7 +353,7 @@ Scene::DrawGeoObj( const IGdbIterator& iIter, int nPass, const MdStMkCol& siObj) if ( ( m_nShowZmap & ZSM_COLORS) != 0) { HSV hsv = GetHSVFromColor( siObj.colObj) ; hsv.dHue += ANG_RIGHT / 6 ; - hsv.dVal *= 1.2 ; + hsv.dVal *= 1.4 ; cCol[1] = GetColorFromHSV( hsv) ; mMat[1].Set( cCol[1]) ; }