Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 08:04:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix bad casting syntax

Browse source 
- Reverse the casting that i added to stop warning, works on windows
but not on mac :(
This commit is contained in:
samcake 2014-07-11 11:35:42 -07:00
parent 4adbb19258
commit f4ebb175c6
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/devices/DeviceTracker.cpp
View file

@ -38,7 +38,7 @@ DeviceTracker* DeviceTracker::getDevice(const Name& name) {
}
DeviceTracker* DeviceTracker::getDevice(DeviceTracker::ID deviceID) {
if ((deviceID >= 0) && (unsigned int(deviceID) < Singleton::get()->_devicesVector.size())) {
if ((deviceID >= 0) && (deviceID < Singleton::get()->_devicesVector.size())) {
return Singleton::get()->_devicesVector[ deviceID ];
} else {
return NULL;

2
interface/src/devices/MotionTracker.cpp
View file

@ -106,7 +106,7 @@ void MotionTracker::updateAllAbsTransform() {
_jointsArray[0].updateAbsFromLocTransform(0);
// Because we know the hierarchy is stored from root down the branches let's just traverse and update
for (Index i = 1; unsigned int(i) < _jointsArray.size(); i++) {
for (Index i = 1; i < _jointsArray.size(); i++) {
JointTracker* joint = _jointsArray.data() + i;
joint->updateAbsFromLocTransform(_jointsArray.data() + joint->getParent());
}

4
interface/src/devices/MotionTracker.h
View file

@ -84,8 +84,8 @@ public:
/// Access a Joint from it's index.
/// Index 0 is always the "Root".
/// if the index is Invalid then returns NULL.
const JointTracker* getJointTracker(Index index) const { return ((index > 0) && (unsigned int(index) < _jointsArray.size())) ? _jointsArray.data() + index : NULL); }
JointTracker* editJointTracker(Index index) { return ((index > 0) && (unsigned int(index) < _jointsArray.size())) ? _jointsArray.data() + index : NULL); }
const JointTracker* getJointTracker(Index index) const { return ((index > 0) && (index < _jointsArray.size()) ? _jointsArray.data() + index : NULL); }
JointTracker* editJointTracker(Index index) { return ((index > 0) && (index < _jointsArray.size()) ? _jointsArray.data() + index : NULL); }
/// From a semantic, find the Index of the Joint.
/// \return the index of the mapped Joint or INVALID_SEMANTIC if the semantic is not knowned.