Skip to content

Commit de093cc

Browse files
committed
Merge branch 'FixOpenVRInit' into 'master'
Fix OpenVR initialization (fixes crash on VTK >= 9.1) Closes vtk#18433 See merge request vtk/vtk-examples!290
2 parents 010c424 + 6fd90fe commit de093cc

File tree

8 files changed

+8
-0
lines changed

8 files changed

+8
-0
lines changed

src/Cxx/GeometricObjects/OpenVRCone.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ int main(int, char*[])
3232
vtkSmartPointer<vtkOpenVRRenderer>::New();
3333
vtkSmartPointer<vtkOpenVRRenderWindow> renderWindow =
3434
vtkSmartPointer<vtkOpenVRRenderWindow>::New();
35+
renderWindow->Initialize();
3536
renderWindow->AddRenderer(renderer);
3637
vtkSmartPointer<vtkOpenVRRenderWindowInteractor> renderWindowInteractor =
3738
vtkSmartPointer<vtkOpenVRRenderWindowInteractor>::New();

src/Cxx/GeometricObjects/OpenVRCube.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ int main(int, char*[])
2424
// Create a renderer, render window, and interactor
2525
vtkNew<vtkOpenVRRenderer> renderer;
2626
vtkNew<vtkOpenVRRenderWindow> renderWindow;
27+
renderWindow->Initialize();
2728
renderWindow->AddRenderer(renderer);
2829
renderWindow->SetWindowName("OpenVRCube");
2930
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;

src/Cxx/GeometricObjects/OpenVRCylinder.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ int main(int, char* argv[])
2727
// Create a renderer, render window, and interactor
2828
vtkNew<vtkOpenVRRenderer> renderer;
2929
vtkNew<vtkOpenVRRenderWindow> renderWindow;
30+
renderWindow->Initialize();
3031
renderWindow->AddRenderer(renderer);
3132
renderWindow->SetWindowName("OpenVRCylinder");
3233
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;

src/Cxx/GeometricObjects/OpenVRFrustum.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ int main(int, char*[])
5151
// Create a renderer, render window, and interactor
5252
vtkNew<vtkOpenVRRenderer> renderer;
5353
vtkNew<vtkOpenVRRenderWindow> renderWindow;
54+
renderWindow->Initialize();
5455
renderWindow->AddRenderer(renderer);
5556
renderWindow->SetWindowName("OpenVRFrustum");
5657
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;

src/Cxx/GeometricObjects/OpenVROrientedArrow.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ int main(int, char*[])
120120
// Create a renderer, render window, and interactor
121121
vtkNew<vtkOpenVRRenderer> renderer;
122122
vtkNew<vtkOpenVRRenderWindow> renderWindow;
123+
renderWindow->Initialize();
123124
renderWindow->AddRenderer(renderer);
124125
renderWindow->SetWindowName("OpenVROrientedArrow");
125126
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;

src/Cxx/GeometricObjects/OpenVROrientedCylinder.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ int main(int, char*[])
125125
// Create a renderer, render window, and interactor
126126
vtkNew<vtkOpenVRRenderer> renderer;
127127
vtkNew<vtkOpenVRRenderWindow> renderWindow;
128+
renderWindow->Initialize();
128129
renderWindow->AddRenderer(renderer);
129130
renderWindow->SetWindowName("OpenVROrientedCylinder");
130131
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;

src/Cxx/GeometricObjects/OpenVRSphere.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ int main(int, char*[])
2727
// Create a Renderer, RenderWindow, RenderWindowInteractor
2828
vtkSmartPointer<vtkOpenVRRenderer> renderer;
2929
vtkSmartPointer<vtkOpenVRRenderWindow> renderWindow;
30+
renderWindow->Initialize();
3031
renderWindow->AddRenderer(renderer);
3132
renderWindow->SetWindowName("OpenVRSphere");
3233
vtkSmartPointer<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;

src/Cxx/GeometricObjects/OpenVRTessellatedBoxSource.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ int main(int /* argc */, char* /* argv */[])
4848
// Create a renderer, render window, and interactor
4949
vtkNew<vtkOpenVRRenderer> renderer;
5050
vtkNew<vtkOpenVRRenderWindow> renderWindow;
51+
renderWindow->Initialize();
5152
renderWindow->AddRenderer(renderer);
5253
renderWindow->SetWindowName("OpenVRTessellatedBoxSource");
5354
vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;

0 commit comments

Comments
 (0)