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

Timestamp:

Apr 12, 2010, 5:20:43 PM (14 years ago)

Author:

garnier

Message:

bugged version

File:

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

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

@@ -234 +234 @@
 // printf(" circle ");
 #endif
+#ifdef G4VIS_BUILD_OPTIMISE_3
+      std::vector <G4VMarker> circleV; 
+      // FIXME, must check attribute before doing a list
+#endif
       for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
         G4Circle circle (polymarker);
+        // If not already drawn
         circle.SetPosition (polymarker[iPoint]);
-        G4OpenGLSceneHandler::AddPrimitive (circle);
-      }
+#ifdef G4VIS_BUILD_OPTIMISE_3
+        circleV.push_back(circle);
+#endif
+      }
+#ifdef G4VIS_BUILD_OPTIMISE_3
+      G4OpenGLSceneHandler::AddPrimitives (circleV);
+#endif
     }
     break;
@@ -246 +256 @@
 // printf(" square ");
 #endif
+#ifdef G4VIS_BUILD_OPTIMISE_3
+      std::vector <G4VMarker> squareV; 
+      // FIXME, must check attribute before doing a list
+#endif
       for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
         G4Square square (polymarker);
         square.SetPosition (polymarker[iPoint]);
-        G4OpenGLSceneHandler::AddPrimitive (square);
-      }
+#ifdef G4VIS_BUILD_OPTIMISE_3
+        squareV.push_back(square);
+#endif
+      }
+#ifdef G4VIS_BUILD_OPTIMISE_3
+      G4OpenGLSceneHandler::AddPrimitives (squareV);
+#endif
     }
     break;
@@ -319 +338 @@
 }
 
+void G4OpenGLSceneHandler::AddPrimitives (std::vector <G4VMarker> square) {
+  glDisable (GL_POINT_SMOOTH);
+  AddCircleSquares (square, G4OpenGLBitMapStore::square);
+}
+
 void G4OpenGLSceneHandler::AddCircleSquare
 (const G4VMarker& marker,
@@ -398 +422 @@
      glBegin (GL_POINTS);
      glVertex3f(centre.x(),centre.y(),centre.z());
+     glEnd();
+     //Antialiasing
+     glEnable (GL_POINT_SMOOTH);
+     //Transparency
+     glEnable(GL_BLEND);
+     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+     // 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);
+   }
+}
+
+void G4OpenGLSceneHandler::AddCircleSquares
+(std::vector <G4VMarker> marker,
+ G4OpenGLBitMapStore::Shape shape) {
+
+  if (marker.size() == 0) {
+    return;
+  }
+
+  if (!fProcessingPolymarker) {  // Polymarker has already loaded atts.
+    // Loads G4Atts for picking...
+    if (fpViewer->GetViewParameters().IsPicking()) {
+      G4AttHolder* holder = new G4AttHolder;
+      LoadAtts(marker[0], holder);
+      fPickMap[fPickName] = holder;
+    }
+  }
+
+  // Note: colour treated in sub-class.
+
+  if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) {
+#ifdef G4DEBUG_VIS_OGL
+    //    printf("+");
+#endif
+    glDisable (GL_DEPTH_TEST);
+  } else {
+#ifdef G4DEBUG_VIS_OGL
+    //    printf("-");
+#endif
+    glEnable (GL_DEPTH_TEST); glDepthFunc (GL_LESS);}
+  
+  glDisable (GL_LIGHTING);
+  
+  // Get vis attributes - pick up defaults if none.
+  const G4VisAttributes* pVA =
+    fpViewer -> GetApplicableVisAttributes (marker[0].GetVisAttributes ());
+
+  G4double lineWidth = GetLineWidth(pVA);
+  glLineWidth(lineWidth);
+
+  G4VMarker::FillStyle style = marker[0].GetFillStyle();
+
+  G4bool filled = false;
+  static G4bool hashedWarned = false;
+  
+  switch (style) {
+  case G4VMarker::noFill: 
+    glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
+    filled = false;
+    break;
+    
+  case G4VMarker::hashed:
+    if (!hashedWarned) {
+      G4cout << "Hashed fill style in G4OpenGLSceneHandler."
+             << "\n  Not implemented.  Using G4VMarker::filled."
+             << G4endl;
+      hashedWarned = true;
+    }
+    // Maybe use
+    //glPolygonStipple (fStippleMaskHashed);
+    // Drop through to filled...
+    
+  case G4VMarker::filled:
+    glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+    filled = true;
+    break;
+    
+  }
+
+
+
+  MarkerSizeType sizeType;
+  G4double size = GetMarkerSize(marker[0], sizeType);
+
+  // Draw...
+   if (sizeType == world) {  // Size specified in world coordinates.
+
+     for (unsigned int a=0;a<marker.size();a++) {
+       G4Point3D centre = marker[a].GetPosition();
+       // A few useful quantities...
+       DrawXYPolygon (shape, size, centre, pVA);
+     }
+   } else { // Size specified in screen (window) coordinates.
+     // A few useful quantities...
+     glPointSize (size);
+     glBegin (GL_POINTS);
+     for (unsigned int a=0;a<marker.size();a++) {
+       G4Point3D centre = marker[a].GetPosition();
+       glVertex3f(centre.x(),centre.y(),centre.z());
+     }
      glEnd();
      //Antialiasing