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

Merge pull request #7806 from Atlante45/fix/warnings

Browse source 
Fix couple OSX warnings
This commit is contained in:
Brad Hefta-Gaub 2016-05-03 15:42:47 -07:00
commit 42169ddcb3
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/avatars/src/AvatarData.cpp
View file

@ -45,7 +45,6 @@ const glm::vec3 DEFAULT_LOCAL_AABOX_CORNER(-0.5f);
const glm::vec3 DEFAULT_LOCAL_AABOX_SCALE(1.0f); const glm::vec3 DEFAULT_LOCAL_AABOX_SCALE(1.0f);
const QString AvatarData::FRAME_NAME = "com.highfidelity.recording.AvatarData"; const QString AvatarData::FRAME_NAME = "com.highfidelity.recording.AvatarData";
static std::once_flag frameTypeRegistration;
AvatarData::AvatarData() : AvatarData::AvatarData() :
SpatiallyNestable(NestableType::Avatar, QUuid()), SpatiallyNestable(NestableType::Avatar, QUuid()),

6
libraries/gl/src/gl/OglplusHelpers.cpp
View file

@ -334,7 +334,7 @@ public:
/// Returns the instructions for rendering of faces /// Returns the instructions for rendering of faces
DrawingInstructions Instructions(PrimitiveType primitive) const { DrawingInstructions Instructions(PrimitiveType primitive) const {
DrawingInstructions instr = this->MakeInstructions(); DrawingInstructions instr = MakeInstructions();
DrawOperation operation; DrawOperation operation;
operation.method = DrawOperation::Method::DrawElements; operation.method = DrawOperation::Method::DrawElements;
operation.mode = primitive; operation.mode = primitive;
@ -342,8 +342,8 @@ public:
operation.count = _prim_count * 3; operation.count = _prim_count * 3;
operation.restart_index = DrawOperation::NoRestartIndex(); operation.restart_index = DrawOperation::NoRestartIndex();
operation.phase = 0; operation.phase = 0;
this->AddInstruction(instr, operation); AddInstruction(instr, operation);
return std::move(instr); return instr;
} }
/// Returns the instructions for rendering of faces /// Returns the instructions for rendering of faces

6
libraries/gl/src/gl/OglplusHelpers.h
View file

@ -28,7 +28,11 @@
#ifdef _WIN32 #ifdef _WIN32
#pragma warning(push) #pragma warning(push)
#pragma warning( disable : 4068 ) #pragma warning( disable : 4068 )
#elif defined(Q_OS_MAC)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpessimizing-move"
#endif #endif
#include <oglplus/gl.hpp> #include <oglplus/gl.hpp>
#include <oglplus/all.hpp> #include <oglplus/all.hpp>
@ -40,6 +44,8 @@
#ifdef _WIN32 #ifdef _WIN32
#pragma warning(pop) #pragma warning(pop)
#elif defined(Q_OS_MAC)
#pragma clang diagnostic pop
#endif #endif
#include "NumericalConstants.h" #include "NumericalConstants.h"