Changeset 1160 for trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc

Timestamp:

Nov 9, 2009, 6:57:11 PM (15 years ago)

Author:

garnier

Message:

mise en place de Vis dans UI

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc (modified) (3 diffs)

trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc

@@ -44 +44 @@
 // Also seems to be required for HP's CC and AIX xlC, at least.
 
-
-#include "G4OpenGLQtViewer.hh"
 #include "G4OpenGLSceneHandler.hh"
 #include "G4OpenGLViewer.hh"
@@ -265 +263 @@
   G4int font_base = G4OpenGLFontBaseStore::GetFontBase(fpViewer,size);
   if (font_base < 0) {
-    
-#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
-    G4OpenGLQtViewer* oGLSQtViewer = dynamic_cast<G4OpenGLQtViewer*>(fpViewer);
-    if (oGLSQtViewer) {
-      // FIXME : No font for the moment
-      const char* textCString = textString.c_str();
-      oGLSQtViewer->drawText(textCString,position.x(),position.y(),position.z(),size);
-    }
-#endif
     static G4int callCount = 0;
     ++callCount;
@@ -294 +283 @@
   const char* textCString = textString.c_str();
   glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
-#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
-  G4OpenGLQtViewer* oGLSQtViewer = dynamic_cast<G4OpenGLQtViewer*>(fpViewer);
-
-  if (oGLSQtViewer) {
-    // FIXME : No font for the moment
-    oGLSQtViewer->drawText(textCString,position.x(),position.y(),position.z(),size);
-  }
-#else
-    glDisable (GL_DEPTH_TEST);
-    glDisable (GL_LIGHTING);
-    
-    glRasterPos3d(position.x(),position.y(),position.z());
-    // No action on offset or layout at present.
-    glPushAttrib(GL_LIST_BIT);
-    glListBase(font_base);
-    glCallLists(strlen(textCString), GL_UNSIGNED_BYTE, (GLubyte *)textCString);
-    glPopAttrib();
-#endif
-  //     //////////////
-  //     makeCurrent();
-  //     glPushAttrib(GL_LIST_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT);
-  //     glRasterPos3d(x, y, z);
-  //     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-  //     glEnable(GL_BLEND);
-  //     glListBase(fontDisplayListBase(fnt, listBase));
-  //     glCallLists(str.length(), GL_UNSIGNED_BYTE, str.local8Bit());
-  //     glPopAttrib();
-  //     //////////////
+  glDisable (GL_DEPTH_TEST);
+  glDisable (GL_LIGHTING);
   
-#ifdef G4DEBUG_VIS_OGL
-  printf ("G4OpenGLSceneHandler::AddPrimitives TEXT\n");
-#endif  
+  glRasterPos3d(position.x(),position.y(),position.z());
+  // No action on offset or layout at present.
+   glPushAttrib(GL_LIST_BIT);
+   glListBase(font_base);
+   glCallLists(strlen(textCString), GL_UNSIGNED_BYTE, (GLubyte *)textCString);
+   glPopAttrib();
 }