Merge branch 'master' into 'FixOpenVRConeNew'

# Conflicts:
#   src/Cxx/GeometricObjects/OpenVRCone.cxx

Author: ajpmaclean

src/Cxx/GeometricObjects/OpenVRCube.cxx

@@ -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;

src/Cxx/GeometricObjects/OpenVRCylinder.cxx

@@ -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;

src/Cxx/GeometricObjects/OpenVRFrustum.cxx

@@ -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;

src/Cxx/GeometricObjects/OpenVROrientedArrow.cxx

@@ -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;

src/Cxx/GeometricObjects/OpenVROrientedCylinder.cxx

@@ -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;

src/Cxx/GeometricObjects/OpenVRSphere.cxx

@@ -11,25 +11,25 @@
 int main(int, char*[])
 {
   // Create a Sphere
-  vtkSmartPointer<vtkSphereSource> sphereSource;
+  vtkNew<vtkSphereSource> sphereSource;
   sphereSource->SetCenter(0.0, 0.0, 0.0);
   sphereSource->SetRadius(5.0);
 
   // Create a Mapper
-  vtkSmartPointer<vtkPolyDataMapper> mapper;
+  vtkNew<vtkPolyDataMapper> mapper;
   mapper->SetInputConnection(sphereSource->GetOutputPort());
 
   // Create an Actor
-  vtkSmartPointer<vtkNamedColors> colors;
-  vtkSmartPointer<vtkActor> actor;
+  vtkNew<vtkNamedColors> colors;
+  vtkNew<vtkActor> actor;
   actor->SetMapper(mapper);
 
   // Create a Renderer, RenderWindow, RenderWindowInteractor
-  vtkSmartPointer<vtkOpenVRRenderer> renderer;
-  vtkSmartPointer<vtkOpenVRRenderWindow> renderWindow;
+  vtkNew<vtkOpenVRRenderer> renderer;
+  vtkNew<vtkOpenVRRenderWindow> renderWindow;
   renderWindow->AddRenderer(renderer);
   renderWindow->SetWindowName("OpenVRSphere");
-  vtkSmartPointer<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;
+  vtkNew<vtkOpenVRRenderWindowInteractor> renderWindowInteractor;
   renderWindowInteractor->SetRenderWindow(renderWindow);
 
   // Add actor to the scene

src/Cxx/GeometricObjects/OpenVRTessellatedBoxSource.cxx

@@ -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;