EgtGraphics 1.5h2 :

- corretto errore con OldGraphics
- aggiunto a info dato su tipo driver (old/new way).
This commit is contained in:
Dario Sassi
2014-08-18 09:00:14 +00:00
parent e9fadd2357
commit ea2df9655f
4 changed files with 8 additions and 5 deletions
BIN
View File
Binary file not shown.
+5 -3
View File
@@ -173,11 +173,12 @@ ObjOldGraphics::Draw( int nStat, int nMark, bool bShowAux)
}
// ciclo di disegno
bool bStartA ;
bool bStartA = false ;
OGALIST::iterator iIter ;
for ( iIter = m_ogaList.begin() ; iIter != m_ogaList.end() ; ++ iIter) {
switch ( iIter->m_nType) {
case OgAtom::START :
bStartA = false ;
glBegin( iIter->m_nMode) ;
break ;
case OgAtom::START_A :
@@ -232,11 +233,12 @@ ObjOldGraphics::Draw( int nStat, int nMark, bool bShowAux)
glColor4f( colMark.GetRed(), colMark.GetGreen(), colMark.GetBlue(), colMark.GetAlpha()) ;
// ciclo di disegno
bool bStartA ;
bool bStartA = false ;
OGALIST::iterator iIter ;
for ( iIter = m_ogaList.begin() ; iIter != m_ogaList.end() ; ++ iIter) {
switch ( iIter->m_nType) {
case OgAtom::START :
bStartA = false ;
glBegin( iIter->m_nMode) ;
break ;
case OgAtom::START_A :
@@ -250,7 +252,7 @@ ObjOldGraphics::Draw( int nStat, int nMark, bool bShowAux)
break ;
case OgAtom::VERT :
if ( ! bStartA || bShowAux)
glVertex3fv( iIter->m_fVal) ;
glVertex3fv( iIter->m_fVal) ;
break ;
// non si imposta la normale sono solo curve
// non si impostano i colori, si usa quello di marcatura
+2 -2
View File
@@ -93,11 +93,11 @@ class ObjOldGraphics : public ObjEGrGraphics
oga.m_nType = ( bAux ? OgAtom::START_A : OgAtom::START) ;
oga.m_nMode = nMode ;
return AddOgAtom( oga) ; }
bool AddEnd( void)
bool AddEnd( void)
{ OgAtom oga ;
oga.m_nType = OgAtom::END ;
return AddOgAtom( oga) ; }
bool AddVert3f( const Point3d& ptP)
bool AddVert3f( const Point3d& ptP)
{ OgAtom oga ;
oga.m_nType = OgAtom::VERT ;
oga.m_fX = float( ptP.x) ; oga.m_fY = float( ptP.y) ; oga.m_fZ = float( ptP.z) ;
+1
View File
@@ -243,6 +243,7 @@ Scene::GetOpenGLInfo( void)
const char* p ;
if ( ( p = reinterpret_cast<const char*> ( glGetString( GL_VERSION))) != nullptr)
sInfo += p ;
sInfo += ( m_bNewWay ? " (new way)" : " (old way)") ;
sInfo += " " ;
if ( ( p = reinterpret_cast<const char*> ( glGetString( GL_VENDOR))) != nullptr)
sInfo += p ;