Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 03:50:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager

Browse source
This commit is contained in:
Atlante45 2014-07-02 14:08:57 -07:00
commit 6e02561d96
9 changed files with 45 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Audio.cpp
View file

@ -432,7 +432,7 @@ void Audio::handleAudioInput() {
float inputToNetworkInputRatio = calculateDeviceToNetworkInputRatio(_numInputCallbackBytes); 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(); QByteArray inputByteArray = _inputDevice->readAll();

3
interface/src/ui/ApplicationOverlay.cpp
View file

@ -41,8 +41,7 @@ ApplicationOverlay::ApplicationOverlay() :
_textureFov(DEFAULT_OCULUS_UI_ANGULAR_SIZE * RADIANS_PER_DEGREE), _textureFov(DEFAULT_OCULUS_UI_ANGULAR_SIZE * RADIANS_PER_DEGREE),
_alpha(1.0f), _alpha(1.0f),
_active(true), _active(true),
_crosshairTexture(0) _crosshairTexture(0) {
{
memset(_reticleActive, 0, sizeof(_reticleActive)); memset(_reticleActive, 0, sizeof(_reticleActive));
memset(_magActive, 0, sizeof(_reticleActive)); memset(_magActive, 0, sizeof(_reticleActive));

12
interface/src/ui/overlays/Overlays.cpp
View file

@ -84,13 +84,13 @@ void Overlays::render3D() {
return; return;
} }
bool myAvatarComputed = false; bool myAvatarComputed = false;
MyAvatar* avatar; MyAvatar* avatar = NULL;
glm::quat myAvatarRotation; glm::quat myAvatarRotation;
glm::vec3 myAvatarPosition; glm::vec3 myAvatarPosition(0.0f);
float angle; float angle = 0.0f;
glm::vec3 axis; glm::vec3 axis(0.0f, 1.0f, 0.0f);
float myAvatarScale; float myAvatarScale = 1.0f;
foreach(Overlay* thisOverlay, _overlays3D) { foreach(Overlay* thisOverlay, _overlays3D) {
glPushMatrix(); glPushMatrix();
switch (thisOverlay->getAnchor()) { switch (thisOverlay->getAnchor()) {

14
interface/ui/runningScriptsWidget.ui
View file

@ -137,7 +137,7 @@ background: transparent;</string>
<property name="font"> <property name="font">
<font> <font>
<family>Helvetica,Arial,sans-serif</family> <family>Helvetica,Arial,sans-serif</family>
<pointsize>16</pointsize> <pointsize>-1</pointsize>
<weight>75</weight> <weight>75</weight>
<italic>false</italic> <italic>false</italic>
<bold>true</bold> <bold>true</bold>
@ -326,9 +326,6 @@ padding-top: 3px;</string>
<property name="layoutDirection"> <property name="layoutDirection">
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="styleSheet">
<string notr="true">margin: 0;</string>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
@ -336,7 +333,7 @@ padding-top: 3px;</string>
<number>0</number> <number>0</number>
</property> </property>
<property name="verticalScrollBarPolicy"> <property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum> <enum>Qt::ScrollBarAsNeeded</enum>
</property> </property>
<property name="horizontalScrollBarPolicy"> <property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum> <enum>Qt::ScrollBarAlwaysOff</enum>
@ -352,7 +349,7 @@ padding-top: 3px;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>269</width> <width>284</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -460,7 +457,6 @@ font: bold 16px;</string>
<string notr="true">background: transparent; <string notr="true">background: transparent;
font-size: 14px;</string> font-size: 14px;</string>
</property> </property>
<zorder>runningScriptsList</zorder>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -627,10 +623,10 @@ QListView::item {
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<property name="verticalScrollBarPolicy"> <property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum> <enum>Qt::ScrollBarAlwaysOn</enum>
</property> </property>
<property name="horizontalScrollBarPolicy"> <property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum> <enum>Qt::ScrollBarAlwaysOff</enum>
</property> </property>
</widget> </widget>
</item> </item>

18
libraries/audio/src/AudioRingBuffer.cpp
View file

@ -53,7 +53,7 @@ void AudioRingBuffer::reset() {
_isStarved = true; _isStarved = true;
} }
void AudioRingBuffer::resizeForFrameSize(qint64 numFrameSamples) { void AudioRingBuffer::resizeForFrameSize(int numFrameSamples) {
delete[] _buffer; delete[] _buffer;
_sampleCapacity = numFrameSamples * RING_BUFFER_LENGTH_FRAMES; _sampleCapacity = numFrameSamples * RING_BUFFER_LENGTH_FRAMES;
_buffer = new int16_t[_sampleCapacity]; _buffer = new int16_t[_sampleCapacity];
@ -70,14 +70,14 @@ int AudioRingBuffer::parseData(const QByteArray& packet) {
return writeData(packet.data() + numBytesBeforeAudioData, packet.size() - numBytesBeforeAudioData); 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)); 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 // 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 // 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 // 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); 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)); 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 // 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 // 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(); int samplesRoomFor = _sampleCapacity - samplesAvailable();
if (samplesToCopy > samplesRoomFor) { if (samplesToCopy > samplesRoomFor) {
@ -167,7 +167,7 @@ void AudioRingBuffer::shiftReadPosition(unsigned int numSamples) {
} }
} }
unsigned int AudioRingBuffer::samplesAvailable() const { int AudioRingBuffer::samplesAvailable() const {
if (!_endOfLastWrite) { if (!_endOfLastWrite) {
return 0; return 0;
} }
@ -208,7 +208,7 @@ int AudioRingBuffer::addSilentFrame(int numSilentSamples) {
return numSilentSamples * sizeof(int16_t); return numSilentSamples * sizeof(int16_t);
} }
bool AudioRingBuffer::isNotStarvedOrHasMinimumSamples(unsigned int numRequiredSamples) const { bool AudioRingBuffer::isNotStarvedOrHasMinimumSamples(int numRequiredSamples) const {
if (!_isStarved) { if (!_isStarved) {
return true; return true;
} else { } else {

14
libraries/audio/src/AudioRingBuffer.h
View file

@ -43,7 +43,7 @@ public:
~AudioRingBuffer(); ~AudioRingBuffer();
void reset(); void reset();
void resizeForFrameSize(qint64 numFrameSamples); void resizeForFrameSize(int numFrameSamples);
int getSampleCapacity() const { return _sampleCapacity; } int getSampleCapacity() const { return _sampleCapacity; }
@ -53,20 +53,20 @@ public:
const int16_t* getNextOutput() const { return _nextOutput; } const int16_t* getNextOutput() const { return _nextOutput; }
const int16_t* getBuffer() const { return _buffer; } const int16_t* getBuffer() const { return _buffer; }
qint64 readSamples(int16_t* destination, qint64 maxSamples); int readSamples(int16_t* destination, int maxSamples);
qint64 writeSamples(const int16_t* source, qint64 maxSamples); int writeSamples(const int16_t* source, int maxSamples);
qint64 readData(char* data, qint64 maxSize); int readData(char* data, int maxSize);
qint64 writeData(const char* data, qint64 maxSize); int writeData(const char* data, int maxSize);
int16_t& operator[](const int index); int16_t& operator[](const int index);
const int16_t& operator[] (const int index) const; const int16_t& operator[] (const int index) const;
void shiftReadPosition(unsigned int numSamples); 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; } bool isStarved() const { return _isStarved; }
void setIsStarved(bool isStarved) { _isStarved = isStarved; } void setIsStarved(bool isStarved) { _isStarved = isStarved; }

2
libraries/audio/src/PositionalAudioRingBuffer.cpp
View file

@ -212,7 +212,7 @@ bool PositionalAudioRingBuffer::shouldBeAddedToMix() {
} }
return false; 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 // if the buffer doesn't have a full frame of samples to take for mixing, it is starved
_isStarved = true; _isStarved = true;

3
libraries/shared/src/PhysicsSimulation.cpp
View file

@ -24,9 +24,6 @@ int MAX_ENTITIES_PER_SIMULATION = 64;
int MAX_COLLISIONS_PER_SIMULATION = 256; 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), PhysicsSimulation::PhysicsSimulation() : _collisionList(MAX_COLLISIONS_PER_SIMULATION),
_numIterations(0), _numCollisions(0), _constraintError(0.0f), _stepTime(0) { _numIterations(0), _numCollisions(0), _constraintError(0.0f), _stepTime(0) {
} }

30
tests/networking/src/SequenceNumberStatsTests.cpp
View file

@ -23,7 +23,7 @@ void SequenceNumberStatsTests::runAllTests() {
pruneTest(); pruneTest();
} }
const int UINT16_RANGE = std::numeric_limits<quint16>::max() + 1; const quint32 UINT16_RANGE = std::numeric_limits<quint16>::max() + 1;
void SequenceNumberStatsTests::rolloverTest() { void SequenceNumberStatsTests::rolloverTest() {
@ -34,7 +34,7 @@ void SequenceNumberStatsTests::rolloverTest() {
quint16 seq = 79; // start on some random number quint16 seq = 79; // start on some random number
for (int R = 0; R < 2; R++) { 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); stats.sequenceNumberReceived(seq);
seq = seq + (quint16)1; seq = seq + (quint16)1;
@ -53,12 +53,12 @@ void SequenceNumberStatsTests::earlyLateTest() {
SequenceNumberStats stats; SequenceNumberStats stats;
quint16 seq = 65530; quint16 seq = 65530;
int numSent = 0; quint32 numSent = 0;
int numEarly = 0; quint32 numEarly = 0;
int numLate = 0; quint32 numLate = 0;
int numLost = 0; quint32 numLost = 0;
int numRecovered = 0; quint32 numRecovered = 0;
for (int R = 0; R < 2; R++) { for (int R = 0; R < 2; R++) {
for (int T = 0; T < 10000; T++) { for (int T = 0; T < 10000; T++) {
@ -122,12 +122,12 @@ void SequenceNumberStatsTests::duplicateTest() {
SequenceNumberStats stats; SequenceNumberStats stats;
quint16 seq = 12345; quint16 seq = 12345;
int numSent = 0; quint32 numSent = 0;
int numDuplicate = 0; quint32 numDuplicate = 0;
int numEarly = 0; quint32 numEarly = 0;
int numLate = 0; quint32 numLate = 0;
int numLost = 0; quint32 numLost = 0;
for (int R = 0; R < 2; R++) { for (int R = 0; R < 2; R++) {
for (int T = 0; T < 10000; T++) { for (int T = 0; T < 10000; T++) {
@ -210,10 +210,10 @@ void SequenceNumberStatsTests::pruneTest() {
SequenceNumberStats stats; SequenceNumberStats stats;
quint16 seq = 54321; quint16 seq = 54321;
int numSent = 0; quint32 numSent = 0;
int numEarly = 0; quint32 numEarly = 0;
int numLost = 0; quint32 numLost = 0;
for (int R = 0; R < 2; R++) { for (int R = 0; R < 2; R++) {
for (int T = 0; T < 1000; T++) { for (int T = 0; T < 1000; T++) {