Merge branch 'HapticFixes' into 'master'
BUG: Fixed haptic examples See merge request iMSTK/iMSTK!506
Showing
- Examples/BoneShaving/BoneShavingExample.cpp 22 additions, 39 deletionsExamples/BoneShaving/BoneShavingExample.cpp
- Examples/CameraController/CameraControllerExample.cpp 28 additions, 47 deletionsExamples/CameraController/CameraControllerExample.cpp
- Examples/ObjectController/ObjectControllerExample.cpp 21 additions, 29 deletionsExamples/ObjectController/ObjectControllerExample.cpp
- Examples/RigidBodyVirtualCoupling/RigidBodyVirtualCouplingExample.cpp 110 additions, 128 deletions...idBodyVirtualCoupling/RigidBodyVirtualCouplingExample.cpp
- Examples/VirtualCoupling/VirtualCouplingExample.cpp 36 additions, 46 deletionsExamples/VirtualCoupling/VirtualCouplingExample.cpp
- Source/Controllers/imstkSceneObjectController.cpp 10 additions, 0 deletionsSource/Controllers/imstkSceneObjectController.cpp
- Source/Devices/imstkHapticDeviceClient.cpp 12 additions, 6 deletionsSource/Devices/imstkHapticDeviceClient.cpp
- Source/Devices/imstkHapticDeviceClient.h 2 additions, 2 deletionsSource/Devices/imstkHapticDeviceClient.h
- Source/SceneEntities/Objects/imstkFeDeformableObject.cpp 7 additions, 0 deletionsSource/SceneEntities/Objects/imstkFeDeformableObject.cpp
- Source/SceneEntities/Objects/imstkFeDeformableObject.h 1 addition, 1 deletionSource/SceneEntities/Objects/imstkFeDeformableObject.h
- Source/SceneEntities/Objects/imstkRigidObject.cpp 7 additions, 0 deletionsSource/SceneEntities/Objects/imstkRigidObject.cpp
- Source/SceneEntities/Objects/imstkRigidObject.h 1 addition, 1 deletionSource/SceneEntities/Objects/imstkRigidObject.h
- Source/SceneEntities/Objects/imstkRigidObject2.cpp 7 additions, 0 deletionsSource/SceneEntities/Objects/imstkRigidObject2.cpp
- Source/SceneEntities/Objects/imstkRigidObject2.h 1 addition, 1 deletionSource/SceneEntities/Objects/imstkRigidObject2.h
Loading
Please register or sign in to comment