Changeset 931 for trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc

Timestamp:

Feb 25, 2009, 4:19:05 PM (15 years ago)

Author:

garnier

Message:

test pour GL_POINTS au lieu de glBitmap

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc (modified) (7 diffs)

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

@@ -33 +33 @@
 
 #ifdef G4VIS_BUILD_OPENGL_DRIVER
+
+#define G4DEBUG_VIS_OGL
 
 #include "G4ios.hh"
@@ -143 +145 @@
 
 void G4OpenGLViewer::ClearView () {
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::ClearView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
+#endif
   glClearColor (background.GetRed(),
                 background.GetGreen(),
@@ -154 +159 @@
   glClear (GL_STENCIL_BUFFER_BIT);
   glFlush ();
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::ClearView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
+#endif
 }
 
@@ -169 +177 @@
 
 void G4OpenGLViewer::SetView () {
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::SetView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
+#endif
 
   if (!fSceneHandler.GetScene()) {
@@ -308 +320 @@
   background = fVP.GetBackgroundColour ();
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::SetView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+#endif
 }
 
 void G4OpenGLViewer::HaloingFirstPass () {
   
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::HaloingFirstPass VVVVVVVVVVVVVVVVVV \n");
+#endif
   //To perform haloing, first Draw all information to the depth buffer
   //alone, using a chunky line width, and then Draw all info again, to
@@ -334 +352 @@
 void G4OpenGLViewer::HaloingSecondPass () {
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::HaloingSecondtPass VVVVVVVVVVVVVVVVVV \n");
+#endif
   //And finally, turn the colour buffer back on with a sesible line width...
   glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@@ -888 +909 @@
 
   // FIXME : TEST
-  G4VMarker defaultMarker = GetViewParameters().GetDefaultMarker();
-  defaultMarker.SetWorldSize(defaultMarker.GetScreenSize());
-  defaultMarker.SetWorldDiameter(defaultMarker.GetScreenDiameter());
-  defaultMarker.SetWorldRadius(defaultMarker.GetScreenRadius());
+  printf("G4OpenGLViewer::WritePostScript world size:%f\n",GetViewParameters().GetDefaultMarker().GetWorldSize());
+  G4ViewParameters vp = GetViewParameters();  
+  G4VMarker defaultMarker = vp.GetDefaultMarker();
+  G4VMarker myMarker = vp.GetDefaultMarker();
+
+  myMarker.SetScreenSize(0); // before SetWorldSize
+  myMarker.SetScreenDiameter(0); // before SetWorldSize
+  myMarker.SetScreenRadius(0); // before SetWorldSize
+
+  myMarker.SetWorldSize(6.);
+  myMarker.SetWorldDiameter(4.);
+  myMarker.SetWorldRadius(3.);
+//   myMarker.SetWorldSize(defaultMarker.GetScreenSize());
+//   myMarker.SetWorldDiameter(defaultMarker.GetScreenDiameter());
+//   myMarker.SetWorldRadius(defaultMarker.GetScreenRadius());
+
+  vp.SetDefaultMarker(myMarker);
+  SetViewParameters(vp);
 
   fGL2PSAction->setFileName("PostScriptViaGL2PS.ps");
   if (fGL2PSAction->enableFileWriting()) {
-    ShowView();
+    NeedKernelVisit ();
     ProcessView();
-    DrawView();
+    SetView ();
+    ClearView ();
+    DrawView ();
     fGL2PSAction->disableFileWriting();
   }
-//   defaultMarker.SetScreenSize(defaultMarker.GetWorldSize());
-//   defaultMarker.SetScreenDiameter(defaultMarker.GetWorldDiameter());
-//   defaultMarker.SetScreenRadius(defaultMarker.GetWorldRadius());
+  vp.SetDefaultMarker(defaultMarker);
+  SetViewParameters(vp);
   // FIXME : TEST