diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index f5f148969c..df23fe9540 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -432,7 +432,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/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 77e8986297..82a8f1c183 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -41,8 +41,7 @@ ApplicationOverlay::ApplicationOverlay() : _textureFov(DEFAULT_OCULUS_UI_ANGULAR_SIZE * RADIANS_PER_DEGREE), _alpha(1.0f), _active(true), - _crosshairTexture(0) -{ + _crosshairTexture(0) { memset(_reticleActive, 0, sizeof(_reticleActive)); memset(_magActive, 0, sizeof(_reticleActive)); diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp index dd483da27a..581947c074 100644 --- a/interface/src/ui/overlays/Overlays.cpp +++ b/interface/src/ui/overlays/Overlays.cpp @@ -84,13 +84,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()) { diff --git a/libraries/audio/src/AudioRingBuffer.cpp b/libraries/audio/src/AudioRingBuffer.cpp index 6ae3b19541..7937a925a8 100644 --- a/libraries/audio/src/AudioRingBuffer.cpp +++ b/libraries/audio/src/AudioRingBuffer.cpp @@ -53,7 +53,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]; @@ -70,14 +70,14 @@ int AudioRingBuffer::parseData(const QByteArray& packet) { return writeData(packet.data() + numBytesBeforeAudioData, packet.size() - numBytesBeforeAudioData); } -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 @@ -118,14 +118,14 @@ 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); int samplesRoomFor = _sampleCapacity - samplesAvailable(); if (samplesToCopy > samplesRoomFor) { @@ -167,7 +167,7 @@ void AudioRingBuffer::shiftReadPosition(unsigned int numSamples) { } } -unsigned int AudioRingBuffer::samplesAvailable() const { +int AudioRingBuffer::samplesAvailable() const { if (!_endOfLastWrite) { return 0; } @@ -208,7 +208,7 @@ int AudioRingBuffer::addSilentFrame(int numSilentSamples) { return numSilentSamples * sizeof(int16_t); } -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 8d19f9c0bb..80a2abeba4 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; } 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; 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) { } 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++) {