Changeset 935 for trunk/source/visualization/OpenGL/src

Timestamp:

Mar 3, 2009, 3:56:13 PM (15 years ago)

Author:

garnier

Message:

remove files

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLSceneHandler.cc (modified) (5 diffs)
• Geant4_gl2ps.h (deleted)
• gl2ps.cc (deleted)
• gl2ps.h (deleted)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLSceneHandler.cc,v 1.54 2008/04/04 13:32:22 allison Exp $
+// $Id: G4OpenGLSceneHandler.cc,v 1.55 2009/03/03 14:51:29 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -228 +228 @@
         G4Circle circle (polymarker);
         circle.SetPosition (polymarker[iPoint]);
-        printf("  G4OpenGLSceneHandler::AddPrimitive const G4Polymarker& polymarker iPoint:%d/%d center:%f,%f,%f\n",iPoint,polymarker.size (),polymarker[iPoint].x(),polymarker[iPoint].y(),polymarker[iPoint].z());
         G4OpenGLSceneHandler::AddPrimitive (circle);
       }
@@ -287 +286 @@
   glDisable (GL_LIGHTING);
   
-  printf("Creation d'un texte =====================\n");
   glRasterPos3d(position.x(),position.y(),position.z());
-
-  //
-  //  const char *pC;
-  //  for (pC=textCString; *pC != '\0'; pC++) {
-  //  glutStrokeCharacter(GLUT_STROKE_ROMAN, *pC);
-  //  }
-  //
   // No action on offset or layout at present.
    glPushAttrib(GL_LIST_BIT);
@@ -377 +368 @@
   // Draw...
    if (sizeType == world) {  // Size specified in world coordinates.
+
      DrawXYPolygon (shape, size, centre, pVA);
 
    } else { // Size specified in screen (window) coordinates.
-     //     printf("Cree un marqueur------------------------------------%f %f %f \n",centre.x(),centre.y(),centre.z());
-#define G4_POINT=1
-#ifdef G4_POINT
      glPointSize (size);       
      glBegin (GL_POINTS);
@@ -392 +381 @@
      glEnable(GL_BLEND);
      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-#else
-     glRasterPos3d(centre.x(),centre.y(),centre.z());
-     const GLubyte* marker =
-       G4OpenGLBitMapStore::GetBitMap(shape, size, filled);
-     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-     glBitmap(GLsizei(size), GLsizei(size), size/2., size/2., 0., 0., marker);
-#endif
+
+     // L. GARNIER 1 March 2009
+     // Old method, we draw a bitmap instead of a GL_POINT. 
+     // I remove it because it cost in term of computing performances
+     // and gl2ps can't draw bitmaps
+
+     //      glRasterPos3d(centre.x(),centre.y(),centre.z());
+     //      const GLubyte* marker =
+     //        G4OpenGLBitMapStore::GetBitMap(shape, size, filled);
+     //      glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+     //      glBitmap(GLsizei(size), GLsizei(size), size/2., size/2., 0., 0., marker);
    }
 }