mirror of
https://github.com/AleziaKurdis/overte.git
synced 2025-04-07 12:12:39 +02:00
Warnings fixes and cleanup
This commit is contained in:
parent
cc574c3e05
commit
d5429e76da
9 changed files with 7 additions and 11 deletions
|
@ -42,7 +42,7 @@ const QString DESCRIPTION_COLUMNS_KEY = "columns";
|
|||
|
||||
const QString SETTINGS_VIEWPOINT_KEY = "viewpoint";
|
||||
|
||||
static const Setting::Handle<double> JSON_SETTING_VERSION("json-settings/version", 0.0);
|
||||
static Setting::Handle<double> JSON_SETTING_VERSION("json-settings/version", 0.0);
|
||||
|
||||
DomainServerSettingsManager::DomainServerSettingsManager() :
|
||||
_descriptionArray(),
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtNetwork/QNetworkReply>
|
||||
|
||||
#include <HifiConfigVariantMap.h>
|
||||
#include <HTTPManager.h>
|
||||
|
@ -21,6 +22,8 @@
|
|||
#include <ReceivedMessage.h>
|
||||
#include "NodePermissions.h"
|
||||
|
||||
#include <Node.h>
|
||||
|
||||
const QString SETTINGS_PATHS_KEY = "paths";
|
||||
|
||||
const QString SETTINGS_PATH = "/settings";
|
||||
|
|
|
@ -57,7 +57,6 @@
|
|||
|
||||
using namespace std;
|
||||
|
||||
const glm::vec3 DEFAULT_UP_DIRECTION(0.0f, 1.0f, 0.0f);
|
||||
const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f;
|
||||
|
||||
const float MAX_WALKING_SPEED = 2.6f; // human walking speed
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include <QSharedMemory>
|
||||
#include <QTranslator>
|
||||
|
||||
#include <BuildInfo.h>
|
||||
#include <gl/OpenGLVersionChecker.h>
|
||||
#include <SharedUtil.h>
|
||||
|
||||
|
@ -30,7 +31,6 @@
|
|||
#include "MainWindow.h"
|
||||
#include <QtCore/QProcess>
|
||||
|
||||
#include <BuildInfo.h>
|
||||
#ifdef HAS_BUGSPLAT
|
||||
#include <BugSplat.h>
|
||||
#include <CrashReporter.h>
|
||||
|
|
|
@ -956,10 +956,6 @@ void Rig::updateFromEyeParameters(const EyeParameters& params) {
|
|||
params.worldHeadOrientation, params.eyeLookAt, params.eyeSaccade);
|
||||
}
|
||||
|
||||
static const glm::vec3 X_AXIS(1.0f, 0.0f, 0.0f);
|
||||
static const glm::vec3 Y_AXIS(0.0f, 1.0f, 0.0f);
|
||||
static const glm::vec3 Z_AXIS(0.0f, 0.0f, 1.0f);
|
||||
|
||||
void Rig::computeHeadNeckAnimVars(const AnimPose& hmdPose, glm::vec3& headPositionOut, glm::quat& headOrientationOut,
|
||||
glm::vec3& neckPositionOut, glm::quat& neckOrientationOut) const {
|
||||
|
||||
|
|
|
@ -21,8 +21,6 @@
|
|||
#include "SettingManager.h"
|
||||
#include "SharedLogging.h"
|
||||
|
||||
|
||||
|
||||
namespace Setting {
|
||||
static QSharedPointer<Manager> globalManager;
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include <QtCore/QElapsedTimer>
|
||||
#include <QtCore/QLoggingCategory>
|
||||
#include <QtCore/QRegularExpression>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QThread>
|
||||
#include <QtCore/QThreadPool>
|
||||
|
|
|
@ -48,7 +48,7 @@ QString convertTexture(const QString& sourceFile) {
|
|||
fromQImageFormat(sourceImage.format()),
|
||||
gli::extent2d(sourceImage.width(), sourceImage.height()));
|
||||
auto sourceSize = sourceImage.byteCount();
|
||||
assert(sourceSize == workTexture[workTexture.base_level()].size());
|
||||
assert(sourceSize == (int)workTexture[workTexture.base_level()].size());
|
||||
memcpy(workTexture[workTexture.base_level()].data(), sourceImage.constBits(), sourceSize);
|
||||
|
||||
QString resultFile = getKtxFileName(sourceFile) ;
|
||||
|
|
|
@ -152,7 +152,6 @@ protected:
|
|||
|
||||
//static const wchar_t* EXAMPLE_TEXT = L"Hello";
|
||||
//static const wchar_t* EXAMPLE_TEXT = L"\xC1y Hello 1.0\ny\xC1 line 2\n\xC1y";
|
||||
static const glm::uvec2 QUAD_OFFSET(10, 10);
|
||||
|
||||
void testShaderBuild(const char* vs_src, const char * fs_src) {
|
||||
auto vs = gpu::Shader::createVertex(std::string(vs_src));
|
||||
|
|
Loading…
Reference in a new issue