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

Quiet compiler

Browse source
This commit is contained in:
Atlante45 2015-05-12 17:06:40 +02:00
parent 91939ff4ed
commit 00864afe53
5 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -183,8 +183,8 @@ DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 serverPort, qui
_filteredEyeBlinks(), _filteredEyeBlinks(),
_lastEyeCoefficients(), _lastEyeCoefficients(),
_isCalibrating(false), _isCalibrating(false),
_calibrationValues(),
_calibrationCount(0), _calibrationCount(0),
_calibrationValues(),
_calibrationBillboard(NULL), _calibrationBillboard(NULL),
_calibrationBillboardID(0), _calibrationBillboardID(0),
_calibrationMessage(QString()) _calibrationMessage(QString())

2
libraries/entities/src/SimpleEntitySimulation.cpp
View file

@ -54,8 +54,6 @@ void SimpleEntitySimulation::removeEntityInternal(EntityItem* entity) {
_hasSimulationOwnerEntities.remove(entity); _hasSimulationOwnerEntities.remove(entity);
} }
const int SIMPLE_SIMULATION_DIRTY_FLAGS = EntityItem::DIRTY_VELOCITIES | EntityItem::DIRTY_MOTION_TYPE;
void SimpleEntitySimulation::changeEntityInternal(EntityItem* entity) { void SimpleEntitySimulation::changeEntityInternal(EntityItem* entity) {
EntitySimulation::changeEntityInternal(entity); EntitySimulation::changeEntityInternal(entity);
if (!entity->getSimulatorID().isNull()) { if (!entity->getSimulatorID().isNull()) {

25
libraries/model/src/model/Stage.cpp
View file

@ -12,6 +12,7 @@
#include <glm/gtx/transform.hpp> #include <glm/gtx/transform.hpp>
#include <math.h> #include <math.h>
#include <qcompilerdetection.h>
#include "SkyFromAtmosphere_vert.h" #include "SkyFromAtmosphere_vert.h"
#include "SkyFromAtmosphere_frag.h" #include "SkyFromAtmosphere_frag.h"
@ -292,17 +293,19 @@ void SunSkyStage::updateGraphicsObject() const {
} }
// Background // Background
switch (getBackgroundMode()) { switch (getBackgroundMode()) {
case NO_BACKGROUND: { case NO_BACKGROUND: {
break; break;
} }
case SKY_DOME: { case SKY_DOME: {
break; break;
} }
case SKY_BOX: { case SKY_BOX: {
break; break;
} }
}; case NUM_BACKGROUND_MODES:
Q_UNREACHABLE();
};
static int firstTime = 0; static int firstTime = 0;
if (firstTime == 0) { if (firstTime == 0) {

5
libraries/model/src/model/TextureStorage.h
View file

@ -38,9 +38,10 @@ public:
~TextureStorage(); ~TextureStorage();
const QUrl& getUrl() const { return _url; } const QUrl& getUrl() const { return _url; }
const gpu::Texture::Type getType() const { return _usage._type; } gpu::Texture::Type getType() const { return _usage._type; }
const gpu::TexturePointer& getGPUTexture() const { return _gpuTexture; } const gpu::TexturePointer& getGPUTexture() const { return _gpuTexture; }
virtual void reset() { Storage::reset(); }
void reset(const QUrl& url, const TextureUsage& usage); void reset(const QUrl& url, const TextureUsage& usage);
protected: protected:

12
libraries/render-utils/src/GlowEffect.cpp
View file

@ -117,18 +117,6 @@ void GlowEffect::end() {
glBlendColor(0.0f, 0.0f, 0.0f, _intensity = _intensityStack.pop()); glBlendColor(0.0f, 0.0f, 0.0f, _intensity = _intensityStack.pop());
} }
static void maybeBind(const gpu::FramebufferPointer& fbo) {
if (fbo) {
glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(fbo));
}
}
static void maybeRelease(const gpu::FramebufferPointer& fbo) {
if (fbo) {
glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
}
gpu::FramebufferPointer GlowEffect::render() { gpu::FramebufferPointer GlowEffect::render() {
PerformanceTimer perfTimer("glowEffect"); PerformanceTimer perfTimer("glowEffect");