Commit 792b6632 authored by Sankhesh Jhaveri's avatar Sankhesh Jhaveri

Fix AMR volume mapper for recent smartvolume mapper changes

parent e321b129
......@@ -249,16 +249,6 @@ int vtkAMRVolumeMapper::GetRequestedRenderMode()
return this->InternalMapper->GetRequestedRenderMode();
}
//----------------------------------------------------------------------------
void vtkAMRVolumeMapper::SetInteractiveUpdateRate(double rate)
{
this->InternalMapper->SetInteractiveUpdateRate(rate);
}
//----------------------------------------------------------------------------
double vtkAMRVolumeMapper::GetInteractiveUpdateRate()
{
return this->InternalMapper->GetInteractiveUpdateRate();
}
//----------------------------------------------------------------------------
void vtkAMRVolumeMapper::SetInterpolationMode(int mode)
{
this->InternalMapper->SetInterpolationMode(mode);
......@@ -279,8 +269,10 @@ void vtkAMRVolumeMapper::Render(vtkRenderer *ren, vtkVolume *vol)
// Hack - Make sure the camera is in the right mode for moving the focal point
ren->GetActiveCamera()->SetFreezeFocalPoint(this->FreezeFocalPoint);
// If there is no grid initially we need to see if we can create one
if (!(this->Grid && (ren->GetRenderWindow()->GetDesiredUpdateRate()
>= this->InternalMapper->GetInteractiveUpdateRate())))
// The grid is not created if it is an interactive render; meaning the desired
// time is less than the previous time to draw
if (!(this->Grid && (1.0 / ren->GetRenderWindow()->GetDesiredUpdateRate()
< this->InternalMapper->GetTimeToDraw())))
{
if (!this->HasMetaData)
{
......
......@@ -208,20 +208,6 @@ public:
vtkSetVector3Macro(NumberOfSamples,int);
vtkGetVector3Macro(NumberOfSamples,int);
// Description:
// Set the rate at or above this render will be considered interactive.
// If the DesiredUpdateRate of the vtkRenderWindow that caused the Render
// falls at or above this rate, the render is considered interactive and
// the mapper may be adjusted (depending on the render mode).
// Initial value is 1.0.
virtual void SetInteractiveUpdateRate(double rate);
// Description:
// Get the update rate at or above which this is considered an
// interactive render.
// Initial value is 1.0.
virtual double GetInteractiveUpdateRate();
//BTX
// Description:
// WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment