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

Timestamp:

Mar 3, 2009, 3:46:50 PM (15 years ago)

Author:

garnier

Message:

before CVS commit

File:

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

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

@@ -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);
       }
@@ -286 +287 @@
   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);
-  glListBase(font_base);
-  glCallLists(strlen(textCString), GL_UNSIGNED_BYTE, (GLubyte *)textCString);
-  glPopAttrib();
+   glPushAttrib(GL_LIST_BIT);
+   glListBase(font_base);
+   glCallLists(strlen(textCString), GL_UNSIGNED_BYTE, (GLubyte *)textCString);
+   glPopAttrib();
 }
 
@@ -371 +380 @@
 
    } 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);
@@ -380 +392 @@
      glEnable(GL_BLEND);
      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-     //        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);
+#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
    }
 }