Changeset 554

Timestamp:

Jul 12, 2007, 5:33:07 PM (17 years ago)

Author:

garnier

Message:

r709@mac-90108: laurentgarnier | 2007-07-11 17:47:06 +0200
pas mal, sauf que le gun ne fait aucun effet. Suppression de glwisget en test

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLImmediateQtViewer.hh (modified) (1 diff)
• src/G4OpenGLImmediateQtViewer.cc (modified) (6 diffs)
• src/G4OpenGLImmediateSceneHandler.cc (modified) (1 diff)

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

@@ -63 +63 @@
   int readyToPaint;
 
-
-private:
-     GLuint makeObject();
-     void quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
-               GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4);
-     void extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-/*      void normalizeAngle(int *angle); */
-
-     GLuint object;
-     int xRot;
-     int yRot;
-     int zRot;
-     QPoint lastPos;
-     QColor trolltechGreen;
-     QColor trolltechPurple;
-
 };
 

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

@@ -49 +49 @@
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
-   printf("GLWidget::GLWidget \n");
-     object = 0;
-     xRot = 0;
-     yRot = 0;
-     zRot = 0;
-
-     trolltechGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0);
-     trolltechPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0);
-   printf("GLWidget::GLWidget END\n");
 }
 
@@ -63 +54 @@
    printf("GLWidget::~GLWidget \n");
      makeCurrent();
-     glDeleteLists(object, 1);
    printf("GLWidget::~GLWidget END\n");
 }
@@ -85 +75 @@
 
 void G4OpenGLImmediateQtViewer::initializeGL () {
-   printf("GLWidget::initializeGL \n");
-     qglClearColor(trolltechPurple.dark());
-     object = makeObject();
-     glShadeModel(GL_FLAT);
-     glEnable(GL_DEPTH_TEST);
-     glEnable(GL_CULL_FACE);
-   printf("GLWidget::initializeGL END\n");
-
-//   printf("G4OpenGLImmediateQtViewer::InitialiseGL   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
-
-// // ensure a suitable window was found
-
-
-//   InitializeGLView ();
-
-//   printf("G4OpenGLImmediateQtViewer::InitialiseGL () 1\n");
-
-//   // clear the buffers and window.
-//   //  ClearView ();
+
+   InitializeGLView ();
+
+   printf("G4OpenGLImmediateQtViewer::InitialiseGL () 1\n");
+
+   // clear the buffers and window.
+   //  ClearView ();
 //   printf("G4OpenGLImmediateQtViewer::InitialiseGL () 2\n");
-//   //  FinishView ();
-
-//   // If a double buffer context has been forced upon us, ignore the
-//   // back buffer for this OpenGLImmediate view.
+   //  FinishView ();
+
+   // If a double buffer context has been forced upon us, ignore the
+   // back buffer for this OpenGLImmediate view.
 //   glDrawBuffer (GL_FRONT);
 
-//   glDepthFunc (GL_LEQUAL);
-//   glDepthMask (GL_TRUE);
-
-//   printf("G4OpenGLImmediateQtViewer::InitialiseGL  -------------------------------------------------------------------------------------\n");
+   glDepthFunc (GL_LEQUAL);
+   glDepthMask (GL_TRUE);
+
+   printf("G4OpenGLImmediateQtViewer::InitialiseGL  -------------------------------------------------------------------------------------\n");
 }
 
