Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 23:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More warning fixes

Browse source
This commit is contained in:
Atlante45 2015-12-11 16:17:41 -08:00
parent f308ef7aa9
commit 146581714a
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -45,7 +45,7 @@
#include <QtNetwork/QNetworkDiskCache>
#include <gl/Config.h>
#include <QOpenGLContextWrapper.h>
#include <gl/QOpenGLContextWrapper.h>
#include <AccountManager.h>
#include <AddressManager.h>

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -16,7 +16,7 @@
#include <QtOpenGL/QGLWidget>
#include <QtGui/QImage>
#include <QOpenGLContextWrapper.h>
#include <gl/QOpenGLContextWrapper.h>
#include <gl/GLWidget.h>
#include <NumericalConstants.h>

4
libraries/render-utils/src/AnimDebugDraw.cpp
View file

@ -336,9 +336,9 @@ void AnimDebugDraw::update() {
// count marker verts from shared DebugDraw singleton
auto markerMap = DebugDraw::getInstance().getMarkerMap();
numVerts += markerMap.size() * VERTICES_PER_BONE;
numVerts += (int)markerMap.size() * VERTICES_PER_BONE;
auto myAvatarMarkerMap = DebugDraw::getInstance().getMyAvatarMarkerMap();
numVerts += myAvatarMarkerMap.size() * VERTICES_PER_BONE;
numVerts += (int)myAvatarMarkerMap.size() * VERTICES_PER_BONE;
// allocate verts!
data._vertexBuffer->resize(sizeof(Vertex) * numVerts);

4
tests/gpu-test/src/main.cpp
View file

@ -33,8 +33,8 @@
#include <gpu/StandardShaderLib.h>
#include <gpu/GLBackend.h>
#include <QOpenGLContextWrapper.h>
#include <QOpenGLDebugLoggerWrapper.h>
#include <gl/QOpenGLContextWrapper.h>
#include <gl/QOpenGLDebugLoggerWrapper.h>
#include <GLMHelpers.h>
#include <PathUtils.h>

4
tests/render-utils/src/main.cpp
View file

@ -14,8 +14,8 @@
#include <gpu/GLBackend.h>
#include <QOpenGLContextWrapper.h>
#include <QOpenGLDebugLoggerWrapper.h>
#include <gl/QOpenGLContextWrapper.h>
#include <gl/QOpenGLDebugLoggerWrapper.h>
#include <QDir>
#include <QElapsedTimer>

4
tests/shaders/src/main.cpp
View file

@ -20,8 +20,8 @@
#include <gl/GLHelpers.h>
#include <QOpenGLDebugLoggerWrapper.h>
#include <QOpenGLContextWrapper.h>
#include <gl/QOpenGLDebugLoggerWrapper.h>
#include <gl/QOpenGLContextWrapper.h>
#include "../model/Skybox_vert.h"
#include "../model/Skybox_frag.h"