Skip to content
Snippets Groups Projects
Commit c47932fc authored by Andrew Wilson's avatar Andrew Wilson :elephant:
Browse files

STYLE: Uncrustify

parent 0ff0318f
No related branches found
No related tags found
No related merge requests found
......@@ -149,7 +149,7 @@ VTKOpenVRViewer::processEvents()
{
// Custom call to only process input events, do not perform a render
auto iren = vtkOpenVRRenderWindowInteractorImstk::SafeDownCast(m_vtkRenderWindow->GetInteractor());
auto ren = std::dynamic_pointer_cast<imstk::VTKRenderer>(getActiveRenderer());
auto ren = std::dynamic_pointer_cast<imstk::VTKRenderer>(getActiveRenderer());
iren->DoOneEvent(vtkOpenVRRenderWindow::SafeDownCast(m_vtkRenderWindow), ren->getVtkRenderer(), false);
// Update all controls
......
......@@ -79,7 +79,7 @@ public:
///
/// \brief VTKOpenVRViewer overrides to provide a non-rendering
/// event processing loop (to deal with vsync blockage)
///
///
void processEvents() override;
protected:
......
......@@ -25,8 +25,8 @@
#ifndef vtkOpenVRRenderWindowInteractorImstk_h
#define vtkOpenVRRenderWindowInteractorImstk_h
#include "vtkEventData.h" // for ivar
#include "vtkNew.h" // ivars
#include "vtkEventData.h" // for ivar
#include "vtkNew.h" // ivars
#include "vtkRenderWindowInteractor3D.h"
#include "vtkRenderingOpenVRModule.h" // For export macro
#include <functional> // for ivar
......@@ -63,8 +63,8 @@ public:
* provided as a means to control how an interactor is exited given
* the various language bindings (Win32, etc.).
*/
static void SetClassExitMethod(void (*f)(void*), void* arg);
static void SetClassExitMethodArgDelete(void (*f)(void*));
static void SetClassExitMethod(void (* f)(void*), void* arg);
static void SetClassExitMethodArgDelete(void (* f)(void*));
///@}
/**
......@@ -110,7 +110,7 @@ public:
* \param poseMatrixWorld Optional output pose matrix in world frame
*/
void ConvertOpenVRPoseToMatrices(const vr::TrackedDevicePose_t& tdPose,
vtkMatrix4x4* poseMatrixWorld, vtkMatrix4x4* poseMatrixPhysical = nullptr);
vtkMatrix4x4* poseMatrixWorld, vtkMatrix4x4* poseMatrixPhysical = nullptr);
/*
* Convert a device pose to a world coordinate position and orientation
......@@ -120,7 +120,7 @@ public:
* \param wdir Output world view direction (-Z)
*/
void ConvertPoseToWorldCoordinates(const vr::TrackedDevicePose_t& tdPose, double pos[3],
double wxyz[4], double ppos[3], double wdir[3]);
double wxyz[4], double ppos[3], double wdir[3]);
void ConvertPoseMatrixToWorldCoordinates(
const float poseMatrix[3][4], double pos[3], double wxyz[4], double ppos[3], double wdir[3]);
......@@ -128,12 +128,12 @@ public:
/**
* Get the latest touchpad or joystick position for a device
*/
// void GetTouchPadPosition(vtkEventDataDevice, vtkEventDataDeviceInput, float[3]) override;
///@}
// void GetTouchPadPosition(vtkEventDataDevice, vtkEventDataDeviceInput, float[3]) override;
///@}
/*
* Return starting physical to world matrix
*/
/*
* Return starting physical to world matrix
*/
void GetStartingPhysicalToWorldMatrix(vtkMatrix4x4* startingPhysicalToWorldMatrix);
///@{
......@@ -160,7 +160,7 @@ public:
*/
vtkGetMacro(ActionSetName, std::string);
vtkSetMacro(ActionSetName, std::string);
///@}
///@}
protected:
vtkOpenVRRenderWindowInteractorImstk();
......@@ -172,8 +172,8 @@ protected:
* (used to set different exit methods for various language bindings,
* i.e. java, Win32)
*/
static void (*ClassExitMethod)(void*);
static void (*ClassExitMethodArgDelete)(void*);
static void (* ClassExitMethod)(void*);
static void (* ClassExitMethodArgDelete)(void*);
static void* ClassExitMethodArg;
///@}
......@@ -212,7 +212,7 @@ protected:
vtkCommand::EventIds EventId;
std::function<void(vtkEventData*)> Function;
bool UseFunction = false;
bool IsAnalog = false;
bool IsAnalog = false;
};
std::map<std::string, ActionData> ActionMap;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment