diff --git a/Source/Rendering/VTKRenderer/imstkVTKRenderer.h b/Source/Rendering/VTKRenderer/imstkVTKRenderer.h index 99868221a18399980496c509932ae8901e25d461..e07dbc5bfcf7b7d3ddb3ecbe1ca9084e8134f115 100644 --- a/Source/Rendering/VTKRenderer/imstkVTKRenderer.h +++ b/Source/Rendering/VTKRenderer/imstkVTKRenderer.h @@ -168,9 +168,9 @@ protected: std::vector<vtkOpenVRCameraPose> m_camPos; #endif - vtkSmartPointer<vtkChartXY> m_timeTableChart = nullptr; - vtkSmartPointer<vtkContextActor> m_timeTableChartActor = nullptr; - vtkSmartPointer<vtkTable> m_timeTable = nullptr; + vtkSmartPointer<vtkChartXY> m_timeTableChart; + vtkSmartPointer<vtkContextActor> m_timeTableChartActor; + vtkSmartPointer<vtkTable> m_timeTable; vtkPlotBar* m_timeTablePlot = nullptr; int m_timeTableIter = 0; }; diff --git a/Source/Scene/imstkScene.h b/Source/Scene/imstkScene.h index 749aca0adbd5b89e49f2ffcdf6804ced1ad4c35a..ea017f44cf1f7e285b18dbb69f5404b29a3debec 100644 --- a/Source/Scene/imstkScene.h +++ b/Source/Scene/imstkScene.h @@ -282,7 +282,8 @@ protected: NamedMap<Light> m_lightsMap; std::shared_ptr<IBLProbe> m_globalIBLProbe = nullptr; std::shared_ptr<Camera> m_camera = std::make_shared<Camera>(); - std::shared_ptr<CollisionGraph> m_collisionGraph = std::make_shared<CollisionGraph>(); + // std::shared_ptr<CollisionGraph> m_collisionGraph = std::make_shared<CollisionGraph>(); + std::shared_ptr<CollisionGraph> m_collisionGraph = nullptr; std::vector<std::shared_ptr<SceneObjectControllerBase>> m_objectControllers; ///> List of object controllers std::vector<std::shared_ptr<CameraController>> m_cameraControllers; ///> List of camera controllers std::unordered_map<std::string, std::thread> m_threadMap; ///> diff --git a/Source/SimulationManager/VTKRenderer/imstkVTKViewer.h b/Source/SimulationManager/VTKRenderer/imstkVTKViewer.h index 7873b600521f8e7d02523688f402b8a1017001df..0bb255069f5d61a3dbad29c0d3491f71270c5a81 100644 --- a/Source/SimulationManager/VTKRenderer/imstkVTKViewer.h +++ b/Source/SimulationManager/VTKRenderer/imstkVTKViewer.h @@ -115,7 +115,7 @@ protected: std::shared_ptr<VTKInteractorStyle> m_vtkInteractorStyle; bool m_enableVR; std::string m_windowName = "imstk"; - vtkSmartPointer<vtkCallbackCommand> timerCallbackCommand = nullptr; + vtkSmartPointer<vtkCallbackCommand> timerCallbackCommand; #ifdef iMSTK_ENABLE_VR vtkSmartPointer<OpenVRCommand> m_openVRCommand;