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

Linux warnings fixes.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-11-07 15:59:16 -08:00
parent 17089064f8
commit 6445b3aa5d
9 changed files with 41 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Audio.cpp
View file

@ -544,7 +544,7 @@ void Audio::addReverb(int16_t* samplesData, int numSamples, QAudioFormat& audioF
gverb_do(_gverb, value, &lValue, &rValue); gverb_do(_gverb, value, &lValue, &rValue);
// Mix, accounting for clipping, the left and right channels. Ignore the rest. // Mix, accounting for clipping, the left and right channels. Ignore the rest.
for (unsigned int j = sample; j < sample + audioFormat.channelCount(); j++) { for (int j = sample; j < sample + audioFormat.channelCount(); j++) {
if (j == sample) { if (j == sample) {
// left channel // left channel
int lResult = glm::clamp((int)(samplesData[j] * dryFraction + lValue * wetFraction), -32768, 32767); int lResult = glm::clamp((int)(samplesData[j] * dryFraction + lValue * wetFraction), -32768, 32767);

2
interface/src/Menu.cpp
View file

@ -386,7 +386,7 @@ Menu::Menu() :
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
#else #else
QAction* vsyncAction = addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::RenderTargetFramerateVSyncOn, 0, true, this, SLOT(changeVSync())); addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::RenderTargetFramerateVSyncOn, 0, true, this, SLOT(changeVSync()));
#endif #endif
} }

2
interface/src/gpu/Batch.cpp
View file

@ -106,7 +106,7 @@ void Batch::setInputStream(Slot startChannel, const BufferStream& stream) {
const Buffers& buffers = stream.getBuffers(); const Buffers& buffers = stream.getBuffers();
const Offsets& offsets = stream.getOffsets(); const Offsets& offsets = stream.getOffsets();
const Offsets& strides = stream.getStrides(); const Offsets& strides = stream.getStrides();
for (int i = 0; i < buffers.size(); i++) { for (unsigned int i = 0; i < buffers.size(); i++) {
setInputBuffer(startChannel + i, buffers[i], offsets[i], strides[i]); setInputBuffer(startChannel + i, buffers[i], offsets[i], strides[i]);
} }
} }

53
interface/src/gpu/GLBackend.cpp
View file

