Changeset 543 for trunk/geant4/visualization/OpenGL

Timestamp:

Jul 10, 2007, 6:15:20 PM (17 years ago)

Author:

garnier

Message:

r689@mac-90108: laurentgarnier | 2007-07-09 18:33:54 +0200
visu OpenGL en cours de debug NE MARCHE PAS

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLImmediateQtViewer.hh (modified) (1 diff)
• src/G4OpenGLImmediateQtViewer.cc (modified) (7 diffs)
• src/G4OpenGLQtViewer.cc (modified) (5 diffs)
• src/G4OpenGLViewer.cc (modified) (2 diffs)

trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh

@@ -53 +53 @@
                                 const G4String& name = "");
   void Initialise ();
+  void InitialiseGL ();
   void DrawView ();
   void FinishView ();

trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc

@@ -49 +49 @@
 }
 
-void G4OpenGLImmediateQtViewer::Initialise () {
+void G4OpenGLImmediateQtViewer::Initialise() {
 
   readyToPaint = false;
@@ -57 +57 @@
   printf("G4OpenGLImmediateQtViewer::Initialise () 1\n");
   CreateGLQtContext ();
+  printf("G4OpenGLImmediateQtViewer::Initialise () 2\n");
 
   CreateMainWindow (this);
+  printf("G4OpenGLImmediateQtViewer::Initialise () 3\n");
   CreateFontLists ();
+  printf("G4OpenGLImmediateQtViewer::Initialise () 4\n");
+  readyToPaint = true;
+
+  InitializeGLView ();
+
+  printf("G4OpenGLImmediateQtViewer::Initialise () 5\n");
+
+  // clear the buffers and window.
+  //  ClearView ();
+  printf("G4OpenGLImmediateQtViewer::Initialise () 6\n");
+  //  FinishView ();
+  printf("G4OpenGLImmediateQtViewer::Initialise () 7\n");
 
   // If a double buffer context has been forced upon us, ignore the
@@ -65 +79 @@
   glDrawBuffer (GL_FRONT);
 
-  // clear the buffers and window.
-  ClearView ();
-  FinishView ();
-
   glDepthFunc (GL_LEQUAL);
   glDepthMask (GL_TRUE);
-
-  readyToPaint = true;
-}
+  printf("G4OpenGLImmediateQtViewer::Initialise () 8\n");
+
+}
+
+void G4OpenGLImmediateQtViewer::InitialiseGL () {
+  printf("G4OpenGLImmediateQtViewer::Initialise   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
+  printf("G4OpenGLImmediateQtViewer::Initialise  -------------------------------------------------------------------------------------\n");
+}
+
 
 void G4OpenGLImmediateQtViewer::DrawView () {
@@ -135 +151 @@
 {
   printf("G4OpenGLImmediateQtViewer::resizeGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
+  /*
   int side = qMin(width, height);
   glViewport((width - side) / 2, (height - side) / 2, side, side);
@@ -141 +158 @@
   glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
   glMatrixMode(GL_MODELVIEW);
+  */
   printf("G4OpenGLImmediateQtViewer::resizeGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 }
@@ -147 +165 @@
  {
   printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
+  float b=3;
   if (!readyToPaint)
     return;
 
-  WinSize_x = (G4int) width();
-  WinSize_y = (G4int) height();
-
-  glViewport (0, 0, width(), height());
-
-  SetView();
-  ClearView (); //ok, put the background correct
-  float b=3;
+  //  WinSize_x = (G4int) width();
+  //  WinSize_y = (G4int) height();
+
+  //  glViewport (0, 0, width(), height());
+
+  //  SetView();
+  printf("before ClearView\n");
+  //  makeCurrent();
   for (int a=0;a<100000000;a++) {b = b/3.1456;}
-  DrawView();
-  for (int a=0;a<100000000;a++) {b = b/3.1456;}
-  ShowView();
-  for (int a=0;a<100000000;a++) {b = b/3.1456;}
-  //  makeCurrent();
+  printf("    ClearView\n");
+  //  ClearView (); //ok, put the background correct
+  //  DrawView();
+  //  ShowView();
+  //  printf("before ClearView\n");
+  //  ClearView (); //ok, put the background correct
   printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
   // FIXME
@@ -170 +190 @@
   //  glLoadIdentity();
   //  glTranslated(0.0, 0.0, -10.0);
+
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ glLoadIdentity();
+ glTranslatef(-1.5f,0.0f,-6.0f);
+ glBegin(GL_TRIANGLES);
+ glVertex3f( 0.0f, 1.0f, 0.0f);
+ glVertex3f(-1.0f,-1.0f, 0.0f);
+ glVertex3f( 1.0f,-1.0f, 0.0f);
+ glEnd();
+ glTranslatef(3.0f,0.0f,0.0f);
+ glBegin(GL_QUADS);
+ glVertex3f(-1.0f, 1.0f, 0.0f);
+ glVertex3f( 1.0f, 1.0f, 0.0f);
+ glVertex3f( 1.0f,-1.0f, 0.0f);
+ glVertex3f(-1.0f,-1.0f, 0.0f);
+ glEnd(); 
  }
 #endif

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -64 +64 @@
 //   if(!fHGLRC) return;
 //   ::wglMakeCurrent(fHDC,fHGLRC);
-  fWindow->makeCurrent();
+//  fWindow->makeCurrent();
   G4OpenGLViewer::SetView ();  
   printf("G4OpenGLQtViewer::SetView --------------------\n");
@@ -126 +126 @@
 
   fWindow = new QGLWidget() ;
-  fWindow->makeCurrent();
+  //  fWindow->makeCurrent();
 
   // create window
@@ -140 +140 @@
   GLWindow->setWindowTitle("QGl Viewer");
   GLWindow->resize(100, 300);
+  GLWindow->move(QPoint(600,400));
   GLWindow->show();
 
@@ -213 +214 @@
 
   fWindow = glWidget ;
-  fWindow->makeCurrent();
+  //  fWindow->makeCurrent();
 
   // create window
@@ -226 +227 @@
   GLWindow->setLayout(mainLayout);
   GLWindow->setWindowTitle("QGl Viewer");
-  GLWindow->resize(300, 300);
+  // GLWindow->resize(300, 300);
   GLWindow->show();
 

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

@@ -88 +88 @@
 void G4OpenGLViewer::InitializeGLView () 
 {
+  printf("G4OpenGLViewer::InitializeGLView () VVVVVVVVVVVVVVVVVVVVV \n");
   glClearColor (0.0, 0.0, 0.0, 0.0);
   glClearDepth (1.0);
@@ -93 +94 @@
   glDisable (GL_LINE_SMOOTH);
   glDisable (GL_POLYGON_SMOOTH);
+  printf("G4OpenGLViewer::InitializeGLView () ^^^^^^^^^^^^^^^^^^^^ \n");
 }