diff --git a/Examples/DeformableBody/DeformableBodyExample.cpp b/Examples/DeformableBody/DeformableBodyExample.cpp index 5d9880ff630ecffc67b709aab6a7438991ef1b8c..4ac0406d7a1a2ff265e5fb17897ddc76ea4552aa 100644 --- a/Examples/DeformableBody/DeformableBodyExample.cpp +++ b/Examples/DeformableBody/DeformableBodyExample.cpp @@ -23,7 +23,7 @@ #include "imstkCamera.h" #include "imstkDirectionalLight.h" #include "imstkFeDeformableObject.h" -#include "imstkFEMDeformableBodyModel.h" +#include "imstkFemDeformableBodyModel.h" #include "imstkKeyboardSceneControl.h" #include "imstkLogger.h" #include "imstkMeshIO.h" diff --git a/Examples/SPH-Obj-SDF/SPH-Obj-SDFInteractionExample.cpp b/Examples/SPH-Obj-SDF/SPH-Obj-SDFInteractionExample.cpp index 5349a0d3a859a8281b3c1e901dadb54eb521f7ec..cbc92ef28d3d9001bd5ade44261b00f14a755275 100644 --- a/Examples/SPH-Obj-SDF/SPH-Obj-SDFInteractionExample.cpp +++ b/Examples/SPH-Obj-SDF/SPH-Obj-SDFInteractionExample.cpp @@ -30,8 +30,8 @@ #include "imstkSceneManager.h" #include "imstkSignedDistanceField.h" #include "imstkSimulationManager.h" -#include "imstkSPHModel.h" -#include "imstkSPHObject.h" +#include "imstkSphModel.h" +#include "imstkSphObject.h" #include "imstkSphObjectCollision.h" #include "imstkSurfaceMesh.h" #include "imstkSurfaceMeshDistanceTransform.h" diff --git a/Examples/SPHFluid/Fluid.hpp b/Examples/SPHFluid/Fluid.hpp index f777614b90496f50a03e512730546467ca910aae..3a3362f970e2ebf0d35d1db57f0073d69782e3b5 100644 --- a/Examples/SPHFluid/Fluid.hpp +++ b/Examples/SPHFluid/Fluid.hpp @@ -22,8 +22,8 @@ #include "imstkPointSet.h" #include "imstkRenderMaterial.h" #include "imstkScene.h" -#include "imstkSPHObject.h" -#include "imstkSPHModel.h" +#include "imstkSphObject.h" +#include "imstkSphModel.h" #include "imstkVisualModel.h" using namespace imstk; diff --git a/Examples/SPHFluid/SPHFluidExample.hpp b/Examples/SPHFluid/SPHFluidExample.hpp index 323fa09feb1ea45f79d751b638284f02929ecab5..72bc8e552ac412ef86f372ba5e64f78f2f3e3dfb 100644 --- a/Examples/SPHFluid/SPHFluidExample.hpp +++ b/Examples/SPHFluid/SPHFluidExample.hpp @@ -27,7 +27,7 @@ #include "imstkNew.h" #include "imstkSceneManager.h" #include "imstkSimulationManager.h" -#include "imstkSPHObject.h" +#include "imstkSphObject.h" #include "imstkSphObjectCollision.h" #include "imstkVTKTextStatusManager.h" #include "imstkVTKViewer.h" diff --git a/Examples/Vessel/vesselExample.cpp b/Examples/Vessel/vesselExample.cpp index 75e3e05033bef7b5cd5e439ea42743c5abdd6449..87b7dfde33cc9f62236006166cda7be592a1b130 100644 --- a/Examples/Vessel/vesselExample.cpp +++ b/Examples/Vessel/vesselExample.cpp @@ -31,8 +31,8 @@ #include "imstkSceneManager.h" #include "imstkSignedDistanceField.h" #include "imstkSimulationManager.h" -#include "imstkSPHModel.h" -#include "imstkSPHObject.h" +#include "imstkSphModel.h" +#include "imstkSphObject.h" #include "imstkSphObjectCollision.h" #include "imstkSurfaceMesh.h" #include "imstkSurfaceMeshDistanceTransform.h" diff --git a/Source/CollisionDetection/Testing/imstkSurfaceMeshToSphereCDTest.cpp b/Source/CollisionDetection/Testing/imstkSurfaceMeshToSphereCDTest.cpp index e34f3c8c07c771b51d377d3bc5833bcbbda7e976..61780706eb8041f18946009acf705543462f94fb 100644 --- a/Source/CollisionDetection/Testing/imstkSurfaceMeshToSphereCDTest.cpp +++ b/Source/CollisionDetection/Testing/imstkSurfaceMeshToSphereCDTest.cpp @@ -42,6 +42,7 @@ TEST(imstkSurfaceMeshToSphereCDTest, IntersectionTestAB_Vertex) (*indicesPtr)[0] = Vec3i(0, 1, 2); surfMesh->initialize(verticesPtr, indicesPtr); + // manually test for collision SurfaceMeshToSphereCD m_colDetect; m_colDetect.setInput(surfMesh, 0); m_colDetect.setInput(sphere, 1); diff --git a/Source/CollisionHandling/imstkPBDCollisionHandling.cpp b/Source/CollisionHandling/imstkPbdCollisionHandling.cpp similarity index 100% rename from Source/CollisionHandling/imstkPBDCollisionHandling.cpp rename to Source/CollisionHandling/imstkPbdCollisionHandling.cpp diff --git a/Source/CollisionHandling/imstkPBDCollisionHandling.h b/Source/CollisionHandling/imstkPbdCollisionHandling.h similarity index 100% rename from Source/CollisionHandling/imstkPBDCollisionHandling.h rename to Source/CollisionHandling/imstkPbdCollisionHandling.h diff --git a/Source/CollisionHandling/imstkPBDPickingCH.cpp b/Source/CollisionHandling/imstkPbdPickingCH.cpp similarity index 100% rename from Source/CollisionHandling/imstkPBDPickingCH.cpp rename to Source/CollisionHandling/imstkPbdPickingCH.cpp diff --git a/Source/CollisionHandling/imstkPBDPickingCH.h b/Source/CollisionHandling/imstkPbdPickingCH.h similarity index 100% rename from Source/CollisionHandling/imstkPBDPickingCH.h rename to Source/CollisionHandling/imstkPbdPickingCH.h diff --git a/Source/CollisionHandling/imstkPenaltyCH.cpp b/Source/CollisionHandling/imstkPenaltyCH.cpp index c413365942f0ff3bbd4ae7d99214ea6ea6197b31..0637068cf835fdf264a2baffbb462732b225c879 100644 --- a/Source/CollisionHandling/imstkPenaltyCH.cpp +++ b/Source/CollisionHandling/imstkPenaltyCH.cpp @@ -22,7 +22,7 @@ #include "imstkPenaltyCH.h" #include "imstkCollisionData.h" #include "imstkFeDeformableObject.h" -#include "imstkFEMDeformableBodyModel.h" +#include "imstkFemDeformableBodyModel.h" #include "imstkParallelUtils.h" #include "imstkRbdConstraint.h" #include "imstkRigidObject2.h" diff --git a/Source/CollisionHandling/imstkSPHCollisionHandling.cpp b/Source/CollisionHandling/imstkSphCollisionHandling.cpp similarity index 98% rename from Source/CollisionHandling/imstkSPHCollisionHandling.cpp rename to Source/CollisionHandling/imstkSphCollisionHandling.cpp index be14384092e5e154302de262c8e75e43a6d2803e..3e1fccf753b0f36e61f8f472e50e1784ab1d1930 100644 --- a/Source/CollisionHandling/imstkSPHCollisionHandling.cpp +++ b/Source/CollisionHandling/imstkSphCollisionHandling.cpp @@ -23,8 +23,8 @@ #include "imstkCollisionData.h" #include "imstkCollisionDetectionAlgorithm.h" #include "imstkParallelFor.h" -#include "imstkSPHModel.h" -#include "imstkSPHObject.h" +#include "imstkSphModel.h" +#include "imstkSphObject.h" namespace imstk { diff --git a/Source/CollisionHandling/imstkSPHCollisionHandling.h b/Source/CollisionHandling/imstkSphCollisionHandling.h similarity index 100% rename from Source/CollisionHandling/imstkSPHCollisionHandling.h rename to Source/CollisionHandling/imstkSphCollisionHandling.h diff --git a/Source/Constraint/PbdConstraints/imstkPbdFEMConstraint.cpp b/Source/Constraint/PbdConstraints/imstkPbdFemConstraint.cpp similarity index 100% rename from Source/Constraint/PbdConstraints/imstkPbdFEMConstraint.cpp rename to Source/Constraint/PbdConstraints/imstkPbdFemConstraint.cpp diff --git a/Source/Constraint/PbdConstraints/imstkPbdFEMConstraint.h b/Source/Constraint/PbdConstraints/imstkPbdFemConstraint.h similarity index 100% rename from Source/Constraint/PbdConstraints/imstkPbdFEMConstraint.h rename to Source/Constraint/PbdConstraints/imstkPbdFemConstraint.h diff --git a/Source/Constraint/PbdConstraints/imstkPbdFEMTetConstraint.h b/Source/Constraint/PbdConstraints/imstkPbdFemTetConstraint.h similarity index 100% rename from Source/Constraint/PbdConstraints/imstkPbdFEMTetConstraint.h rename to Source/Constraint/PbdConstraints/imstkPbdFemTetConstraint.h diff --git a/Source/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.cpp b/Source/DynamicalModels/InternalForceModel/imstkCorotationalFemForceModel.cpp similarity index 100% rename from Source/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.cpp rename to Source/DynamicalModels/InternalForceModel/imstkCorotationalFemForceModel.cpp diff --git a/Source/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.h b/Source/DynamicalModels/InternalForceModel/imstkCorotationalFemForceModel.h similarity index 100% rename from Source/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.h rename to Source/DynamicalModels/InternalForceModel/imstkCorotationalFemForceModel.h diff --git a/Source/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.cpp b/Source/DynamicalModels/InternalForceModel/imstkLinearFemForceModel.cpp similarity index 98% rename from Source/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.cpp rename to Source/DynamicalModels/InternalForceModel/imstkLinearFemForceModel.cpp index 4d2c3b85d36780677300d94a9aa7023bdc7827f3..4fc05732c43ef5620eeb7364604e9d864567d850 100644 --- a/Source/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.cpp +++ b/Source/DynamicalModels/InternalForceModel/imstkLinearFemForceModel.cpp @@ -19,7 +19,7 @@ =========================================================================*/ -#include "imstkLinearFEMForceModel.h" +#include "imstkLinearFemForceModel.h" #include "imstkMacros.h" diff --git a/Source/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.h b/Source/DynamicalModels/InternalForceModel/imstkLinearFemForceModel.h similarity index 100% rename from Source/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.h rename to Source/DynamicalModels/InternalForceModel/imstkLinearFemForceModel.h diff --git a/Source/DynamicalModels/ObjectModels/imstkFEMDeformableBodyModel.cpp b/Source/DynamicalModels/ObjectModels/imstkFemDeformableBodyModel.cpp similarity index 99% rename from Source/DynamicalModels/ObjectModels/imstkFEMDeformableBodyModel.cpp rename to Source/DynamicalModels/ObjectModels/imstkFemDeformableBodyModel.cpp index 03bf9f8997a7608eb0eb00fc7e0e191cacc2e481..8ef6c6c459bc7e868f32a6d488b0c0012d33b269 100644 --- a/Source/DynamicalModels/ObjectModels/imstkFEMDeformableBodyModel.cpp +++ b/Source/DynamicalModels/ObjectModels/imstkFemDeformableBodyModel.cpp @@ -19,7 +19,7 @@ =========================================================================*/ -#include "imstkFEMDeformableBodyModel.h" +#include "imstkFemDeformableBodyModel.h" #include "imstkConjugateGradient.h" #include "imstkCorotationalFemForceModel.h" #include "imstkIsotropicHyperelasticFeForceModel.h" diff --git a/Source/DynamicalModels/ObjectModels/imstkFEMDeformableBodyModel.h b/Source/DynamicalModels/ObjectModels/imstkFemDeformableBodyModel.h similarity index 100% rename from Source/DynamicalModels/ObjectModels/imstkFEMDeformableBodyModel.h rename to Source/DynamicalModels/ObjectModels/imstkFemDeformableBodyModel.h diff --git a/Source/DynamicalModels/ObjectModels/imstkPbdModel.h b/Source/DynamicalModels/ObjectModels/imstkPbdModel.h index 1b1eff2532327b114ce95cf256b20e88e23e1dae..87661d7fb40ad1b014aa6ae8a2c5a59dfc4282d7 100644 --- a/Source/DynamicalModels/ObjectModels/imstkPbdModel.h +++ b/Source/DynamicalModels/ObjectModels/imstkPbdModel.h @@ -23,7 +23,7 @@ #include "imstkDynamicalModel.h" #include "imstkPbdCollisionConstraint.h" -#include "imstkPbdFEMConstraint.h" +#include "imstkPbdFemConstraint.h" #include "imstkPbdState.h" #include <unordered_map> diff --git a/Source/DynamicalModels/ObjectModels/imstkSPHBoundaryConditions.cpp b/Source/DynamicalModels/ObjectModels/imstkSphBoundaryConditions.cpp similarity index 100% rename from Source/DynamicalModels/ObjectModels/imstkSPHBoundaryConditions.cpp rename to Source/DynamicalModels/ObjectModels/imstkSphBoundaryConditions.cpp diff --git a/Source/DynamicalModels/ObjectModels/imstkSPHBoundaryConditions.h b/Source/DynamicalModels/ObjectModels/imstkSphBoundaryConditions.h similarity index 100% rename from Source/DynamicalModels/ObjectModels/imstkSPHBoundaryConditions.h rename to Source/DynamicalModels/ObjectModels/imstkSphBoundaryConditions.h diff --git a/Source/DynamicalModels/ObjectModels/imstkSPHModel.cpp b/Source/DynamicalModels/ObjectModels/imstkSphModel.cpp similarity index 99% rename from Source/DynamicalModels/ObjectModels/imstkSPHModel.cpp rename to Source/DynamicalModels/ObjectModels/imstkSphModel.cpp index 88ea7113c63c0765b348d3060f2e4999c781cc80..e100f0dbfe968aedbd846d8b04d746363c91da3c 100644 --- a/Source/DynamicalModels/ObjectModels/imstkSPHModel.cpp +++ b/Source/DynamicalModels/ObjectModels/imstkSphModel.cpp @@ -19,7 +19,7 @@ limitations under the License. =========================================================================*/ -#include "imstkSPHModel.h" +#include "imstkSphModel.h" #include "imstkParallelUtils.h" #include "imstkPointSet.h" #include "imstkTaskGraph.h" diff --git a/Source/DynamicalModels/ObjectModels/imstkSPHModel.h b/Source/DynamicalModels/ObjectModels/imstkSphModel.h similarity index 99% rename from Source/DynamicalModels/ObjectModels/imstkSPHModel.h rename to Source/DynamicalModels/ObjectModels/imstkSphModel.h index 1dac759aa713bfc3c243cb6ee56c0e8f8c130e9f..b14180a978fe4d0c915fee8abf982ec9677f20b3 100644 --- a/Source/DynamicalModels/ObjectModels/imstkSPHModel.h +++ b/Source/DynamicalModels/ObjectModels/imstkSphModel.h @@ -22,10 +22,10 @@ #pragma once #include "imstkDynamicalModel.h" -#include "imstkSPHState.h" +#include "imstkSphState.h" #include "imstkSPHKernels.h" #include "imstkNeighborSearch.h" -#include "imstkSPHBoundaryConditions.h" +#include "imstkSphBoundaryConditions.h" namespace imstk { diff --git a/Source/DynamicalModels/ObjectStates/imstkSPHState.cpp b/Source/DynamicalModels/ObjectStates/imstkSphState.cpp similarity index 99% rename from Source/DynamicalModels/ObjectStates/imstkSPHState.cpp rename to Source/DynamicalModels/ObjectStates/imstkSphState.cpp index 36869cecfa381e8459b2954746e9dcbb78dfe5f8..6d0924d5b492d472685de513b4f79984e7375483 100644 --- a/Source/DynamicalModels/ObjectStates/imstkSPHState.cpp +++ b/Source/DynamicalModels/ObjectStates/imstkSphState.cpp @@ -19,7 +19,7 @@ =========================================================================*/ -#include "imstkSPHState.h" +#include "imstkSphState.h" #include "imstkLogger.h" #include "imstkVecDataArray.h" diff --git a/Source/DynamicalModels/ObjectStates/imstkSPHState.h b/Source/DynamicalModels/ObjectStates/imstkSphState.h similarity index 100% rename from Source/DynamicalModels/ObjectStates/imstkSPHState.h rename to Source/DynamicalModels/ObjectStates/imstkSphState.h diff --git a/Source/Geometry/Analytic/imstkCapsule.cpp b/Source/Geometry/Analytic/imstkCapsule.cpp index 763ba79d6716208a23a87cd2b920a50d663c66f6..6f6a7ddde85e0eaeef04c571eb25c6e91a1e9d1d 100644 --- a/Source/Geometry/Analytic/imstkCapsule.cpp +++ b/Source/Geometry/Analytic/imstkCapsule.cpp @@ -67,7 +67,7 @@ Capsule::getLength(DataType type /* = DataType::PostTransform */) void Capsule::setLength(const double l) { - CHECK(l > 0) << "Capsule::setHeight error: height should be positive."; + CHECK(l > 0) << "Capsule::setLength error: length should be positive."; m_length = l; m_transformApplied = false; diff --git a/Source/Geometry/Analytic/imstkCapsule.h b/Source/Geometry/Analytic/imstkCapsule.h index 2e67a25370ec5e31c56712129b64fd18e16f504d..988e6fefb77b4b578f37d6d339ae2ac899761d5c 100644 --- a/Source/Geometry/Analytic/imstkCapsule.h +++ b/Source/Geometry/Analytic/imstkCapsule.h @@ -28,7 +28,9 @@ namespace imstk /// /// \class Capsule /// -/// \brief Capsule geometry, default configuration is at origin with length running up the y axes +/// \brief Capsule geometry, default configuration is centered +/// at origin with length running up and down the y axes. +/// The length refers to the length of the cylinder. /// class Capsule : public AnalyticalGeometry { diff --git a/Source/MeshIO/imstkMSHMeshIO.cpp b/Source/MeshIO/imstkMshMeshIO.cpp similarity index 100% rename from Source/MeshIO/imstkMSHMeshIO.cpp rename to Source/MeshIO/imstkMshMeshIO.cpp diff --git a/Source/MeshIO/imstkMSHMeshIO.h b/Source/MeshIO/imstkMshMeshIO.h similarity index 100% rename from Source/MeshIO/imstkMSHMeshIO.h rename to Source/MeshIO/imstkMshMeshIO.h diff --git a/Source/Scene/imstkPbdRigidObjectCollision.cpp b/Source/Scene/imstkPbdRigidObjectCollision.cpp index c9d4644423c814a145fa49d1068067dc1bb9c7db..b83effb8620024b361df9ee3c493ee9f5f8a94f0 100644 --- a/Source/Scene/imstkPbdRigidObjectCollision.cpp +++ b/Source/Scene/imstkPbdRigidObjectCollision.cpp @@ -23,7 +23,7 @@ limitations under the License. #include "imstkCDObjectFactory.h" #include "imstkCollisionData.h" #include "imstkCollisionDetectionAlgorithm.h" -#include "imstkPBDCollisionHandling.h" +#include "imstkPbdCollisionHandling.h" #include "imstkPbdModel.h" #include "imstkPbdObject.h" #include "imstkPbdSolver.h" diff --git a/Source/Scene/imstkSphObjectCollision.cpp b/Source/Scene/imstkSphObjectCollision.cpp index 3cb127eaff8b2b10b953c587505940ea0f834a3c..338e3dd4490b96e33e55ed5eeb822ac4f532a168 100644 --- a/Source/Scene/imstkSphObjectCollision.cpp +++ b/Source/Scene/imstkSphObjectCollision.cpp @@ -23,9 +23,9 @@ limitations under the License. #include "imstkCDObjectFactory.h" #include "imstkCollisionData.h" #include "imstkImplicitGeometryToPointSetCD.h" -#include "imstkSPHCollisionHandling.h" -#include "imstkSPHModel.h" -#include "imstkSPHObject.h" +#include "imstkSphCollisionHandling.h" +#include "imstkSphModel.h" +#include "imstkSphObject.h" #include "imstkTaskGraph.h" namespace imstk diff --git a/Source/SceneEntities/Objects/imstkFeDeformableObject.cpp b/Source/SceneEntities/Objects/imstkFeDeformableObject.cpp index bd3951bb02d4a641ae8d1444c0d42a46132ec972..b4643c7142aa20349ee506dd637e2523bcfbd5aa 100644 --- a/Source/SceneEntities/Objects/imstkFeDeformableObject.cpp +++ b/Source/SceneEntities/Objects/imstkFeDeformableObject.cpp @@ -20,7 +20,7 @@ =========================================================================*/ #include "imstkFeDeformableObject.h" -#include "imstkFEMDeformableBodyModel.h" +#include "imstkFemDeformableBodyModel.h" #include "imstkLogger.h" namespace imstk diff --git a/Source/SceneEntities/Objects/imstkSPHObject.cpp b/Source/SceneEntities/Objects/imstkSphObject.cpp similarity index 96% rename from Source/SceneEntities/Objects/imstkSPHObject.cpp rename to Source/SceneEntities/Objects/imstkSphObject.cpp index 764870ad1214d777013bbe9fd0c54be86ba2b681..ed59a099bcc1861a963e59d741ba333336082ea1 100644 --- a/Source/SceneEntities/Objects/imstkSPHObject.cpp +++ b/Source/SceneEntities/Objects/imstkSphObject.cpp @@ -19,8 +19,8 @@ =========================================================================*/ -#include "imstkSPHObject.h" -#include "imstkSPHModel.h" +#include "imstkSphObject.h" +#include "imstkSphModel.h" namespace imstk { diff --git a/Source/SceneEntities/Objects/imstkSPHObject.h b/Source/SceneEntities/Objects/imstkSphObject.h similarity index 100% rename from Source/SceneEntities/Objects/imstkSPHObject.h rename to Source/SceneEntities/Objects/imstkSphObject.h diff --git a/Source/ViewerVTK/imstkVTKViewer.cpp b/Source/ViewerVTK/imstkVTKViewer.cpp index 8a00eda9218cbdde2266c4aab6145282d988e233..39a4b55e7ba628dc845e13aaf13ee9fbed27647d 100644 --- a/Source/ViewerVTK/imstkVTKViewer.cpp +++ b/Source/ViewerVTK/imstkVTKViewer.cpp @@ -63,7 +63,7 @@ VTKViewer::VTKViewer(std::string name) : AbstractVTKViewer(name), auto iren = vtkSmartPointer<vtkGenericRenderWindowInteractor>::New(); #else vtkSmartPointer<vtkXRenderWindowInteractor> iren = vtkSmartPointer<vtkXRenderWindowInteractor>::New(); - iren->SetInteractorStyle(m_vtkInteractorStyle.get()); + iren->SetInteractorStyle(m_vtkInteractorStyle.Get()); #endif #endif iren->SetInteractorStyle(m_vtkInteractorStyle);