Changeset 800

Timestamp:

May 15, 2008, 6:52:17 PM (16 years ago)

Author:

garnier

Message:

r838@wl-72126: garnier | 2008-05-15 18:52:11 +0200
en test avec les glRotation

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtViewer.hh (modified) (3 diffs)
• src/G4OpenGLQtViewer.cc (modified) (8 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (1 diff)
• src/G4OpenGLViewer.cc (modified) (1 diff)

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

@@ -71 +71 @@
   virtual ~G4OpenGLQtViewer ();
   void SetView ();
+  void ClearView ();
   void ShowView ();
   virtual void updateQWidget()=0;
@@ -118 +119 @@
   void savePPMToTemp();
   int fRecordFrameNumber;
+  float fRotationAngleX;
+  float fRotationAngleY;
+  float fRotationAngleZ;
 
 private:
@@ -187 +191 @@
   int fSpinningDelay;
   int fLaunchSpinDelay;
+  float fDeltaRotationAngleX;
+  float fDeltaRotationAngleY;
+  float fDeltaRotationAngleZ;
 
 private slots :

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

@@ -40 +40 @@
 #include "G4OpenGLQtViewer.hh"
 
+#include <cmath>
 #include "G4ios.hh"
 #include "G4VisExtent.hh"
@@ -93 +94 @@
   //  fWindow->makeCurrent();
   G4OpenGLViewer::SetView ();
+}
+
+void G4OpenGLQtViewer::ClearView (
+) 
+//////////////////////////////////////////////////////////////////////////////
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
+  G4OpenGLViewer::ClearView ();
+  //  glLoadIdentity();
+  glRotatef(fRotationAngleX, 1.0, 0.0, 0.0);
+  glRotatef(fRotationAngleY, 0.0, 1.0, 0.0);
+  glRotatef(fRotationAngleZ, 0.0, 0.0, 1.0);
+  fRotationAngleZ +=fDeltaRotationAngleZ;
+  fRotationAngleY +=fDeltaRotationAngleY;
+  fRotationAngleX +=fDeltaRotationAngleX;
 }
 
@@ -304 +320 @@
   ,fProcess(NULL)
   ,fLaunchSpinDelay(100)
+  ,fRotationAngleX(0)
+  ,fRotationAngleY(0)
+  ,fDeltaRotationAngleX(0)
+  ,fDeltaRotationAngleY(0)
 {
 
@@ -1545 +1565 @@
     int cycles = 4;
     while (fAutoMove) {
-      if ( lastMoveTime.elapsed() > (fSpinningDelay / (cycles/2))) {
+      //      if ( lastMoveTime.elapsed() > (fSpinningDelay / (cycles/2))) {
         if (fMouseAction == STYLE1) {  // rotate
           rotateQtScene(((float)delta.x())/cycles,((float)delta.y())/cycles);
@@ -1553 +1573 @@
         lastMoveTime.start();
         cycles = 1 ;
-      }
+        //      }
       ((QApplication*)G4Qt::getInstance ())->processEvents();
+#ifdef GEANT4_QT_DEBUG
+        printf("G4OpenGLQtViewer::mouseRealease() cycle :%d \n",lastMoveTime.elapsed());
+#endif
       cycles ++ ;
     }
@@ -1582 +1605 @@
   fLastPos2 = fLastPos1;
   fLastPos1 = QPoint(pos_x, pos_y);
-  
+  int deltaX = fLastPos2.x()-fLastPos1.x();
+  int deltaY = fLastPos2.y()-fLastPos1.y();
+
+  // try to get the x,y mouve into user friendly rotation
+
+  float cox = std::cos ((fRotationAngleX*M_PI)/180);
+  float coy = std::cos ((fRotationAngleY*M_PI)/180);
+  float coz = 1;
+  float six = std::sin ((fRotationAngleX*M_PI)/180);
+  float siy = std::sin ((fRotationAngleY*M_PI)/180);
+  float siz = 0;
+
+  float dx = coy*(siz*deltaY+coz*deltaX);
+  float dy = six*(siy*(siz*deltaY+coz*deltaX))+cox*(coz*deltaY-siz*deltaX);
+  float dz = cox*(siy*(siz*deltaY+coz*deltaX))-six*(coz*deltaY-siz*deltaX);
+  
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::MouseMove %d,%d Rot:%f,%f new : %f %f %f\n",deltaX,deltaY,fRotationAngleX,fRotationAngleY,dx,dy,dz);
+#endif
   if (fMouseAction == STYLE1) {  // rotate
     if (mButtons & Qt::LeftButton) {
@@ -1641 +1682 @@
     return;
   fHoldRotateEvent = true;
-
-  rotateScene(dx,0,fDeltaRotation);
-  rotateScene(0,dy,fDeltaRotation);
+  fDeltaRotationAngleX = dx;
+  fDeltaRotationAngleY = dy;
+  //  rotateScene(dx,0,fDeltaRotation);
+  //  rotateScene(0,dy,fDeltaRotation);
+
   updateQWidget();
   
@@ -1660 +1703 @@
   fHoldRotateEvent = true;
 
-  rotateScene(dx,dy,fDeltaRotation);
+  fDeltaRotationAngleX = dx;
+  fDeltaRotationAngleY = dy;
+
+  float cox = std::cos ((fRotationAngleX*M_PI)/180);
+  float coy = std::cos ((fRotationAngleY*M_PI)/180);
+  float coz = 1;
+  float six = std::sin ((fRotationAngleX*M_PI)/180);
+  float siy = std::sin ((fRotationAngleY*M_PI)/180);
+  float siz = 0;
+
+  float dx2 = coy*(siz*dy+coz*dx);
+  float dy2 = six*(siy*(siz*dy+coz*dx))+cox*(coz*dy-siz*dx);
+  float dz2 = cox*(siy*(siz*dy+coz*dx))-six*(coz*dy-siz*dx);
+  
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::MouseMove %f,%f Rot:%f,%f new : %f %f %f\n",dx,dy,fRotationAngleX,fRotationAngleY,dx2,dy2,dz2);
+#endif
+
+  fDeltaRotationAngleX = dx2;
+  fDeltaRotationAngleY = dy2;
+  fDeltaRotationAngleZ = dz2;
+
+  //  rotateScene(dx,dy,fDeltaRotation);
   updateQWidget();
   

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

@@ -122 +122 @@
 
 #ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::setupViewport\n");
+#endif
+#ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLStoredQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
 #endif

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

@@ -934 +934 @@
   } else {
 #ifdef GEANT4_QT_DEBUG
-    printf("G4OpenGLViewer:: %f %f %f - %f %f %f \n",up.x(),up.y(),up.z(),new_vp.x(),new_vp.y(),new_vp.z());
+    //    printf("G4OpenGLViewer:: %f %f %f - %f %f %f \n",up.x(),up.y(),up.z(),new_vp.x(),new_vp.y(),new_vp.z());
 #endif
     new_up = up;
     if (new_vp.z()*vp.z() <0) {
 #ifdef GEANT4_QT_DEBUG
-      printf("G4OpenGLViewer:: ***********************************************************\n");
+      //      printf("G4OpenGLViewer:: ***********************************************************\n");
 #endif
       new_up.set(new_up.x(),-new_up.y(),new_up.z());