REFAC: Switch to default adaptive stepping, remove unused includes

Examples/BoneShaving/BoneShavingExample.cpp

@@ -110,11 +110,11 @@ main()
     //Run the simulation
     {
         // Setup a viewer to render
-        imstkNew<VTKViewer> viewer("Viewer 1");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene
-        imstkNew<SceneManager> sceneManager("Scene Manager 1");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
 
         imstkNew<SimulationManager> driver;

Examples/CameraController/CameraControllerExample.cpp

@@ -24,7 +24,6 @@
 #include "imstkHapticDeviceClient.h"
 #include "imstkHapticDeviceManager.h"
 #include "imstkKeyboardSceneControl.h"
-#include "imstkLogger.h"
 #include "imstkMeshIO.h"
 #include "imstkMouseSceneControl.h"
 #include "imstkNew.h"
@@ -33,9 +32,9 @@
 #include "imstkSceneManager.h"
 #include "imstkSceneObject.h"
 #include "imstkSimulationManager.h"
+#include "imstkSpotLight.h"
 #include "imstkSurfaceMesh.h"
 #include "imstkVTKViewer.h"
-#include "imstkSpotLight.h"
 
 using namespace imstk;
 
@@ -91,13 +90,12 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
-        sceneManager->setExecutionType(Module::ExecutionType::ADAPTIVE);
 
         // attach the camera controller to the viewer
         viewer->addControl(camController);

Examples/CollisionDetection/BoxVsBoxMeshTest/BoxVsBoxMeshTestExample.cpp

@@ -97,12 +97,12 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
         std::dynamic_pointer_cast<VTKRenderer>(viewer->getActiveRenderer())->setAxesLength(0.05, 0.05, 0.05);
 
         // Setup a scene manager to advance the scene
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
         sceneManager->init();
         sceneManager->update();

Examples/CollisionDetection/OctreeIntersection/OctreeIntersectionExample.cpp

@@ -22,7 +22,6 @@
 #include "imstkCamera.h"
 #include "imstkDirectionalLight.h"
 #include "imstkKeyboardSceneControl.h"
-#include "imstkLogger.h"
 #include "imstkLooseOctree.h"
 #include "imstkMouseSceneControl.h"
 #include "imstkNew.h"
@@ -110,7 +109,7 @@ main()
     imstkNew<Scene> scene("Octree Example");
 
     // Setup a viewer to render in its own thread
-    imstkNew<VTKViewer> viewer("Viewer");
+    imstkNew<VTKViewer> viewer;
     viewer->setActiveScene(scene);
     viewer->setWindowTitle("Octree Example");
     viewer->setSize(1920, 1080);
@@ -253,9 +252,8 @@ main()
     // Run the simulation
     {
         // Setup a scene manager to advance the scene in its own thread
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
-        sceneManager->setExecutionType(SceneManager::ExecutionType::ADAPTIVE);
         sceneManager->pause(); // Start simulation paused
         connect<Event>(sceneManager, &SceneManager::postUpdate, updateFunc);
 

Examples/CollisionDetection/TriangleVsSphereTest/TriangleVsSphereTestExample.cpp

@@ -101,12 +101,12 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
         std::dynamic_pointer_cast<VTKRenderer>(viewer->getActiveRenderer())->setAxesLength(0.05, 0.05, 0.05);
 
         // Setup a scene manager to advance the scene
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
         sceneManager->init();
         sceneManager->update();

Examples/CollisionDetection/TriangleVsTriangleTest/TriangleVsTriangleTestExample.cpp

@@ -109,12 +109,12 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
         std::dynamic_pointer_cast<VTKRenderer>(viewer->getActiveRenderer())->setAxesLength(0.05, 0.05, 0.05);
 
         // Setup a scene manager to advance the scene
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
 
         sceneManager->init();

Examples/CreateEnclosingMesh/CreateEnclosingMesh.cpp

@@ -20,10 +20,9 @@
 =========================================================================*/
 
 #include "imstkCamera.h"
+#include "imstkDirectionalLight.h"
 #include "imstkGeometryUtilities.h"
 #include "imstkKeyboardSceneControl.h"
-#include "imstkDirectionalLight.h"
-#include "imstkLogger.h"
 #include "imstkMeshIO.h"
 #include "imstkMouseSceneControl.h"
 #include "imstkNew.h"
@@ -93,12 +92,12 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render in its own thread
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
         viewer->setBackgroundColors(Color(0.3285, 0.3285, 0.6525), Color(0.13836, 0.13836, 0.2748), true);
 
         // Setup a scene manager to advance the scene in its own thread
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
 
         imstkNew<SimulationManager> driver;

Examples/DebugRendering/DebugRenderingExample.cpp

@@ -26,13 +26,9 @@
 #include "imstkLogger.h"
 #include "imstkMouseSceneControl.h"
 #include "imstkNew.h"
-#include "imstkRenderMaterial.h"
 #include "imstkScene.h"
 #include "imstkSceneManager.h"
 #include "imstkSimulationManager.h"
-#include "imstkVisualModel.h"
-#include "imstkVTKRenderDelegate.h"
-#include "imstkVTKRenderer.h"
 #include "imstkVTKTextStatusManager.h"
 #include "imstkVTKViewer.h"
 
@@ -72,7 +68,7 @@ main()
     scene->getCamera("debug")->setPosition(0.0, 0.0, 50.0);
 
     // Setup a viewer to render in its own thread
-    imstkNew<VTKViewer> viewer("Viewer");
+    imstkNew<VTKViewer> viewer;
     viewer->setActiveScene(scene);
     viewer->setWindowTitle("Debug Rendering");
     viewer->setSize(1920, 1080);
@@ -144,9 +140,8 @@ main()
     // Run the simulation
     {
         // Setup a scene manager to advance the scene in its own thread
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
-        sceneManager->setExecutionType(Module::ExecutionType::ADAPTIVE);
         connect<Event>(sceneManager, &SceneManager::postUpdate, updateFunc);
 
         imstkNew<SimulationManager> driver;

Examples/DeformableBody/DeformableBodyExample.cpp

@@ -21,10 +21,10 @@
 
 #include "imstkBackwardEuler.h"
 #include "imstkCamera.h"
+#include "imstkDirectionalLight.h"
 #include "imstkFeDeformableObject.h"
 #include "imstkFEMDeformableBodyModel.h"
 #include "imstkKeyboardSceneControl.h"
-#include "imstkDirectionalLight.h"
 #include "imstkLogger.h"
 #include "imstkMeshIO.h"
 #include "imstkMouseSceneControl.h"
@@ -115,17 +115,18 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render in its own thread
-        imstkNew<VTKViewer> viewer("Viewer 1");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene in its own thread
-        imstkNew<SceneManager> sceneManager("Scene Manager 1");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
         sceneManager->pause();
 
         imstkNew<SimulationManager> driver;
         driver->addModule(viewer);
         driver->addModule(sceneManager);
+        driver->setDesiredDt(0.03);
 
         // Add mouse and keyboard controls to the viewer
         {
@@ -179,4 +180,4 @@ makeFEDeformableObject(std::shared_ptr<TetrahedralMesh> tetMesh)
     deformableObj->setDynamicalModel(dynaModel);
 
     return deformableObj;
-}
+}
\ No newline at end of file

Examples/FastMarch/FastMarchExample.cpp

@@ -89,13 +89,12 @@ main()
 
     // Run the simulation
     {
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene in its own thread
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
-        sceneManager->setExecutionType(Module::ExecutionType::ADAPTIVE);
 
         imstkNew<SimulationManager> driver;
         driver->addModule(viewer);

Examples/FemurCut/FemurCutExample.cpp

@@ -28,7 +28,6 @@
 #include "imstkLevelSetCH.h"
 #include "imstkLevelSetModel.h"
 #include "imstkDirectionalLight.h"
-#include "imstkLogger.h"
 #include "imstkMeshIO.h"
 #include "imstkMouseSceneControl.h"
 #include "imstkNew.h"
@@ -141,14 +140,13 @@ main()
     scene->getActiveCamera()->setViewUp(0.05, 0.86, -0.51);
 
     {
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setVtkLoggerMode(VTKViewer::VTKLoggerMode::MUTE);
         viewer->setActiveScene(scene);
 
         // Add a module to run the scene
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
-        sceneManager->setExecutionType(Module::ExecutionType::ADAPTIVE);
 
         imstkNew<HapticDeviceManager> hapticManager;
         hapticManager->setSleepDelay(0.5); // Delay for 1/2ms (haptics thread is limited to max 2000hz)

Examples/GeometryProcessing/GeometryProcessingExample.cpp

@@ -21,9 +21,8 @@
 
 #include "imstkCamera.h"
 #include "imstkDataArray.h"
-#include "imstkImageData.h"
 #include "imstkDirectionalLight.h"
-#include "imstkLogger.h"
+#include "imstkImageData.h"
 #include "imstkMeshIO.h"
 #include "imstkNew.h"
 #include "imstkQuadricDecimate.h"
@@ -51,6 +50,7 @@ main()
 
     // simManager and Scene
     imstkNew<Scene> scene("GeometryProcessing");
+    scene->getActiveCamera()->setPosition(Vec3d(0.0, 12.0, 12.0));
 
     auto                         coarseTetMesh  = MeshIO::read<TetrahedralMesh>(iMSTK_DATA_ROOT "/asianDragon/asianDragon.veg");
     std::shared_ptr<SurfaceMesh> coarseSurfMesh = coarseTetMesh->extractSurfaceMesh();
@@ -105,9 +105,6 @@ main()
     }
     scene->addSceneObject(sceneObj);
 
-    // Set Camera configuration
-    scene->getActiveCamera()->setPosition(Vec3d(0.0, 12.0, 12.0));
-
     // Light
     imstkNew<DirectionalLight> light;
     light->setFocalPoint(Vec3d(5.0, -8.0, -5.0));
@@ -117,11 +114,11 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render in its own thread
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene in its own thread
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
 
         imstkNew<SimulationManager> driver;

Examples/GeometryTransforms/GeometryTransformsExample.cpp

@@ -124,12 +124,11 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render in its own thread
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene in its own thread
-        imstkNew<SceneManager> sceneManager("Scene Manager");
-        sceneManager->setExecutionType(Module::ExecutionType::ADAPTIVE);
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
 
         imstkNew<SimulationManager> driver;

Examples/Levelset/levelsetExample.cpp

@@ -20,10 +20,10 @@
 =========================================================================*/
 
 #include "imstkCamera.h"
+#include "imstkDirectionalLight.h"
 #include "imstkKeyboardSceneControl.h"
 #include "imstkLevelSetDeformableObject.h"
 #include "imstkLevelSetModel.h"
-#include "imstkDirectionalLight.h"
 #include "imstkMeshIO.h"
 #include "imstkMouseSceneControl.h"
 #include "imstkNew.h"
@@ -105,7 +105,7 @@ main()
     Logger::startLogger();
 
     // Setup the scene
-    imstkNew<Scene> scene("Levelset");
+    imstkNew<Scene> scene("LevelsetScene");
     {
         std::shared_ptr<LevelSetDeformableObject> obj = makeLevelsetObj("DragonLevelset");
         scene->addSceneObject(obj);
@@ -123,19 +123,18 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render in its own thread
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene in its own thread
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
-        sceneManager->setExecutionType(Module::ExecutionType::ADAPTIVE);
         sceneManager->pause();
 
         imstkNew<SimulationManager> driver;
         driver->addModule(viewer);
         driver->addModule(sceneManager);
-        driver->setDesiredDt(0.015);
+        driver->setDesiredDt(0.01);
 
         // Add mouse and keyboard controls to the viewer
         {

Examples/MultipleScenes/CMakeLists.txt

-###########################################################################
-#
-# Copyright (c) Kitware, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0.txt
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-###########################################################################
-
-project(Example-MultipleScenes)
-
-#-----------------------------------------------------------------------------
-# Create executable
-#-----------------------------------------------------------------------------
-imstk_add_executable(${PROJECT_NAME} multipleScenes.cpp)
-
-#-----------------------------------------------------------------------------
-# Add the target to Examples folder
-#-----------------------------------------------------------------------------
-SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
-
-#-----------------------------------------------------------------------------
-# Link libraries to executable
-#-----------------------------------------------------------------------------
-target_link_libraries(${PROJECT_NAME} SimulationManager)

Examples/ObjectController/ObjectControllerExample.cpp

@@ -25,10 +25,8 @@
 #include "imstkCylinder.h"
 #include "imstkHapticDeviceClient.h"
 #include "imstkHapticDeviceManager.h"
-#include "imstkKeyboardDeviceClient.h"
 #include "imstkKeyboardSceneControl.h"
 #include "imstkDirectionalLight.h"
-#include "imstkLogger.h"
 #include "imstkMouseSceneControl.h"
 #include "imstkNew.h"
 #include "imstkOrientedBox.h"
@@ -89,13 +87,12 @@ main()
     //Run the simulation
     {
         // Setup a viewer to render
-        imstkNew<VTKViewer> viewer("Viewer 1");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene
-        imstkNew<SceneManager> sceneManager("Scene Manager 1");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
-        sceneManager->setExecutionType(Module::ExecutionType::ADAPTIVE);
 
         imstkNew<SimulationManager> driver;
         driver->addModule(viewer);

Examples/ObjectControllerDummyClient/ObjectCtrlDummyClientExample.cpp

@@ -22,8 +22,9 @@
 #include "imstkCamera.h"
 #include "imstkCollidingObject.h"
 #include "imstkDummyClient.h"
-#include "imstkDirectionalLight.h"
+#include "imstkKeyboardSceneControl.h"
 #include "imstkLogger.h"
+#include "imstkMouseSceneControl.h"
 #include "imstkNew.h"
 #include "imstkOrientedBox.h"
 #include "imstkScene.h"
@@ -45,10 +46,6 @@ main()
 
     imstkNew<Scene> scene("ObjectControllerDummyClient");
 
-    // Device Client
-    imstkNew<DummyClient> client("DummyClient");
-
-    // Object
     imstkNew<OrientedBox> geom(Vec3d(0.0, 1.0, 0.0), Vec3d(1.0, 1.0, 1.0));
 
     imstkNew<CollidingObject> object("VirtualObject");
@@ -56,49 +53,50 @@ main()
     object->setCollidingGeometry(geom);
     scene->addSceneObject(object);
 
-    imstkNew<SceneObjectController> controller(object, client);
-    controller->setTranslationScaling(0.1);
-    scene->addController(controller);
-
-    // Supply translation to dummy client frame
-    auto translateFunc =
-        [&client](Event*)
-        {
-            Vec3d p = client->getPosition() + Vec3d(1.0e-4, 0, 0);
-            if (p.x() > 50.)
-            {
-                p = Vec3d(0, 0, 0);
-            }
-            client->setPosition(p);
-        };
-
     // Update Camera position
     scene->getActiveCamera()->setPosition(0.0, 0.0, 10.0);
     scene->getActiveCamera()->setFocalPoint(geom->getPosition());
 
-    // Light
-    imstkNew<DirectionalLight> light;
-    light->setFocalPoint(Vec3d(5.0, -8.0, -5.0));
-    light->setIntensity(1.0);
-    scene->addLight("light", light);
+    // Device Client
+    imstkNew<DummyClient>           client("DummyClient");
+    imstkNew<SceneObjectController> controller(object, client);
+    scene->addController(controller);
 
     // Run the simulation
     {
         // Setup a viewer to render in its own thread
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene in its own thread
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
-        connect<Event>(sceneManager, &SceneManager::postUpdate, translateFunc);
+        double t = 0.0;
+        connect<Event>(sceneManager, &SceneManager::postUpdate,
+            [&](Event*)
+        {
+            t += sceneManager->getDt();
+            client->setPosition(Vec3d(cos(t) * 2.0, 0.0, 0.0));
+            });
 
         imstkNew<SimulationManager> driver;
         driver->addModule(viewer);
         driver->addModule(sceneManager);
 
+        // Add mouse and keyboard controls to the viewer
+        {
+            imstkNew<MouseSceneControl> mouseControl(viewer->getMouseDevice());
+            mouseControl->setSceneManager(sceneManager);
+            viewer->addControl(mouseControl);
+
+            imstkNew<KeyboardSceneControl> keyControl(viewer->getKeyboardDevice());
+            keyControl->setSceneManager(sceneManager);
+            keyControl->setModuleDriver(driver);
+            viewer->addControl(keyControl);
+        }
+
         driver->start();
     }
 
     return 0;
-}
+}
\ No newline at end of file

Examples/OpenVRController/OpenVRControllerExample.cpp

@@ -125,13 +125,12 @@ main()
 
     {
         // Add a module to run the viewer
-        imstkNew<VTKOpenVRViewer> viewer("VRViewer");
+        imstkNew<VTKOpenVRViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Add a module to run the scene
-        imstkNew<SceneManager> sceneManager("Scene Manager");
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
-        sceneManager->setExecutionType(Module::ExecutionType::ADAPTIVE);
 
         imstkNew<SimulationManager> driver;
         driver->addModule(viewer);

Examples/PBD/PBDCloth/pbdClothExample.cpp

@@ -23,8 +23,6 @@
 #include "imstkImageData.h"
 #include "imstkKeyboardDeviceClient.h"
 #include "imstkKeyboardSceneControl.h"
-#include "imstkDirectionalLight.h"
-#include "imstkLogger.h"
 #include "imstkMeshIO.h"
 #include "imstkMouseSceneControl.h"
 #include "imstkNew.h"
@@ -209,12 +207,11 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene
-        imstkNew<SceneManager> sceneManager("Scene Manager");
-        sceneManager->setExecutionType(Module::ExecutionType::ADAPTIVE);
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
         sceneManager->pause(); // Start simulation paused
 

Examples/PBD/PBDClothCollision/pbdClothCollisionExample.cpp

@@ -224,12 +224,11 @@ main()
     // Run the simulation
     {
         // Setup a viewer to render
-        imstkNew<VTKViewer> viewer("Viewer");
+        imstkNew<VTKViewer> viewer;
         viewer->setActiveScene(scene);
 
         // Setup a scene manager to advance the scene
-        imstkNew<SceneManager> sceneManager("Scene Manager");
-        sceneManager->setExecutionType(Module::ExecutionType::ADAPTIVE);
+        imstkNew<SceneManager> sceneManager;
         sceneManager->setActiveScene(scene);
         sceneManager->pause(); // Start simulation paused