From 552efa3e91e068baee70ce46fdef494110adb551 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 25 Jun 2014 09:01:49 -0700 Subject: [PATCH 1/7] remove warning: unused variables --- libraries/shared/src/PhysicsSimulation.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/libraries/shared/src/PhysicsSimulation.cpp b/libraries/shared/src/PhysicsSimulation.cpp index 637a5e955c..e2f95a213c 100644 --- a/libraries/shared/src/PhysicsSimulation.cpp +++ b/libraries/shared/src/PhysicsSimulation.cpp @@ -24,9 +24,6 @@ int MAX_ENTITIES_PER_SIMULATION = 64; int MAX_COLLISIONS_PER_SIMULATION = 256; -const int NUM_SHAPE_BITS = 6; -const int SHAPE_INDEX_MASK = (1 << (NUM_SHAPE_BITS + 1)) - 1; - PhysicsSimulation::PhysicsSimulation() : _collisionList(MAX_COLLISIONS_PER_SIMULATION), _numIterations(0), _numCollisions(0), _constraintError(0.0f), _stepTime(0) { } From d3d8e4dc2d07866905b53c786298337b359c3f79 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 25 Jun 2014 09:07:10 -0700 Subject: [PATCH 2/7] fix warnings about signed/unsigned comparisons --- interface/src/Audio.cpp | 2 +- libraries/audio/src/AudioRingBuffer.cpp | 18 +++++++++--------- libraries/audio/src/AudioRingBuffer.h | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 65912f83e8..07f38eee20 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -427,7 +427,7 @@ void Audio::handleAudioInput() { float inputToNetworkInputRatio = calculateDeviceToNetworkInputRatio(_numInputCallbackBytes); - unsigned int inputSamplesRequired = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * inputToNetworkInputRatio; + int inputSamplesRequired = (int)((float)NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * inputToNetworkInputRatio); QByteArray inputByteArray = _inputDevice->readAll(); diff --git a/libraries/audio/src/AudioRingBuffer.cpp b/libraries/audio/src/AudioRingBuffer.cpp index ee4027841b..c213ae7454 100644 --- a/libraries/audio/src/AudioRingBuffer.cpp +++ b/libraries/audio/src/AudioRingBuffer.cpp @@ -52,7 +52,7 @@ void AudioRingBuffer::reset() { _isStarved = true; } -void AudioRingBuffer::resizeForFrameSize(qint64 numFrameSamples) { +void AudioRingBuffer::resizeForFrameSize(int numFrameSamples) { delete[] _buffer; _sampleCapacity = numFrameSamples * RING_BUFFER_LENGTH_FRAMES; _buffer = new int16_t[_sampleCapacity]; @@ -68,14 +68,14 @@ int AudioRingBuffer::parseData(const QByteArray& packet) { return writeData(packet.data() + numBytesPacketHeader, packet.size() - numBytesPacketHeader); } -qint64 AudioRingBuffer::readSamples(int16_t* destination, qint64 maxSamples) { +int AudioRingBuffer::readSamples(int16_t* destination, int maxSamples) { return readData((char*) destination, maxSamples * sizeof(int16_t)); } -qint64 AudioRingBuffer::readData(char *data, qint64 maxSize) { +int AudioRingBuffer::readData(char *data, int maxSize) { // only copy up to the number of samples we have available - int numReadSamples = std::min((unsigned) (maxSize / sizeof(int16_t)), samplesAvailable()); + int numReadSamples = std::min((int) (maxSize / sizeof(int16_t)), samplesAvailable()); // If we're in random access mode, then we consider our number of available read samples slightly // differently. Namely, if anything has been written, we say we have as many samples as they ask for @@ -113,15 +113,15 @@ qint64 AudioRingBuffer::readData(char *data, qint64 maxSize) { return numReadSamples * sizeof(int16_t); } -qint64 AudioRingBuffer::writeSamples(const int16_t* source, qint64 maxSamples) { +int AudioRingBuffer::writeSamples(const int16_t* source, int maxSamples) { return writeData((const char*) source, maxSamples * sizeof(int16_t)); } -qint64 AudioRingBuffer::writeData(const char* data, qint64 maxSize) { +int AudioRingBuffer::writeData(const char* data, int maxSize) { // make sure we have enough bytes left for this to be the right amount of audio // otherwise we should not copy that data, and leave the buffer pointers where they are - int samplesToCopy = std::min((quint64)(maxSize / sizeof(int16_t)), (quint64)_sampleCapacity); + int samplesToCopy = std::min((int)(maxSize / sizeof(int16_t)), _sampleCapacity); if (_hasStarted && samplesToCopy > _sampleCapacity - samplesAvailable()) { // this read will cross the next output, so call us starved and reset the buffer @@ -157,7 +157,7 @@ void AudioRingBuffer::shiftReadPosition(unsigned int numSamples) { _nextOutput = shiftedPositionAccomodatingWrap(_nextOutput, numSamples); } -unsigned int AudioRingBuffer::samplesAvailable() const { +int AudioRingBuffer::samplesAvailable() const { if (!_endOfLastWrite) { return 0; } else { @@ -186,7 +186,7 @@ void AudioRingBuffer::addSilentFrame(int numSilentSamples) { } } -bool AudioRingBuffer::isNotStarvedOrHasMinimumSamples(unsigned int numRequiredSamples) const { +bool AudioRingBuffer::isNotStarvedOrHasMinimumSamples(int numRequiredSamples) const { if (!_isStarved) { return true; } else { diff --git a/libraries/audio/src/AudioRingBuffer.h b/libraries/audio/src/AudioRingBuffer.h index 1ddcadeceb..6a77f5a830 100644 --- a/libraries/audio/src/AudioRingBuffer.h +++ b/libraries/audio/src/AudioRingBuffer.h @@ -43,7 +43,7 @@ public: ~AudioRingBuffer(); void reset(); - void resizeForFrameSize(qint64 numFrameSamples); + void resizeForFrameSize(int numFrameSamples); int getSampleCapacity() const { return _sampleCapacity; } @@ -53,20 +53,20 @@ public: const int16_t* getNextOutput() const { return _nextOutput; } const int16_t* getBuffer() const { return _buffer; } - qint64 readSamples(int16_t* destination, qint64 maxSamples); - qint64 writeSamples(const int16_t* source, qint64 maxSamples); + int readSamples(int16_t* destination, int maxSamples); + int writeSamples(const int16_t* source, int maxSamples); - qint64 readData(char* data, qint64 maxSize); - qint64 writeData(const char* data, qint64 maxSize); + int readData(char* data, int maxSize); + int writeData(const char* data, int maxSize); int16_t& operator[](const int index); const int16_t& operator[] (const int index) const; void shiftReadPosition(unsigned int numSamples); - unsigned int samplesAvailable() const; + int samplesAvailable() const; - bool isNotStarvedOrHasMinimumSamples(unsigned int numRequiredSamples) const; + bool isNotStarvedOrHasMinimumSamples(int numRequiredSamples) const; bool isStarved() const { return _isStarved; } void setIsStarved(bool isStarved) { _isStarved = isStarved; } From 81209c38cae10d34c9c05e368da5c7d1d902049c Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 25 Jun 2014 09:09:44 -0700 Subject: [PATCH 3/7] fix warning about out of order initialization --- interface/src/ui/ApplicationOverlay.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 9be556cf62..cef1047f35 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -39,9 +39,9 @@ inline float min(float a, float b) { ApplicationOverlay::ApplicationOverlay() : _framebufferObject(NULL), _textureFov(DEFAULT_OCULUS_UI_ANGULAR_SIZE * RADIANS_PER_DEGREE), - _crosshairTexture(0), _alpha(1.0f), - _active(true) { + _active(true), + _crosshairTexture(0) { memset(_reticleActive, 0, sizeof(_reticleActive)); memset(_magActive, 0, sizeof(_reticleActive)); From d78580adc4c49dfcdd24c8977d9651c9d667ee01 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 25 Jun 2014 09:38:12 -0700 Subject: [PATCH 4/7] remove warning about uninitialized variables --- interface/src/ui/overlays/Overlays.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp index 95f4f2b2fe..a2353e504f 100644 --- a/interface/src/ui/overlays/Overlays.cpp +++ b/interface/src/ui/overlays/Overlays.cpp @@ -82,13 +82,13 @@ void Overlays::render3D() { return; } bool myAvatarComputed = false; - MyAvatar* avatar; + MyAvatar* avatar = NULL; glm::quat myAvatarRotation; - glm::vec3 myAvatarPosition; - float angle; - glm::vec3 axis; - float myAvatarScale; - + glm::vec3 myAvatarPosition(0.0f); + float angle = 0.0f; + glm::vec3 axis(0.0f, 1.0f, 0.0f); + float myAvatarScale = 1.0f; + foreach(Overlay* thisOverlay, _overlays3D) { glPushMatrix(); switch (thisOverlay->getAnchor()) { From e8e9d6464b7993d521393b0d3cb4d3bac59e649e Mon Sep 17 00:00:00 2001 From: David Rowe Date: Mon, 30 Jun 2014 12:41:01 -0700 Subject: [PATCH 5/7] Fix running scripts scrollbar and add scrollbar to list of all scripts --- interface/ui/runningScriptsWidget.ui | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/interface/ui/runningScriptsWidget.ui b/interface/ui/runningScriptsWidget.ui index 71efe6970a..b58c8436d0 100644 --- a/interface/ui/runningScriptsWidget.ui +++ b/interface/ui/runningScriptsWidget.ui @@ -137,7 +137,7 @@ background: transparent; Helvetica,Arial,sans-serif - 16 + -1 75 false true @@ -326,9 +326,6 @@ padding-top: 3px; Qt::LeftToRight - - margin: 0; - QFrame::NoFrame @@ -336,7 +333,7 @@ padding-top: 3px; 0 - Qt::ScrollBarAlwaysOn + Qt::ScrollBarAsNeeded Qt::ScrollBarAlwaysOff @@ -352,7 +349,7 @@ padding-top: 3px; 0 0 - 269 + 284 16 @@ -460,7 +457,6 @@ font: bold 16px; background: transparent; font-size: 14px; - runningScriptsList @@ -627,10 +623,10 @@ QListView::item { QFrame::Plain - Qt::ScrollBarAlwaysOff + Qt::ScrollBarAlwaysOn - Qt::ScrollBarAsNeeded + Qt::ScrollBarAlwaysOff From ec80ccdb9cfab7d0ded131c982ac3bf85f96d42a Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 2 Jul 2014 10:49:05 -0700 Subject: [PATCH 6/7] remove warning about signed/unsigned comparison --- libraries/audio/src/PositionalAudioRingBuffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/audio/src/PositionalAudioRingBuffer.cpp b/libraries/audio/src/PositionalAudioRingBuffer.cpp index 546ed97fe2..e11d73358c 100644 --- a/libraries/audio/src/PositionalAudioRingBuffer.cpp +++ b/libraries/audio/src/PositionalAudioRingBuffer.cpp @@ -212,7 +212,7 @@ bool PositionalAudioRingBuffer::shouldBeAddedToMix() { } return false; - } else if (samplesAvailable() < (unsigned int)samplesPerFrame) { + } else if (samplesAvailable() < samplesPerFrame) { // if the buffer doesn't have a full frame of samples to take for mixing, it is starved _isStarved = true; From ed78855eb6fae5bbee55a35e9da33d7c0de42e16 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 2 Jul 2014 10:49:37 -0700 Subject: [PATCH 7/7] remove warnings about signed/unsigned comparisons --- .../src/SequenceNumberStatsTests.cpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/networking/src/SequenceNumberStatsTests.cpp b/tests/networking/src/SequenceNumberStatsTests.cpp index 89a14deb20..62651eaa6f 100644 --- a/tests/networking/src/SequenceNumberStatsTests.cpp +++ b/tests/networking/src/SequenceNumberStatsTests.cpp @@ -23,7 +23,7 @@ void SequenceNumberStatsTests::runAllTests() { pruneTest(); } -const int UINT16_RANGE = std::numeric_limits::max() + 1; +const quint32 UINT16_RANGE = std::numeric_limits::max() + 1; void SequenceNumberStatsTests::rolloverTest() { @@ -34,7 +34,7 @@ void SequenceNumberStatsTests::rolloverTest() { quint16 seq = 79; // start on some random number for (int R = 0; R < 2; R++) { - for (int i = 0; i < 3 * UINT16_RANGE; i++) { + for (quint32 i = 0; i < 3 * UINT16_RANGE; i++) { stats.sequenceNumberReceived(seq); seq = seq + (quint16)1; @@ -53,12 +53,12 @@ void SequenceNumberStatsTests::earlyLateTest() { SequenceNumberStats stats; quint16 seq = 65530; - int numSent = 0; + quint32 numSent = 0; - int numEarly = 0; - int numLate = 0; - int numLost = 0; - int numRecovered = 0; + quint32 numEarly = 0; + quint32 numLate = 0; + quint32 numLost = 0; + quint32 numRecovered = 0; for (int R = 0; R < 2; R++) { for (int T = 0; T < 10000; T++) { @@ -122,12 +122,12 @@ void SequenceNumberStatsTests::duplicateTest() { SequenceNumberStats stats; quint16 seq = 12345; - int numSent = 0; + quint32 numSent = 0; - int numDuplicate = 0; - int numEarly = 0; - int numLate = 0; - int numLost = 0; + quint32 numDuplicate = 0; + quint32 numEarly = 0; + quint32 numLate = 0; + quint32 numLost = 0; for (int R = 0; R < 2; R++) { for (int T = 0; T < 10000; T++) { @@ -210,10 +210,10 @@ void SequenceNumberStatsTests::pruneTest() { SequenceNumberStats stats; quint16 seq = 54321; - int numSent = 0; + quint32 numSent = 0; - int numEarly = 0; - int numLost = 0; + quint32 numEarly = 0; + quint32 numLost = 0; for (int R = 0; R < 2; R++) { for (int T = 0; T < 1000; T++) {