Changeset 935

Timestamp:

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

Author:

garnier

Message:

remove files

Location:

trunk/source/visualization

Files:

• OpenGL/History (modified) (2 diffs)
• OpenGL/include/G4OpenGLStoredSceneHandler.hh (modified) (2 diffs)
• OpenGL/src/G4OpenGLSceneHandler.cc (modified) (5 diffs)
• OpenGL/src/Geant4_gl2ps.h (deleted)
• OpenGL/src/gl2ps.cc (deleted)
• OpenGL/src/gl2ps.h (deleted)
• modeling/include/G4ModelApplyCommandsT.hh (modified) (1 diff)
• modeling/src/G4TrajectoryDrawerUtils.cc (modified) (2 diffs)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.126 2009/02/16 15:31:05 lgarnier Exp $
+$Id: History,v 1.127 2009/03/03 14:51:29 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/OpenGL
 -------------------------------------
+
+1st March 2009, Laurent Garnier
+- Remplacing glBitmap by GL_POINTS to draw marker : Speed improvment
+  and gl2ps can now draw Markers.
 
 16 February 2009, Laurent Garnier

trunk/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

@@ -41 +41 @@
 #include <map>
 #include <vector>
+#include "G4Polymarker.hh"
 
 class G4OpenGLStored;
@@ -104 +105 @@
   // A proper implementation would use geometry hierarchy.
   std::map <const G4VSolid*, G4int, std::less <const G4VSolid*> > fSolidMap;
+
+private:
+  G4Polymarker fLastPolymarker ;
 };
 

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);
    }
 }

trunk/source/visualization/modeling/include/G4ModelApplyCommandsT.hh

@@ -552 +552 @@
   Apply(newValue);
   G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
-  printf("G4ModelApplyCommand 8 :%d\n",visManager);
   if (visManager) visManager->NotifyHandlers();
 }

trunk/source/visualization/modeling/src/G4TrajectoryDrawerUtils.cc

@@ -90 +90 @@
     
     GetPoints(traj, trajectoryLine, auxiliaryPoints, stepPoints);
-    
     if (lineRequired) {
       G4VisAttributes trajectoryLineAttribs(colour);
@@ -241 +240 @@
     // Draw without time slice information
 
+    //
+    for (size_t iPoint = 0; iPoint < trajectoryLine.size (); iPoint++) {
+      //      printf("DrawLineAndPoints trajectory i:%d/%d center:%f,%f,%f\n",iPoint,trajectoryLine.size (),trajectoryLine[iPoint].x(),trajectoryLine[iPoint].y(),trajectoryLine[iPoint].z());
+    }
+    for (size_t iPoint = 0; iPoint < auxiliaryPoints.size (); iPoint++) {
+      printf("DrawLineAndPoints aux i:%d/%d center:%f,%f,%f\n",iPoint,auxiliaryPoints.size (),auxiliaryPoints[iPoint].x(),auxiliaryPoints[iPoint].y(),auxiliaryPoints[iPoint].z());
+    }
+    for (size_t iPoint = 0; iPoint < stepPoints.size (); iPoint++) {
+      printf("DrawLineAndPoints step i:%d/%d center:%f,%f,%f\n",iPoint,stepPoints.size (),stepPoints[iPoint].x(),stepPoints[iPoint].y(),stepPoints[iPoint].z());
+    }
+    //    
     G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
     if (0 == pVVisManager) return;