Skip to content
Snippets Groups Projects
Commit de093ccb authored by Andrew Maclean's avatar Andrew Maclean
Browse files

Merge branch 'FixOpenVRInit' into 'master'

Fix OpenVR initialization (fixes crash on VTK >= 9.1)

Closes vtk#18433

See merge request !290
parents 010c424c 6fd90fe2
No related branches found
No related tags found
1 merge request!290Fix OpenVR initialization (fixes crash on VTK >= 9.1)
......@@ -32,6 +32,7 @@ int main(int, char*[])
vtkSmartPointer<vtkOpenVRRenderer>::New();
vtkSmartPointer<vtkOpenVRRenderWindow> renderWindow =
vtkSmartPointer<vtkOpenVRRenderWindow>::New();
renderWindow->Initialize();
renderWindow->AddRenderer(renderer);
vtkSmartPointer<vtkOpenVRRenderWindowInteractor> renderWindowInteractor =
vtkSmartPointer<vtkOpenVRRenderWindowInteractor>::New();
......
......@@ -24,6 +24,7 @@ int main(int, char*[])
// Create a renderer, render window, and interactor
vtkNew<vtkOpenVRRenderer> renderer;
vtkNew<vtkOpenVRRenderWindow> renderWindow;
renderWindow->Initialize();
renderWindow->AddRenderer(renderer);
renderWindow->SetWindowName("OpenVRCube");
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;
......
......@@ -27,6 +27,7 @@ int main(int, char* argv[])
// Create a renderer, render window, and interactor
vtkNew<vtkOpenVRRenderer> renderer;
vtkNew<vtkOpenVRRenderWindow> renderWindow;
renderWindow->Initialize();
renderWindow->AddRenderer(renderer);
renderWindow->SetWindowName("OpenVRCylinder");
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;
......
......@@ -51,6 +51,7 @@ int main(int, char*[])
// Create a renderer, render window, and interactor
vtkNew<vtkOpenVRRenderer> renderer;
vtkNew<vtkOpenVRRenderWindow> renderWindow;
renderWindow->Initialize();
renderWindow->AddRenderer(renderer);
renderWindow->SetWindowName("OpenVRFrustum");
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;
......
......@@ -120,6 +120,7 @@ int main(int, char*[])
// Create a renderer, render window, and interactor
vtkNew<vtkOpenVRRenderer> renderer;
vtkNew<vtkOpenVRRenderWindow> renderWindow;
renderWindow->Initialize();
renderWindow->AddRenderer(renderer);
renderWindow->SetWindowName("OpenVROrientedArrow");
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;
......
......@@ -125,6 +125,7 @@ int main(int, char*[])
// Create a renderer, render window, and interactor
vtkNew<vtkOpenVRRenderer> renderer;
vtkNew<vtkOpenVRRenderWindow> renderWindow;
renderWindow->Initialize();
renderWindow->AddRenderer(renderer);
renderWindow->SetWindowName("OpenVROrientedCylinder");
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;
......
......@@ -27,6 +27,7 @@ int main(int, char*[])
// Create a Renderer, RenderWindow, RenderWindowInteractor
vtkSmartPointer<vtkOpenVRRenderer> renderer;
vtkSmartPointer<vtkOpenVRRenderWindow> renderWindow;
renderWindow->Initialize();
renderWindow->AddRenderer(renderer);
renderWindow->SetWindowName("OpenVRSphere");
vtkSmartPointer<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;
......
......@@ -48,6 +48,7 @@ int main(int /* argc */, char* /* argv */[])
// Create a renderer, render window, and interactor
vtkNew<vtkOpenVRRenderer> renderer;
vtkNew<vtkOpenVRRenderWindow> renderWindow;
renderWindow->Initialize();
renderWindow->AddRenderer(renderer);
renderWindow->SetWindowName("OpenVRTessellatedBoxSource");
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment