Changeset 593 for trunk/geant4/visualization/OpenInventor/src/G4OpenInventorViewer.cc

Timestamp:

Nov 9, 2007, 3:32:25 PM (17 years ago)

Author:

garnier

Message:

r627@mac-90108: laurentgarnier | 2007-11-09 07:57:42 +0100
modif dans les includes directives

File:

• trunk/geant4/visualization/OpenInventor/src/G4OpenInventorViewer.cc (modified) (3 diffs)

trunk/geant4/visualization/OpenInventor/src/G4OpenInventorViewer.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4OpenInventorViewer.cc,v 1.57 2006/11/01 11:06:07 allison Exp $
-// GEANT4 tag $Name: geant4-08-02-patch-01 $
+// $Id: G4OpenInventorViewer.cc,v 1.59 2007/04/03 13:35:48 allison Exp $
+// GEANT4 tag $Name: geant4-09-00-ref-01 $
 
 #ifdef G4VIS_BUILD_OI_DRIVER
@@ -69 +69 @@
   fNeedKernelVisit = true;  //?? Temporary, until KernelVisitDecision fixed.
 
+  fVP.SetAutoRefresh(true);
   fDefaultVP.SetAutoRefresh(true);
-  fVP.SetAutoRefresh(true);
+  fVP.SetPicking(true);
+  fDefaultVP.SetPicking(true);
 
   //FIXME : G.Barrand : not convinced that we have to rm culling.
@@ -175 +177 @@
       (vp.GetNoOfSides ()       != fVP.GetNoOfSides ())       ||
       (vp.IsMarkerNotHidden ()  != fVP.IsMarkerNotHidden ())  ||
-      (vp.GetBackgroundColour ()!= fVP.GetBackgroundColour ())
-      ) {
-      return true;;
-  }
+      (vp.GetBackgroundColour ()!= fVP.GetBackgroundColour ())||
+      (vp.IsPicking ()          != fVP.IsPicking ())          ||
+      // Scaling for Open Inventor is done by the scene handler so it
+      // needs a kernel visit.  (In this respect, it differs from the
+      // OpenGL drivers, where it's done in SetView.)
+      (vp.GetScaleFactor ()     != fVP.GetScaleFactor ())
+      )
+    return true;
+
   if (vp.IsDensityCulling () &&
       (vp.GetVisibleDensity () != fVP.GetVisibleDensity ()))