@@ -121 +99 @@
 
   printf("G4OpenGLImmediateQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
-  // If a double buffer context has been forced upon us, ignore the
-  // back buffer for this OpenGLImmediate view.
-//   glDrawBuffer (GL_FRONT);
-
-//   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
-
-//   //Make sure current viewer is attached and clean...
-//   //Qt version needed
-//   //glXMakeCurrent (dpy, win, cx);
-//   glViewport (0, 0, WinSize_x, WinSize_y);
-
-//   if(style!=G4ViewParameters::hlr &&
-//      haloing_enabled) {
-
-//     HaloingFirstPass ();
-//     NeedKernelVisit ();
-//     ProcessView ();
-//     glFlush ();
-
-//     HaloingSecondPass ();
-
-//   }
-
-//   NeedKernelVisit ();  // Always need to visit G4 kernel.
-//   ProcessView ();
-//   FinishView ();
+    glDraw();
   printf("G4OpenGLImmediateQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
 
@@ -194 +147 @@
 //   //    if(!fHDC) return;
 
-//   glFlush ();
+   glFlush ();
   printf("G4OpenGLImmediateQtViewer::FinishView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 
@@ -263 +216 @@
 
 
-
-
- GLuint G4OpenGLImmediateQtViewer::makeObject()
- {
-     GLuint list = glGenLists(1);
-     glNewList(list, GL_COMPILE);
-
-     glBegin(GL_QUADS);
-
-     GLdouble x1 = +0.06;
-     GLdouble y1 = -0.14;
-     GLdouble x2 = +0.14;
-     GLdouble y2 = -0.06;
-     GLdouble x3 = +0.08;
-     GLdouble y3 = +0.00;
-     GLdouble x4 = +0.30;
-     GLdouble y4 = +0.22;
-
-     quad(x1, y1, x2, y2, y2, x2, y1, x1);
-     quad(x3, y3, x4, y4, y4, x4, y3, x3);
-
-     extrude(x1, y1, x2, y2);
-     extrude(x2, y2, y2, x2);
-     extrude(y2, x2, y1, x1);
-     extrude(y1, x1, x1, y1);
-     extrude(x3, y3, x4, y4);
-     extrude(x4, y4, y4, x4);
-     extrude(y4, x4, y3, x3);
-
-     const double Pi = 3.14159265358979323846;
-     const int NumSectors = 200;
-
-     for (int i = 0; i < NumSectors; ++i) {
-         double angle1 = (i * 2 * Pi) / NumSectors;
-         GLdouble x5 = 0.30 * sin(angle1);
-         GLdouble y5 = 0.30 * cos(angle1);
-         GLdouble x6 = 0.20 * sin(angle1);
-         GLdouble y6 = 0.20 * cos(angle1);
-
-         double angle2 = ((i + 1) * 2 * Pi) / NumSectors;
-         GLdouble x7 = 0.20 * sin(angle2);
-         GLdouble y7 = 0.20 * cos(angle2);
-         GLdouble x8 = 0.30 * sin(angle2);
-         GLdouble y8 = 0.30 * cos(angle2);
-
-         quad(x5, y5, x6, y6, x7, y7, x8, y8);
-
-         extrude(x6, y6, x7, y7);
-         extrude(x8, y8, x5, y5);
-     }
-
-     glEnd();
-
-     glEndList();
-     return list;
- }
-
- void G4OpenGLImmediateQtViewer::quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
-                     GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4)
- {
-     qglColor(trolltechGreen);
-
-     glVertex3d(x1, y1, -0.05);
-     glVertex3d(x2, y2, -0.05);
-     glVertex3d(x3, y3, -0.05);
-     glVertex3d(x4, y4, -0.05);
-
-     glVertex3d(x4, y4, +0.05);
-     glVertex3d(x3, y3, +0.05);
-     glVertex3d(x2, y2, +0.05);
-     glVertex3d(x1, y1, +0.05);
- }
-
- void G4OpenGLImmediateQtViewer::extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
- {
-     qglColor(trolltechGreen.dark(250 + int(100 * x1)));
-
-     glVertex3d(x1, y1, +0.05);
-     glVertex3d(x2, y2, +0.05);
-     glVertex3d(x2, y2, -0.05);
-     glVertex3d(x1, y1, -0.05);
- }
-
 #endif

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

@@ -152 +152 @@
 void G4OpenGLImmediateSceneHandler::ClearTransientStore () {
   G4VSceneHandler::ClearTransientStore ();
-
   // Make sure screen corresponds to graphical database...
   if (fpViewer) {