Join modifications from branch OCC_debug_for_3_2_0b1

[modules/visu.git] / src / OBJECT / VISU_MeshAct.cxx

diff --git a/src/OBJECT/VISU_MeshAct.cxx b/src/OBJECT/VISU_MeshAct.cxx
index b6b812d9f569abfbc9a91fcdce4cde1dedfb733c..f93f9c6b9273fc2744877c179769998fc202c6e7 100644 (file)
--- a/src/OBJECT/VISU_MeshAct.cxx
+++ b/src/OBJECT/VISU_MeshAct.cxx
@@ -115,7 +115,7 @@ VISU_MeshAct
 
 void
 VISU_MeshAct
-::SetShrinkFactor(float theValue)
+::SetShrinkFactor(vtkFloatingPointType theValue)
 {
   Superclass::SetShrinkFactor(theValue);
 
@@ -149,12 +149,12 @@ VISU_MeshAct
 //----------------------------------------------------------------------------
 void
 VISU_MeshAct
-::SetOpacity(float theValue)
+::SetOpacity(vtkFloatingPointType theValue)
 {
   GetSurfaceProperty()->SetOpacity(theValue);
 }
 
-float
+vtkFloatingPointType
 VISU_MeshAct
 ::GetOpacity()
 {
@@ -164,12 +164,12 @@ VISU_MeshAct
 //----------------------------------------------------------------------------
 void
 VISU_MeshAct
-::SetLineWidth(float theLineWidth)
+::SetLineWidth(vtkFloatingPointType theLineWidth)
 {
   GetEdgeProperty()->SetLineWidth(theLineWidth);
 }
 
-float
+vtkFloatingPointType
 VISU_MeshAct::GetLineWidth()
 {
   return GetEdgeProperty()->GetLineWidth();
@@ -225,17 +225,23 @@ VISU_MeshAct
   using namespace SVTK::Representation;
   switch(GetRepresentation()){
   case Points : 
+    myNodeActor->SetAllocatedRenderTime(this->AllocatedRenderTime,ren);
     myNodeActor->RenderOpaqueGeometry(ren);
     break;
   case Wireframe : 
   case Insideframe : 
+    myEdgeActor->SetAllocatedRenderTime(this->AllocatedRenderTime,ren);
     myEdgeActor->RenderOpaqueGeometry(ren);
     break;
   case Surface : 
+    mySurfaceActor->SetAllocatedRenderTime(this->AllocatedRenderTime,ren);
     mySurfaceActor->RenderOpaqueGeometry(ren);
     break;
   case Surfaceframe : 
+    mySurfaceActor->SetAllocatedRenderTime(this->AllocatedRenderTime/2.0,ren);
     mySurfaceActor->RenderOpaqueGeometry(ren);
+
+    myEdgeActor->SetAllocatedRenderTime(this->AllocatedRenderTime/2.0,ren);
     myEdgeActor->RenderOpaqueGeometry(ren);
     break;
   }
@@ -253,17 +259,23 @@ VISU_MeshAct
   using namespace SVTK::Representation;
   switch(GetRepresentation()){
   case Points : 
+    myNodeActor->SetAllocatedRenderTime(this->AllocatedRenderTime,ren);
     myNodeActor->RenderTranslucentGeometry(ren);
     break;
   case Wireframe : 
   case Insideframe : 
+    myEdgeActor->SetAllocatedRenderTime(this->AllocatedRenderTime,ren);
     myEdgeActor->RenderTranslucentGeometry(ren);
     break;
   case Surface : 
+    mySurfaceActor->SetAllocatedRenderTime(this->AllocatedRenderTime,ren);
     mySurfaceActor->RenderTranslucentGeometry(ren);
     break;
   case Surfaceframe : 
+    mySurfaceActor->SetAllocatedRenderTime(this->AllocatedRenderTime,ren);
     mySurfaceActor->RenderTranslucentGeometry(ren);
+
+    myEdgeActor->SetAllocatedRenderTime(this->AllocatedRenderTime/2.0,ren);
     myEdgeActor->RenderTranslucentGeometry(ren);
     break;
   }