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

Working on removing some of the warnings in the xcode build

Browse source
This commit is contained in:
Bradley Austin Davis 2015-04-02 16:12:44 -07:00
parent 605cf19f6f
commit 44c9d4a742
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -268,6 +268,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
_dependencyManagerIsSetup(setupEssentials(argc, argv)), _dependencyManagerIsSetup(setupEssentials(argc, argv)),
_window(new MainWindow(desktop())), _window(new MainWindow(desktop())),
_toolWindow(NULL), _toolWindow(NULL),
_friendsWindow(NULL),
_datagramProcessor(), _datagramProcessor(),
_undoStack(), _undoStack(),
_undoStackScriptingInterface(&_undoStack), _undoStackScriptingInterface(&_undoStack),
@ -309,8 +310,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
_isVSyncOn(true), _isVSyncOn(true),
_aboutToQuit(false), _aboutToQuit(false),
_notifiedPacketVersionMismatchThisDomain(false), _notifiedPacketVersionMismatchThisDomain(false),
_domainConnectionRefusals(QList<QString>()), _domainConnectionRefusals(QList<QString>())
_friendsWindow(NULL)
{ {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
installNativeEventFilter(&MyNativeEventFilter::getInstance()); installNativeEventFilter(&MyNativeEventFilter::getInstance());

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

@ -443,7 +443,6 @@ void OculusManager::configureCamera(Camera& camera, int screenWidth, int screenH
camera.setFieldOfView(atan(_eyeFov[0].UpTan) * DEGREES_PER_RADIAN * 2.0f); camera.setFieldOfView(atan(_eyeFov[0].UpTan) * DEGREES_PER_RADIAN * 2.0f);
} }
static bool timerActive = false;
//Displays everything for the oculus, frame timing must be active //Displays everything for the oculus, frame timing must be active
void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &position, Camera& whichCamera) { void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &position, Camera& whichCamera) {
auto glCanvas = Application::getInstance()->getGLWidget(); auto glCanvas = Application::getInstance()->getGLWidget();
@ -463,6 +462,7 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
// (does not seem to work on OSX with SDK based distortion) // (does not seem to work on OSX with SDK based distortion)
// FIXME can't use a static object here, because it will cause a crash when the // FIXME can't use a static object here, because it will cause a crash when the
// query attempts deconstruct after the GL context is gone. // query attempts deconstruct after the GL context is gone.
static bool timerActive = false;
static QOpenGLTimerQuery timerQuery; static QOpenGLTimerQuery timerQuery;
if (!timerQuery.isCreated()) { if (!timerQuery.isCreated()) {
timerQuery.create(); timerQuery.create();
@ -671,7 +671,6 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
#endif #endif
// No DK2, no message. // No DK2, no message.
char latency2Text[128] = "";
{ {
float latencies[5] = {}; float latencies[5] = {};
if (debugFrame && ovrHmd_GetFloatArray(_ovrHmd, "DK2Latency", latencies, 5) == 5) if (debugFrame && ovrHmd_GetFloatArray(_ovrHmd, "DK2Latency", latencies, 5) == 5)

1
libraries/networking/src/DataServerAccountInfo.cpp
View file

@ -15,6 +15,7 @@
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include "DataServerAccountInfo.h" #include "DataServerAccountInfo.h"
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
DataServerAccountInfo::DataServerAccountInfo() : DataServerAccountInfo::DataServerAccountInfo() :
_accessToken(), _accessToken(),

1
libraries/networking/src/RSAKeypairGenerator.cpp
View file

@ -16,6 +16,7 @@
#include <qdebug.h> #include <qdebug.h>
#include "RSAKeypairGenerator.h" #include "RSAKeypairGenerator.h"
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
RSAKeypairGenerator::RSAKeypairGenerator(QObject* parent) : RSAKeypairGenerator::RSAKeypairGenerator(QObject* parent) :
QObject(parent) QObject(parent)