Changeset 553


Ignore:
Timestamp:
Jul 12, 2007, 5:33:05 PM (17 years ago)
Author:
garnier
Message:

r708@mac-90108: laurentgarnier | 2007-07-11 12:47:09 +0200
pas mal, sauf que le gun ne fait aucun effet

Location:
trunk/geant4/visualization/OpenGL/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc

    r552 r553  
    154154
    155155  printf("G4OpenGLImmediateQtViewer::DrawView2 %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
    156   // If a double buffer context has been forced upon us, ignore the
    157   // back buffer for this OpenGLImmediate view.
    158   glDrawBuffer (GL_FRONT);
    159 
    160   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
    161 
    162   //Make sure current viewer is attached and clean...
    163   //Qt version needed
    164   //glXMakeCurrent (dpy, win, cx);
    165   glViewport (0, 0, WinSize_x, WinSize_y);
    166 
    167   if(style!=G4ViewParameters::hlr &&
    168      haloing_enabled) {
    169 
    170     HaloingFirstPass ();
    171     NeedKernelVisit ();
    172     ProcessView ();
    173     glFlush ();
    174 
    175     HaloingSecondPass ();
    176 
    177   }
    178 
    179   NeedKernelVisit ();  // Always need to visit G4 kernel.
    180   ProcessView ();
    181   FinishView ();
     156   // If a double buffer context has been forced upon us, ignore the
     157   // back buffer for this OpenGLImmediate view.
     158  //   glDrawBuffer (GL_FRONT);
     159
     160   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
     161
     162   //Make sure current viewer is attached and clean...
     163   //Qt version needed
     164   //glXMakeCurrent (dpy, win, cx);
     165   glViewport (0, 0, WinSize_x, WinSize_y);
     166
     167   if(style!=G4ViewParameters::hlr &&
     168      haloing_enabled) {
     169
     170     HaloingFirstPass ();
     171     NeedKernelVisit ();
     172     ProcessView ();
     173     glFlush ();
     174
     175     HaloingSecondPass ();
     176
     177   }
     178
     179   NeedKernelVisit ();  // Always need to visit G4 kernel.
     180   ProcessView ();
     181   FinishView ();
    182182  printf("G4OpenGLImmediateQtViewer::DrawView2 %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
    183183
     
    210210,int height)
    211211{
    212    printf("GLWidget::resizeGL\n");
    213      int side = qMin(width, height);
    214      glViewport((width - side) / 2, (height - side) / 2, side, side);
    215 
    216      glMatrixMode(GL_PROJECTION);
    217      glLoadIdentity();
    218      glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
    219      glMatrixMode(GL_MODELVIEW);
    220    printf("GLWidget::resizeGL END\n");
    221 //   printf("G4OpenGLImmediateQtViewer::resizeGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
     212  printf("G4OpenGLImmediateQtViewer::resizeGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
    222213 
    223 //   int side = qMin(width, height);
    224 //   glViewport((width - side) / 2, (height - side) / 2, side, side);
    225 //   glMatrixMode(GL_PROJECTION);
    226 //   glLoadIdentity();
    227 //   glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
    228 //   glMatrixMode(GL_MODELVIEW);
     214  int side = qMin(width, height);
     215  glViewport((width - side) / 2, (height - side) / 2, side, side);
     216  glMatrixMode(GL_PROJECTION);
     217  glLoadIdentity();
     218  glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
     219  glMatrixMode(GL_MODELVIEW);
    229220 
    230 //   printf("G4OpenGLImmediateQtViewer::resizeGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
     221  printf("G4OpenGLImmediateQtViewer::resizeGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
    231222}
    232223
     
    235226   if (!readyToPaint)
    236227     return;
    237    printf("GLWidget::paintGL\n");
    238      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    239      glLoadIdentity();
    240      glTranslated(0.0, 0.0, -10.0);
    241      glRotated(xRot / 16.0, 1.0, 0.0, 0.0);
    242      glRotated(yRot / 16.0, 0.0, 1.0, 0.0);
    243      glRotated(zRot / 16.0, 0.0, 0.0, 1.0);
    244      glCallList(object);
    245    printf("GLWidget::paintGL END\n");
     228//    printf("GLWidget::paintGL\n");
     229//      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     230//      glLoadIdentity();
     231//      glTranslated(0.0, 0.0, -10.0);
     232//      glRotated(xRot / 16.0, 1.0, 0.0, 0.0);
     233//      glRotated(yRot / 16.0, 0.0, 1.0, 0.0);
     234//      glRotated(zRot / 16.0, 0.0, 0.0, 1.0);
     235//      glCallList(object);
     236//    printf("GLWidget::paintGL END\n");
    246237//   printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
    247238//   float b=3;
    248239
    249 //   WinSize_x = (G4int) width();
    250 //   WinSize_y = (G4int) height();
    251 
    252 //   glViewport (0, 0, width(), height());
     240   WinSize_x = (G4int) width();
     241   WinSize_y = (G4int) height();
     242
     243   glViewport (0, 0, width(), height());
    253244
    254245   SetView();
     
    258249//   printf("    ClearView\n");
    259250   ClearView (); //ok, put the background correct
    260    //  DrawView2();
     251   DrawView2();
    261252//   //  ShowView();
    262253//   //  printf("before ClearView\n");
  • trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

    r552 r553  
    8282  printf("G4OpenGLQtViewer::ShowView  +++++++++++++++++++++\n");
    8383  //   if(!fHDC) return;
    84   fWindow->resize(100, 300);
     84  //  fWindow->resize(100, 300);
    8585  //  glFlush ();
    8686  printf("G4OpenGLQtViewer::ShowView -----------------------\n");
Note: See TracChangeset for help on using the changeset viewer.