@ -31,15 +31,15 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] =
(&::gpu::GLBackend::do_glEnable), (&::gpu::GLBackend::do_glEnable),
(&::gpu::GLBackend::do_glDisable), (&::gpu::GLBackend::do_glDisable),
(&::gpu::GLBackend::do_glEnableClientState), (&::gpu::GLBackend::do_glEnableClientState),
(&::gpu::GLBackend::do_glDisableClientState), (&::gpu::GLBackend::do_glDisableClientState),
(&::gpu::GLBackend::do_glCullFace), (&::gpu::GLBackend::do_glCullFace),
(&::gpu::GLBackend::do_glAlphaFunc), (&::gpu::GLBackend::do_glAlphaFunc),
(&::gpu::GLBackend::do_glDepthFunc), (&::gpu::GLBackend::do_glDepthFunc),
(&::gpu::GLBackend::do_glDepthMask), (&::gpu::GLBackend::do_glDepthMask),
(&::gpu::GLBackend::do_glDepthRange), (&::gpu::GLBackend::do_glDepthRange),
(&::gpu::GLBackend::do_glBindBuffer), (&::gpu::GLBackend::do_glBindBuffer),
@ -57,18 +57,18 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] =
(&::gpu::GLBackend::do_glPushMatrix), (&::gpu::GLBackend::do_glPushMatrix),
(&::gpu::GLBackend::do_glPopMatrix), (&::gpu::GLBackend::do_glPopMatrix),
(&::gpu::GLBackend::do_glMultMatrixf), (&::gpu::GLBackend::do_glMultMatrixf),
(&::gpu::GLBackend::do_glLoadMatrixf), (&::gpu::GLBackend::do_glLoadMatrixf),
(&::gpu::GLBackend::do_glLoadIdentity), (&::gpu::GLBackend::do_glLoadIdentity),
(&::gpu::GLBackend::do_glRotatef), (&::gpu::GLBackend::do_glRotatef),
(&::gpu::GLBackend::do_glScalef), (&::gpu::GLBackend::do_glScalef),
(&::gpu::GLBackend::do_glTranslatef), (&::gpu::GLBackend::do_glTranslatef),
(&::gpu::GLBackend::do_glDrawArrays), (&::gpu::GLBackend::do_glDrawArrays),
(&::gpu::GLBackend::do_glDrawRangeElements), (&::gpu::GLBackend::do_glDrawRangeElements),
(&::gpu::GLBackend::do_glColorPointer), (&::gpu::GLBackend::do_glColorPointer),
(&::gpu::GLBackend::do_glNormalPointer), (&::gpu::GLBackend::do_glNormalPointer),
(&::gpu::GLBackend::do_glTexCoordPointer), (&::gpu::GLBackend::do_glTexCoordPointer),
(&::gpu::GLBackend::do_glVertexPointer), (&::gpu::GLBackend::do_glVertexPointer),
(&::gpu::GLBackend::do_glVertexAttribPointer), (&::gpu::GLBackend::do_glVertexAttribPointer),
@ -77,7 +77,7 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] =
(&::gpu::GLBackend::do_glColor4f), (&::gpu::GLBackend::do_glColor4f),
(&::gpu::GLBackend::do_glMaterialf), (&::gpu::GLBackend::do_glMaterialf),
(&::gpu::GLBackend::do_glMaterialfv), (&::gpu::GLBackend::do_glMaterialfv),
}; };
@ -112,9 +112,8 @@ static const GLenum _elementTypeToGLType[NUM_TYPES]= {
GLBackend::GLBackend() : GLBackend::GLBackend() :
_inputFormat(0),
_inputAttributeActivation(0),
_needInputFormatUpdate(true), _needInputFormatUpdate(true),
_inputFormat(0),
_inputBuffersState(0), _inputBuffersState(0),
_inputBuffers(_inputBuffersState.size(), BufferPointer(0)), _inputBuffers(_inputBuffersState.size(), BufferPointer(0)),
@ -122,7 +121,8 @@ GLBackend::GLBackend() :
_inputBufferStrides(_inputBuffersState.size(), 0), _inputBufferStrides(_inputBuffersState.size(), 0),
_indexBuffer(0), _indexBuffer(0),
_indexBufferOffset(0) _indexBufferOffset(0),
_inputAttributeActivation(0)
{ {
} }
@ -138,7 +138,7 @@ void GLBackend::renderBatch(Batch& batch) {
GLBackend backend; GLBackend backend;
for (int i = 0; i < numCommands; i++) { for (unsigned int i = 0; i < numCommands; i++) {
CommandCall call = _commandCalls[(*command)]; CommandCall call = _commandCalls[(*command)];
(backend.*(call))(batch, *offset); (backend.*(call))(batch, *offset);
command++; command++;
@ -203,7 +203,7 @@ void GLBackend::do_drawIndexed(Batch& batch, uint32 paramOffset) {
GLenum glType = _elementTypeToGLType[_indexBufferType]; GLenum glType = _elementTypeToGLType[_indexBufferType];
glDrawElements(mode, numIndices, glType, (GLvoid*)(startIndex + _indexBufferOffset)); glDrawElements(mode, numIndices, glType, reinterpret_cast<GLvoid*>(startIndex + _indexBufferOffset));
CHECK_GL_ERROR(); CHECK_GL_ERROR();
} }
@ -265,7 +265,7 @@ void GLBackend::updateInput() {
} }
// Manage Activation what was and what is expected now // Manage Activation what was and what is expected now
for (int i = 0; i < newActivation.size(); i++) { for (unsigned int i = 0; i < newActivation.size(); i++) {
bool newState = newActivation[i]; bool newState = newActivation[i];
if (newState != _inputAttributeActivation[i]) { if (newState != _inputAttributeActivation[i]) {
#if defined(SUPPORT_LEGACY_OPENGL) #if defined(SUPPORT_LEGACY_OPENGL)
@ -314,7 +314,7 @@ void GLBackend::updateInput() {
CHECK_GL_ERROR(); CHECK_GL_ERROR();
_inputBuffersState[bufferNum] = false; _inputBuffersState[bufferNum] = false;
for (int i = 0; i < channel._slots.size(); i++) { for (unsigned int i = 0; i < channel._slots.size(); i++) {
const Stream::Attribute& attrib = attributes.at(channel._slots[i]); const Stream::Attribute& attrib = attributes.at(channel._slots[i]);
GLuint slot = attrib._slot; GLuint slot = attrib._slot;
GLuint count = attrib._element.getDimensionCount(); GLuint count = attrib._element.getDimensionCount();
@ -325,16 +325,16 @@ void GLBackend::updateInput() {
if (slot < NUM_CLASSIC_ATTRIBS) { if (slot < NUM_CLASSIC_ATTRIBS) {
switch (slot) { switch (slot) {
case Stream::POSITION: case Stream::POSITION:
glVertexPointer(count, type, stride, (GLvoid*)pointer); glVertexPointer(count, type, stride, reinterpret_cast<GLvoid*>(pointer));
break; break;
case Stream::NORMAL: case Stream::NORMAL:
glNormalPointer(type, stride, (GLvoid*)pointer); glNormalPointer(type, stride, reinterpret_cast<GLvoid*>(pointer));
break; break;
case Stream::COLOR: case Stream::COLOR:
glColorPointer(count, type, stride, (GLvoid*)pointer); glColorPointer(count, type, stride, reinterpret_cast<GLvoid*>(pointer));
break; break;
case Stream::TEXCOORD: case Stream::TEXCOORD:
glTexCoordPointer(count, type, stride, (GLvoid*)pointer); glTexCoordPointer(count, type, stride, reinterpret_cast<GLvoid*>(pointer));
break; break;
}; };
} else { } else {
@ -342,7 +342,8 @@ void GLBackend::updateInput() {
{ {
#endif #endif
GLboolean isNormalized = attrib._element.isNormalized(); GLboolean isNormalized = attrib._element.isNormalized();
glVertexAttribPointer(slot, count, type, isNormalized, stride, (GLvoid*)pointer); glVertexAttribPointer(slot, count, type, isNormalized, stride,
reinterpret_cast<GLvoid*>(pointer));
} }
CHECK_GL_ERROR(); CHECK_GL_ERROR();
} }

2
interface/src/gpu/Resource.cpp
View file

@ -8,6 +8,8 @@
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include "Context.h"
#include "Resource.h" #include "Resource.h"
#include <QDebug> #include <QDebug>

4
interface/src/renderer/Model.cpp
View file

@ -479,9 +479,7 @@ bool Model::findRayIntersectionAgainstSubMeshes(const glm::vec3& origin, const g
float bestDistance = std::numeric_limits<float>::max(); float bestDistance = std::numeric_limits<float>::max();
float distanceToSubMesh; float distanceToSubMesh;
BoxFace subMeshFace; BoxFace subMeshFace;
BoxFace bestSubMeshFace;
int subMeshIndex = 0; int subMeshIndex = 0;
int bestSubMeshIndex = -1;
// If we hit the models box, then consider the submeshes... // If we hit the models box, then consider the submeshes...
foreach(const AABox& subMeshBox, _calculatedMeshBoxes) { foreach(const AABox& subMeshBox, _calculatedMeshBoxes) {
@ -489,9 +487,7 @@ bool Model::findRayIntersectionAgainstSubMeshes(const glm::vec3& origin, const g
if (subMeshBox.findRayIntersection(origin, direction, distanceToSubMesh, subMeshFace)) { if (subMeshBox.findRayIntersection(origin, direction, distanceToSubMesh, subMeshFace)) {
if (distanceToSubMesh < bestDistance) { if (distanceToSubMesh < bestDistance) {
bestSubMeshIndex = subMeshIndex;
bestDistance = distanceToSubMesh; bestDistance = distanceToSubMesh;
bestSubMeshFace = subMeshFace;
intersectedSomething = true; intersectedSomething = true;
extraInfo = geometry.getModelNameOfMesh(subMeshIndex); extraInfo = geometry.getModelNameOfMesh(subMeshIndex);
} }

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

@ -129,7 +129,7 @@ int TextRenderer::draw(int x, int y, const char* str) {
leftBottom.x, rightTop.y, ls, tt, }; leftBottom.x, rightTop.y, ls, tt, };
const int NUM_COLOR_SCALARS_PER_GLYPH = 4; const int NUM_COLOR_SCALARS_PER_GLYPH = 4;
unsigned int colorBuffer[NUM_COLOR_SCALARS_PER_GLYPH] = { compactColor, compactColor, compactColor, compactColor }; int colorBuffer[NUM_COLOR_SCALARS_PER_GLYPH] = { compactColor, compactColor, compactColor, compactColor };
gpu::Buffer::Size offset = sizeof(vertexBuffer) * _numGlyphsBatched; gpu::Buffer::Size offset = sizeof(vertexBuffer) * _numGlyphsBatched;
gpu::Buffer::Size colorOffset = sizeof(colorBuffer) * _numGlyphsBatched; gpu::Buffer::Size colorOffset = sizeof(colorBuffer) * _numGlyphsBatched;
@ -181,9 +181,9 @@ TextRenderer::TextRenderer(const Properties& properties) :
_color(properties.color), _color(properties.color),
_glyphsBuffer(new gpu::Buffer()), _glyphsBuffer(new gpu::Buffer()),
_glyphsColorBuffer(new gpu::Buffer()), _glyphsColorBuffer(new gpu::Buffer()),
_numGlyphsBatched(0),
_glyphsStreamFormat(new gpu::Stream::Format()), _glyphsStreamFormat(new gpu::Stream::Format()),
_glyphsStream(new gpu::BufferStream()) _glyphsStream(new gpu::BufferStream()),
_numGlyphsBatched(0)
{ {
_glyphsStreamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::POS_XYZ), 0); _glyphsStreamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::POS_XYZ), 0);
const int NUM_POS_COORDS = 2; const int NUM_POS_COORDS = 2;

6
libraries/avatars/src/Player.cpp
View file

@ -297,7 +297,7 @@ void Player::play() {
_injector->setOptions(_options); _injector->setOptions(_options);
} }
void Player::setCurrentFrame(unsigned int currentFrame) { void Player::setCurrentFrame(int currentFrame) {
if (_recording && currentFrame >= _recording->getFrameNumber()) { if (_recording && currentFrame >= _recording->getFrameNumber()) {
stopPlaying(); stopPlaying();
return; return;
@ -314,7 +314,7 @@ void Player::setCurrentFrame(unsigned int currentFrame) {
} }
} }
void Player::setCurrentTime(unsigned int currentTime) { void Player::setCurrentTime(int currentTime) {
if (currentTime >= _recording->getLength()) { if (currentTime >= _recording->getLength()) {
stopPlaying(); stopPlaying();
return; return;
@ -393,7 +393,7 @@ bool Player::computeCurrentFrame() {
_currentFrame = 0; _currentFrame = 0;
} }
quint64 elapsed = glm::clamp(Player::elapsed() - _audioOffset, (qint64)0, (qint64)_recording->getLength()); qint64 elapsed = glm::clamp(Player::elapsed() - _audioOffset, (qint64)0, (qint64)_recording->getLength());
while(_currentFrame >= 0 && while(_currentFrame >= 0 &&
_recording->getFrameTimestamp(_currentFrame) > elapsed) { _recording->getFrameTimestamp(_currentFrame) > elapsed) {
--_currentFrame; --_currentFrame;

6
libraries/avatars/src/Player.h
View file

@ -44,8 +44,8 @@ public slots:
void loadRecording(RecordingPointer recording); void loadRecording(RecordingPointer recording);
void play(); void play();
void setCurrentFrame(unsigned int currentFrame); void setCurrentFrame(int currentFrame);
void setCurrentTime(unsigned int currentTime); void setCurrentTime(int currentTime);
void setVolume(float volume); void setVolume(float volume);
void setAudioOffset(int audioOffset); void setAudioOffset(int audioOffset);
@ -87,4 +87,4 @@ private:
bool _useSkeletonURL; bool _useSkeletonURL;
}; };
#endif // hifi_Player_h #endif // hifi_Player_h