Commit bd53b8f6 authored by David C. Lonie's avatar David C. Lonie

Update vtkExternalOpenGLCamera to use new explicit proj property.

parent fc820483
Pipeline #32992 passed with stage
......@@ -35,7 +35,6 @@ vtkStandardNewMacro(vtkExternalOpenGLCamera);
//----------------------------------------------------------------------------
vtkExternalOpenGLCamera::vtkExternalOpenGLCamera()
{
this->UserProvidedProjectionTransform = false;
this->UserProvidedViewTransform = false;
}
......@@ -226,25 +225,10 @@ void vtkExternalOpenGLCamera::SetProjectionTransformMatrix(
vtkMatrix4x4* matrix = vtkMatrix4x4::New();
matrix->DeepCopy(elements);
matrix->Transpose();
this->ProjectionTransform->SetMatrix(matrix);
this->UserProvidedProjectionTransform = true;
matrix->Delete();
}
//----------------------------------------------------------------------------
void vtkExternalOpenGLCamera::ComputeProjectionTransform(double aspect,
double nearz,
double farz)
{
if (this->UserProvidedProjectionTransform)
{
// Do not do anything
return;
}
else
{
this->Superclass::ComputeProjectionTransform(aspect, nearz, farz);
}
this->SetExplicitProjectionTransformMatrix(matrix);
this->SetUseExplicitProjectionTransformMatrix(true);
matrix->Delete();
}
//----------------------------------------------------------------------------
......
......@@ -55,14 +55,6 @@ protected:
vtkExternalOpenGLCamera();
~vtkExternalOpenGLCamera() {}
/**
* These methods should only be used within vtkCamera.cxx.
* Bypass computation if user provided the projection transform
*/
void ComputeProjectionTransform(double aspect,
double nearz,
double farz);
/**
* These methods should only be used within vtkCamera.cxx.
* Bypass computation if user provided the view transform
......@@ -70,7 +62,6 @@ protected:
void ComputeViewTransform();
private:
bool UserProvidedProjectionTransform;
bool UserProvidedViewTransform;
vtkExternalOpenGLCamera(const vtkExternalOpenGLCamera&) VTK_DELETE_FUNCTION;
......
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