Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 20:48:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removing compile warnings

Browse source
This commit is contained in:
Andrew Meadows 2014-03-14 16:12:32 -07:00
parent 37ae5142a6
commit ab84526a1b
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/Hand.cpp
View file

@ -206,8 +206,8 @@ void Hand::collideAgainstOurself() {
} }
// ignoring everything below the parent of the parent of the last free joint // ignoring everything below the parent of the parent of the last free joint
int skipIndex = skeletonModel.getParentJointIndex(skeletonModel.getParentJointIndex( int skipIndex = skeletonModel.getParentJointIndex(skeletonModel.getParentJointIndex(
skeletonModel.getLastFreeJointIndex((i == leftPalmIndex) ? skeletonModel.getLeftHandJointIndex() : skeletonModel.getLastFreeJointIndex(((int)i == leftPalmIndex) ? skeletonModel.getLeftHandJointIndex() :
(i == rightPalmIndex) ? skeletonModel.getRightHandJointIndex() : -1))); ((int)i == rightPalmIndex) ? skeletonModel.getRightHandJointIndex() : -1)));
handCollisions.clear(); handCollisions.clear();
if (_owningAvatar->findSphereCollisions(palm.getPosition(), scaledPalmRadius, handCollisions, skipIndex)) { if (_owningAvatar->findSphereCollisions(palm.getPosition(), scaledPalmRadius, handCollisions, skipIndex)) {

6
interface/src/ui/BandwidthDialog.cpp
View file

@ -29,7 +29,7 @@ BandwidthDialog::BandwidthDialog(QWidget* parent, BandwidthMeter* model) :
this->QDialog::setLayout(form); this->QDialog::setLayout(form);
// Setup labels // Setup labels
for (int i = 0; i < BandwidthMeter::N_STREAMS; ++i) { for (size_t i = 0; i < BandwidthMeter::N_STREAMS; ++i) {
bool input = i % 2 == 0; bool input = i % 2 == 0;
BandwidthMeter::ChannelInfo& ch = _model->channelInfo(BandwidthMeter::ChannelIndex(i / 2)); BandwidthMeter::ChannelInfo& ch = _model->channelInfo(BandwidthMeter::ChannelIndex(i / 2));
QLabel* label = _labels[i] = new QLabel(); QLabel* label = _labels[i] = new QLabel();
@ -48,7 +48,7 @@ BandwidthDialog::BandwidthDialog(QWidget* parent, BandwidthMeter* model) :
} }
BandwidthDialog::~BandwidthDialog() { BandwidthDialog::~BandwidthDialog() {
for (int i = 0; i < BandwidthMeter::N_STREAMS; ++i) { for (size_t i = 0; i < BandwidthMeter::N_STREAMS; ++i) {
delete _labels[i]; delete _labels[i];
} }
} }
@ -57,7 +57,7 @@ void BandwidthDialog::paintEvent(QPaintEvent* event) {
// Update labels // Update labels
char strBuf[64]; char strBuf[64];
for (int i = 0; i < BandwidthMeter::N_STREAMS; ++i) { for (size_t i = 0; i < BandwidthMeter::N_STREAMS; ++i) {
BandwidthMeter::ChannelIndex chIdx = BandwidthMeter::ChannelIndex(i / 2); BandwidthMeter::ChannelIndex chIdx = BandwidthMeter::ChannelIndex(i / 2);
bool input = i % 2 == 0; bool input = i % 2 == 0;
BandwidthMeter::ChannelInfo& ch = _model->channelInfo(chIdx); BandwidthMeter::ChannelInfo& ch = _model->channelInfo(chIdx);

2
interface/src/ui/LocalVoxelsOverlay.cpp
View file

@ -41,7 +41,7 @@ void LocalVoxelsOverlay::update(float deltatime) {
} }
_tree->lockForRead(); _tree->lockForRead();
if (_visible && _voxelCount != _tree->getOctreeElementsCount()) { if (_visible && _voxelCount != (int)_tree->getOctreeElementsCount()) {
_voxelCount = _tree->getOctreeElementsCount(); _voxelCount = _tree->getOctreeElementsCount();
_voxelSystem->forceRedrawEntireTree(); _voxelSystem->forceRedrawEntireTree();
} }

2
libraries/octree/src/OctreeSceneStats.cpp
View file

@ -925,7 +925,7 @@ void OctreeSceneStats::trackIncomingOctreePacket(const QByteArray& packet,
qDebug() << "(_incomingLastSequence - MAX_MISSING_SEQUENCE_OLD_AGE):" qDebug() << "(_incomingLastSequence - MAX_MISSING_SEQUENCE_OLD_AGE):"
<< (_incomingLastSequence - MAX_MISSING_SEQUENCE_OLD_AGE); << (_incomingLastSequence - MAX_MISSING_SEQUENCE_OLD_AGE);
} }
if (missingItem <= std::max(0, (_incomingLastSequence - MAX_MISSING_SEQUENCE_OLD_AGE))) { if (missingItem <= (unsigned int)std::max(0, (int)_incomingLastSequence - (int)MAX_MISSING_SEQUENCE_OLD_AGE)) {
if (wantExtraDebugging) { if (wantExtraDebugging) {
qDebug() << "pruning really old missing sequence:" << missingItem; qDebug() << "pruning really old missing sequence:" << missingItem;
} }

2
tests/physics/src/ShapeColliderTests.cpp
View file

@ -174,7 +174,7 @@ void ShapeColliderTests::sphereMissesCapsule() {
CapsuleShape capsuleB(radiusB, halfHeightB); CapsuleShape capsuleB(radiusB, halfHeightB);
// give the capsule some arbirary transform // give the capsule some arbirary transform
float angle = 37.8; float angle = 37.8f;
glm::vec3 axis = glm::normalize( glm::vec3(-7.f, 2.8f, 9.3f) ); glm::vec3 axis = glm::normalize( glm::vec3(-7.f, 2.8f, 9.3f) );
glm::quat rotation = glm::angleAxis(angle, axis); glm::quat rotation = glm::angleAxis(angle, axis);
glm::vec3 translation(15.1f, -27.1f, -38.6f); glm::vec3 translation(15.1f, -27.1f, -38.6f);