Changeset 341

Timestamp:

Apr 20, 2007, 9:32:23 AM (17 years ago)

Author:

barrand

Message:

 

File:

• MEMPHYS/HEAD/applications/HitsCollectionAccessor.cxx (modified) (6 diffs)

MEMPHYS/HEAD/applications/HitsCollectionAccessor.cxx

@@ -8 +8 @@
 #include <Inventor/nodes/SoDrawStyle.h>
 
-//#include <Inventor/nodes/SoCube.h> //FIXME
-//#include <Inventor/nodes/SoCylinder.h> //JEC 27/1/06 FIXME
-
 // HEPVis :
 #include <HEPVis/SbPolyhedron.h>
 #include <HEPVis/misc/SoStyleCache.h>
+#include <HEPVis/misc/SoTools.h>
 #include <HEPVis/nodes/SoHighlightMaterial.h>
-#include <HEPVis/nodes/SoPolyhedron.h>
 
 #ifdef WIN32
@@ -34 +31 @@
 MEMPHYS::HitsCollectionAccessor::HitsCollectionAccessor(
  Slash::Core::ISession& aSession
+,G4RunManager* aRunManager
 ,const std::string& aHC
 )
-:G4Lab::HitsCollectionAccessor(aSession,aHC)
+:G4Lab::HitsCollectionAccessor(aSession,aRunManager,aHC)
 //////////////////////////////////////////////////////////////////////////////
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
@@ -69 +67 @@
   separator->setName("sceneGraph");
       
- {G4Colour color;
+ {SoStyleCache* styleCache = fSoGC.getStyleCache();
+  G4Colour color;
   if(hitColor(*obj,color)) {
     SbColor sbColor((float)color.GetRed(),
@@ -75 +74 @@
                     (float)color.GetBlue());
     float transp = 1.0F - (float)color.GetAlpha();
-    SoStyleCache* styleCache = fSoGC.getStyleCache();
+    //SbColor sbColor(1,0,0);
+    //float transp = 0;
+
     separator->addChild(
       styleCache->getHighlightMaterial
@@ -83 +84 @@
   }
   separator->addChild(fSoGC.getDrawStyle());
-  separator->addChild(fSoGC.getLightModel());}
+  //separator->addChild(fSoGC.getLightModel());
+  // Enforce base color (then suppress light effects) :
+  separator->addChild(styleCache->getLightModelBaseColor());
+  }
 
  {SoTransform* transform = new SoTransform;
@@ -103 +107 @@
 
   //FIXME : PM base size :
-//   double WCPMTRadius           = 0.10*m;  // 20-cm PMTs (8-inch)
+  //double WCPMTRadius           = 0.10*m;  // 20-cm PMTs (8-inch)
   //JEC 27/1/06 double WCPMTRadius           = 0.10*m;  // 20-cm PMTs (8-inch)
-  double WCPMTRadius           = 0.15*m;  // PMTs (12-inch)
+  float WCPMTRadius = 0.15F*m;  // PMTs (12-inch)
 
-  /*
-  SoCylinder* soPMT = new SoCylinder;
-  soPMT->radius.setValue(WCPMTRadius);
-  soPMT->height.setValue(WCPMTRadius);
-  //JEC what's SoCylinder parts?
-  separator->addChild(soPMT);
-  */
+  SbVec3f normal(0,0,1);
 
-  SbPolyhedronTube sbTube(0,WCPMTRadius,WCPMTRadius/2);
-  SoPolyhedron* soPMT = new SoPolyhedron(sbTube);
-  soPMT->setName(name);
-  //soPMT->radius.setValue(WCPMTRadius);
-  //soPMT->height.setValue(WCPMTRadius);
-  //JEC what's SoCylinder parts?
-  soPMT->setName(name);
-  separator->addChild(soPMT);
+  // half size :
+  float h = WCPMTRadius;
 
+  SbVec3f line[5];
+  line[0].setValue(+h,-h,0);
+  line[1].setValue(+h,+h,0);
+  line[2].setValue(-h,+h,0);
+  line[3].setValue(-h,-h,0);
+  line[4].setValue(+h,-h,0);
+  SoTools::addPolygonToNode(separator,4,line,normal,"");
 
-//   SoCube* soCube = new SoCube;
-//   soCube->width.setValue(WCPMTRadius);
-//   soCube->height.setValue(WCPMTRadius);
-//   soCube->depth.setValue(WCPMTRadius);
-//   soCube->setName(name);
-        
-//   separator->addChild(soCube);
-          
   fSoRegion->doIt(SbAddNode(separator,"dynamicScene"));
 }