From 1ea62407debfa6b8df767282ebde268728bde1c4 Mon Sep 17 00:00:00 2001 From: Sreekanth Arikatla <sreekanth.arikatla@kitware.com> Date: Wed, 25 Jul 2018 09:58:56 -0400 Subject: [PATCH] STYLE: Enforce style --- .../ObjectControllerDummyClient.cpp | 16 ++++++++-------- Source/Devices/imstkDummyClient.cpp | 2 +- Source/Devices/imstkDummyClient.h | 9 +++------ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Examples/ObjectControllerDummyClient/ObjectControllerDummyClient.cpp b/Examples/ObjectControllerDummyClient/ObjectControllerDummyClient.cpp index 3d33e3972..c9172c2d5 100644 --- a/Examples/ObjectControllerDummyClient/ObjectControllerDummyClient.cpp +++ b/Examples/ObjectControllerDummyClient/ObjectControllerDummyClient.cpp @@ -57,14 +57,14 @@ int main() // Supply translation to dummy client frame auto translateFunc = [&client](Module* module) - { - Vec3d p = client->getPosition() + Vec3d(1.0e-4, 0, 0); - if (p.x() > 50.) { - p = Vec3d(0, 0, 0); - } - client->setPosition(p); - }; + Vec3d p = client->getPosition() + Vec3d(1.0e-4, 0, 0); + if (p.x() > 50.) + { + p = Vec3d(0, 0, 0); + } + client->setPosition(p); + }; sdk->getSceneManager(scene)->setPostUpdateCallback(translateFunc); // Update Camera position @@ -81,6 +81,6 @@ int main() // Run sdk->setActiveScene(scene); sdk->startSimulation(SimulationStatus::RUNNING); - + return 0; } diff --git a/Source/Devices/imstkDummyClient.cpp b/Source/Devices/imstkDummyClient.cpp index b55433671..fe055cc8c 100644 --- a/Source/Devices/imstkDummyClient.cpp +++ b/Source/Devices/imstkDummyClient.cpp @@ -27,7 +27,7 @@ namespace imstk { -void +void DummyClient::setButton(const unsigned int buttonId, const bool buttonStatus) { auto x = m_buttons.find(buttonId); diff --git a/Source/Devices/imstkDummyClient.h b/Source/Devices/imstkDummyClient.h index 47a05db76..7a3e998a5 100644 --- a/Source/Devices/imstkDummyClient.h +++ b/Source/Devices/imstkDummyClient.h @@ -26,7 +26,6 @@ namespace imstk { - /// /// \class Dummy client /// \brief Allows setting the pose of the device from external caller @@ -60,7 +59,7 @@ protected: public: /// /// \brief Set position - /// + /// void setPosition(const Vec3d& pos) { m_position = pos; }; /// @@ -76,8 +75,8 @@ public: /// /// \brief Set orientation from 4x4 transform /// - void setOrientation(double* transform) - { + void setOrientation(double* transform) + { m_orientation = (Eigen::Affine3d(Eigen::Matrix4d(transform))).rotation(); }; @@ -85,9 +84,7 @@ public: /// \brief Set the button status if it exists /// void setButton(const unsigned int buttonId, const bool buttonStatus); - }; } #endif // ifndef imstkDummyClient_h - -- GitLab