Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix warnings

Browse source
This commit is contained in:
Brad Davis 2018-11-04 14:38:01 -08:00
parent caf952c252
commit 8c4237b520
5 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
domain-server/src/AssetsBackupHandler.cpp
View file

@ -15,9 +15,18 @@
#include <QDate> #include <QDate>
#include <QtCore/QLoggingCategory> #include <QtCore/QLoggingCategory>
#if !defined(__clang__) && defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#include <quazip5/quazipfile.h> #include <quazip5/quazipfile.h>
#include <quazip5/quazipdir.h> #include <quazip5/quazipdir.h>
#if !defined(__clang__) && defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
#include <AssetClient.h> #include <AssetClient.h>
#include <AssetRequest.h> #include <AssetRequest.h>
#include <AssetUpload.h> #include <AssetUpload.h>

11
domain-server/src/ContentSettingsBackupHandler.cpp
View file

@ -11,8 +11,19 @@
#include "ContentSettingsBackupHandler.h" #include "ContentSettingsBackupHandler.h"
#if !defined(__clang__) && defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#include <quazip5/quazip.h> #include <quazip5/quazip.h>
#include <quazip5/quazipfile.h> #include <quazip5/quazipfile.h>
#include <quazip5/quazipdir.h>
#if !defined(__clang__) && defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
ContentSettingsBackupHandler::ContentSettingsBackupHandler(DomainServerSettingsManager& domainServerSettingsManager) : ContentSettingsBackupHandler::ContentSettingsBackupHandler(DomainServerSettingsManager& domainServerSettingsManager) :
_settingsManager(domainServerSettingsManager) _settingsManager(domainServerSettingsManager)

9
domain-server/src/EntitiesBackupHandler.cpp
View file

@ -13,9 +13,18 @@
#include <QDebug> #include <QDebug>
#if !defined(__clang__) && defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#include <quazip5/quazip.h> #include <quazip5/quazip.h>
#include <quazip5/quazipfile.h> #include <quazip5/quazipfile.h>
#if !defined(__clang__) && defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
#include <OctreeDataUtils.h> #include <OctreeDataUtils.h>
EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) : EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :

1
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -510,7 +510,6 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
// we backtranslate by the registration offset so we can apply that offset to the shapeInfo later // we backtranslate by the registration offset so we can apply that offset to the shapeInfo later
localTransforms.push_back(invRegistraionOffset * jointMatrix * cluster.inverseBindMatrix); localTransforms.push_back(invRegistraionOffset * jointMatrix * cluster.inverseBindMatrix);
} else { } else {
glm::mat4 identity;
localTransforms.push_back(invRegistraionOffset); localTransforms.push_back(invRegistraionOffset);
} }
totalNumVertices += mesh.vertices.size(); totalNumVertices += mesh.vertices.size();

4
libraries/fbx/src/FBXReader_Mesh.cpp
View file

@ -397,7 +397,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
} }
// enumerate the vertices and construct the extracted mesh // enumerate the vertices and construct the extracted mesh
for (int i = 0; i < numVertices; ++i) { for (uint32_t i = 0; i < numVertices; ++i) {
draco::PointIndex vertexIndex(i); draco::PointIndex vertexIndex(i);
if (positionAttribute) { if (positionAttribute) {
@ -453,7 +453,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
} }
} }
for (int i = 0; i < dracoMesh->num_faces(); ++i) { for (uint32_t i = 0; i < dracoMesh->num_faces(); ++i) {
// grab the material ID and texture ID for this face, if we have it // grab the material ID and texture ID for this face, if we have it
auto& dracoFace = dracoMesh->face(draco::FaceIndex(i)); auto& dracoFace = dracoMesh->face(draco::FaceIndex(i));
auto& firstCorner = dracoFace[0]; auto& firstCorner = dracoFace[0];