Changeset 1160 for trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.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/G4OpenGLStoredSceneHandler.cc (modified) (6 diffs)

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

@@ -81 +81 @@
 fMemoryForDisplayLists (true),
 fAddPrimitivePreambleNestingDepth (0),
-fTopPODL (0),
-fLastPolymarker(),
-fLastPolymarkers(),
-nbDoublons(0)
+fTopPODL (0)
 {}
 
@@ -195 +192 @@
   if (fReadyForTransients || !fMemoryForDisplayLists) {
     glPopMatrix();
-#ifdef G4DEBUG_VIS_OGL
-    //    printf("G4OpenGLStoredSceneHandler::AddPrimitivePostamble glFlush\n");
-#endif
     glFlush ();
     glDrawBuffer (GL_BACK);
@@ -213 +207 @@
 void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Polymarker& polymarker)
 {
-
-#ifdef G4DEBUG_VIS_OGL
-  //  printf("G4OpenGLStoredSceneHandler::AddPrimitive\n");
-#endif
-  std::vector< G4Polymarker > poly;
-    // 40,83 N03 lancement
-    // 289,69 10Gev supp doublons   + bitmap 21 frame en 10 sec
-    // 343,45 10Gev full polymarker + bitmap 15 frame en 10 sec
-    // 351,67 10Gev full polymarker - bitmap 31 frame en 10 sec
-    // 257,90 10Gev supp doublons MAX  - bitmap 42 frame en 10 sec 45757 markers et 16243 enleves
-  // Check
-  int reste = polymarker.size();
-  bool res = false;
-  if (fLastPolymarkers.size() > 0 ) {
-
-    // Loop new point to check
-    for (unsigned int b=0; b< polymarker.size();b++) {
-      //      printf("check %d/%d\n",b,polymarker.size());
-      res= false;
-
-      // Look for stored point list
-      for (unsigned int a=0; a< fLastPolymarkers.size() ;a++) {
-        //        printf("against vect %d/%d\n",a,fLastPolymarker.size());
-        std::vector < G4Polymarker > storedPoly = fLastPolymarkers[a];
-        int size= storedPoly.size()-1;
-
-        // Look for point
-        for (int aPoly=0; aPoly< size ;aPoly++) {
-          //          printf("against poly %d/%d\n",aPoly,storedPoly.size());
-          if (( storedPoly[size-aPoly].GetPosition().x() == polymarker[b].x()) &&
-              ( storedPoly[size-aPoly].GetPosition().y() == polymarker[b].y()) &&
-              ( storedPoly[size-aPoly].GetPosition().z() == polymarker[b].z())) {
-            reste --;
-//            res= true;
-            nbDoublons++;
-            //            printf("G4OpenGLStoredSceneHandler::AddPrimitive  PT %d/%d ALREADY FOUND TOT:%d. OLD pos %d/%d in %d PolyMarkerList STILL %d Marker in list. Point is %f %f %f\n",b,polymarker.size(),  nbDoublons,  aPoly,size,a   ,reste,polymarker[b].x(),polymarker[b].y(),polymarker[b].z());
-          }
-        }
-      }
-      // Add
-      if (!res) {
-        G4Polymarker tmp;
-        tmp.SetPosition(polymarker[b]);
-        poly.push_back(tmp);
-      }
-    }
-  } else {
-    for (unsigned int b=0; b< polymarker.size();b++) {
-      G4Polymarker tmp;
-      tmp.SetPosition(polymarker[b]);
-      poly.push_back(tmp);
-    }
-  }
-  fLastPolymarkers.push_back(poly);
-#define TEST_MARKER 1
-#ifdef TEST_MARKER 
-  // if it is already done
-  if (poly.size() == 1 ) {
-    //   if (polymarker.size() >0) {
-    //     if (( fLastPolymarker.GetPosition().x() == polymarker[0].x()) &&
-    //         ( fLastPolymarker.GetPosition().y() == polymarker[0].y()) &&
-    //         ( fLastPolymarker.GetPosition().z() == polymarker[0].z())) {
-    //       if (fpViewer->GetViewParameters().IsPicking()) {
-    //         glLoadName(++fPickName);
-    //         fPickMap[fPickName] = 0;
-    //       }
-    //       printf("G4OpenGLStoredSceneHandler::AddPrimitive  SUPPR ----------- point %f %f %f\n",polymarker[0].x(),polymarker[0].y(),polymarker[0].z());
-    const G4Colour& c = GetColour (polymarker);
-    glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
-    G4OpenGLSceneHandler::AddPrimitive(poly[0]);
-    //    fLastPolymarker.SetPosition(polymarker[poly]);
-    return;
-  }
-#endif  
-#ifdef G4DEBUG_VIS_OGL
-  //  printf("G4OpenGLStoredSceneHandler::AddPrimitive new marker list\n");
-#endif
   AddPrimitivePreamble(polymarker);
   G4OpenGLSceneHandler::AddPrimitive(polymarker);
   AddPrimitivePostamble();
-//  fLastPolymarker.SetPosition(polymarker[polymarker.size()-1]);
 }
 
@@ -332 +248 @@
   // gets into the display list
   AddPrimitivePreamble(polyhedron);
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredSceneHandler::AddPrimitive (poly?) :\n");
-#endif
   G4OpenGLSceneHandler::AddPrimitive(polyhedron);
   AddPrimitivePostamble();
@@ -384 +297 @@
 void G4OpenGLStoredSceneHandler::EndModeling () {
   // Make a List which calls the other lists.
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredSceneHandler::EndModeling Cree une nouvelle liste+++++++++++++++++++++++++++\n");
-#endif
   fTopPODL = glGenLists (1);
   if (glGetError() == GL_OUT_OF_MEMORY) {  // Could pre-allocate?
@@ -454 +364 @@
   // Make sure screen corresponds to graphical database...
   if (fpViewer) {
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLStoredSceneHandler::ClearTransientStore () BEGIN\n");
-#endif
     fpViewer -> SetView ();
     fpViewer -> ClearView ();
     fpViewer -> DrawView ();
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLStoredSceneHandler::ClearTransientStore () END\n");
-#endif
   }
 }