Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code cleanup: use const short for ndof axis args

Browse Source
This commit is contained in:
Campbell Barton
2014-02-15 18:35:48 +11:00
parent 004decc1d9
commit 6e54c87769
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/intern/GHOST_NDOFManager.cpp
View File

@@ -295,14 +295,14 @@ bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short produ
return m_deviceType != NDOF_UnknownDevice; return m_deviceType != NDOF_UnknownDevice;
} }
void GHOST_NDOFManager::updateTranslation(short t[3], GHOST_TUns64 time) void GHOST_NDOFManager::updateTranslation(const short t[3], GHOST_TUns64 time)
{ {
memcpy(m_translation, t, sizeof(m_translation)); memcpy(m_translation, t, sizeof(m_translation));
m_motionTime = time; m_motionTime = time;
m_motionEventPending = true; m_motionEventPending = true;
} }
void GHOST_NDOFManager::updateRotation(short r[3], GHOST_TUns64 time) void GHOST_NDOFManager::updateRotation(const short r[3], GHOST_TUns64 time)
{ {
memcpy(m_rotation, r, sizeof(m_rotation)); memcpy(m_rotation, r, sizeof(m_rotation));
m_motionTime = time; m_motionTime = time;

4
intern/ghost/intern/GHOST_NDOFManager.h
View File

@@ -128,8 +128,8 @@ public:
// rotations are + when CCW, - when CW // rotations are + when CCW, - when CW
// each platform is responsible for getting axis data into this form // each platform is responsible for getting axis data into this form
// these values should not be scaled (just shuffled or flipped) // these values should not be scaled (just shuffled or flipped)
void updateTranslation(short t[3], GHOST_TUns64 time); void updateTranslation(const short t[3], GHOST_TUns64 time);
void updateRotation(short r[3], GHOST_TUns64 time); void updateRotation(const short r[3], GHOST_TUns64 time);
// the latest raw button data from the device // the latest raw button data from the device
// use HID button encoding (not NDOF_ButtonT) // use HID button encoding (not NDOF_ButtonT)

4
intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
View File

@@ -79,8 +79,8 @@ static void NDOF_DeviceEvent(io_connect_t connection, natural_t messageType, voi
case kConnexionCmdHandleAxis: case kConnexionCmdHandleAxis:
{ {
// convert to blender view coordinates // convert to blender view coordinates
short t[3] = {s->axis[0], -(s->axis[2]), s->axis[1]}; const short t[3] = {s->axis[0], -(s->axis[2]), s->axis[1]};
short r[3] = {-(s->axis[3]), s->axis[5], -(s->axis[4])}; const short r[3] = {-(s->axis[3]), s->axis[5], -(s->axis[4])};
ndof_manager->updateTranslation(t, now); ndof_manager->updateTranslation(t, now);
ndof_manager->updateRotation(r, now); ndof_manager->updateRotation(r, now);

4
intern/ghost/intern/GHOST_NDOFManagerX11.cpp
View File

@@ -89,8 +89,8 @@ bool GHOST_NDOFManagerX11::processEvents()
{ {
/* convert to blender view coords */ /* convert to blender view coords */
GHOST_TUns64 now = m_system.getMilliSeconds(); GHOST_TUns64 now = m_system.getMilliSeconds();
short t[3] = {(short)e.motion.x, (short)e.motion.y, (short)-e.motion.z}; const short t[3] = {(short)e.motion.x, (short)e.motion.y, (short)-e.motion.z};
short r[3] = {(short)-e.motion.rx, (short)-e.motion.ry, (short)e.motion.rz}; const short r[3] = {(short)-e.motion.rx, (short)-e.motion.ry, (short)e.motion.rz};
updateTranslation(t, now); updateTranslation(t, now);
updateRotation(r, now); updateRotation(r, now);

10
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@@ -854,14 +854,14 @@ bool GHOST_SystemWin32::processNDOF(RAWINPUT const& raw)
{ {
case 1: // translation case 1: // translation
{ {
short *axis = (short *)(data + 1); const short *axis = (short *)(data + 1);
// massage into blender view coords (same goes for rotation) // massage into blender view coords (same goes for rotation)
short t[3] = {axis[0], -axis[2], axis[1]}; const short t[3] = {axis[0], -axis[2], axis[1]};
m_ndofManager->updateTranslation(t, now); m_ndofManager->updateTranslation(t, now);
if (raw.data.hid.dwSizeHid == 13) if (raw.data.hid.dwSizeHid == 13)
{ // this report also includes rotation { // this report also includes rotation
short r[3] = {-axis[3], axis[5], -axis[4]}; const short r[3] = {-axis[3], axis[5], -axis[4]};
m_ndofManager->updateRotation(r, now); m_ndofManager->updateRotation(r, now);
// I've never gotten one of these, has anyone else? // I've never gotten one of these, has anyone else?
@@ -871,8 +871,8 @@ bool GHOST_SystemWin32::processNDOF(RAWINPUT const& raw)
} }
case 2: // rotation case 2: // rotation
{ {
short *axis = (short *)(data + 1); const short *axis = (short *)(data + 1);
short r[3] = {-axis[0], axis[2], -axis[1]}; const short r[3] = {-axis[0], axis[2], -axis[1]};
m_ndofManager->updateRotation(r, now); m_ndofManager->updateRotation(r, now);
break; break;
} }