Commit 9e199a30 authored by Alexis Girault's avatar Alexis Girault

STYLE: Rename cameraController attribute to controller

parent 621038b5
......@@ -103,21 +103,21 @@ Camera::setViewAngle(const double& angle)
std::shared_ptr<CameraController>
Camera::getController() const
{
return m_cameraController;
return m_controller;
}
std::shared_ptr<CameraController>
Camera::setupController(std::shared_ptr<DeviceClient> deviceClient)
{
if(m_cameraController == nullptr)
if(m_controller == nullptr)
{
m_cameraController = std::make_shared<CameraController>(*this, deviceClient);
m_controller = std::make_shared<CameraController>(*this, deviceClient);
}
else
{
m_cameraController->setDeviceClient(deviceClient);
m_controller->setDeviceClient(deviceClient);
}
return m_cameraController;
return m_controller;
}
} // imstk
......@@ -114,7 +114,7 @@ public:
std::shared_ptr<CameraController> setupController(std::shared_ptr<DeviceClient> deviceClient);
protected:
std::shared_ptr<CameraController> m_cameraController; ///>
std::shared_ptr<CameraController> m_controller; ///>
Vec3d m_position = Vec3d(0,2,5); ///>
Vec3d m_focalPoint = WORLD_ORIGIN; ///>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment