Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 10:08:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Quiet compiler

Browse source
This commit is contained in:
Atlante45 2015-05-04 16:49:33 +02:00
parent 6b04ceffba
commit fc1519c078
5 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/devices/DdeFaceTracker.cpp
View file

@ -136,9 +136,6 @@ struct Packet {
const float STARTING_DDE_MESSAGE_TIME = 0.033f;
const int FPS_TIMER_DELAY = 2000; // ms
const int FPS_TIMER_DURATION = 2000; // ms
#ifdef WIN32
// warning C4351: new behavior: elements of array 'DdeFaceTracker::_lastEyeBlinks' will be default initialized
// warning C4351: new behavior: elements of array 'DdeFaceTracker::_filteredEyeBlinks' will be default initialized

2
interface/src/devices/OculusManager.cpp
View file

@ -461,7 +461,7 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
#ifdef DEBUG
// Ensure the frame counter always increments by exactly 1
static int oldFrameIndex = -1;
assert(oldFrameIndex == -1 || oldFrameIndex == _frameIndex - 1);
assert(oldFrameIndex == -1 || (unsigned int)oldFrameIndex == _frameIndex - 1);
oldFrameIndex = _frameIndex;
#endif

3
libraries/octree/src/OctreeHeadlessViewer.h
View file

@ -34,7 +34,8 @@ public:
virtual void init();
virtual void render(RenderArgs::RenderMode renderMode = RenderArgs::DEFAULT_RENDER_MODE,
RenderArgs::RenderSide renderSide = RenderArgs::MONO) { /* swallow these */ }
RenderArgs::RenderSide renderSide = RenderArgs::MONO,
RenderArgs::DebugFlags renderDebugFlags = RenderArgs::RENDER_DEBUG_NONE) { /* swallow these */ }
void setJurisdictionListener(JurisdictionListener* jurisdictionListener) { _jurisdictionListener = jurisdictionListener; }

5
libraries/physics/src/ObjectMotionState.cpp
View file

@ -17,11 +17,6 @@
#include "PhysicsHelpers.h"
#include "PhysicsLogging.h"
const float DEFAULT_FRICTION = 0.5f;
const float MAX_FRICTION = 10.0f;
const float DEFAULT_RESTITUTION = 0.5f;
// origin of physics simulation in world-frame
glm::vec3 _worldOffset(0.0f);

2
libraries/render-utils/src/FboCache.cpp
View file

@ -24,7 +24,7 @@ void FboCache::lockTexture(int texture) {
withLock(_lock, [&] {
Q_ASSERT(_fboMap.count(texture));
if (!_fboLocks.count(texture)) {
Q_ASSERT(_readyFboQueue.front()->texture() == texture);
Q_ASSERT(_readyFboQueue.front()->texture() == (GLuint)texture);
_readyFboQueue.pop_front();
_fboLocks[texture] = 1;
} else {