mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 01:24:03 +02:00
Merge pull request #6361 from ZappoMan/fixWarnings
fix various warnings
This commit is contained in:
commit
649f2d1d1d
4 changed files with 6 additions and 2 deletions
|
@ -218,7 +218,6 @@ void RenderableParticleEffectEntityItem::updateRenderItem() {
|
|||
_vertices.clear();
|
||||
|
||||
// build vertices from particle positions and radiuses
|
||||
glm::vec3 frustumPosition = frustum->getPosition();
|
||||
glm::vec3 dir = frustum->getDirection();
|
||||
for (auto&& particle : particleDetails) {
|
||||
glm::vec3 right = glm::normalize(glm::cross(glm::vec3(0.0f, 1.0f, 0.0f), dir));
|
||||
|
|
|
@ -6,4 +6,7 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#include "Deck.h"
|
||||
|
||||
// FIXME -- DO NOT include headers in empty CPP files, it produces warnings. Once we define new symbols
|
||||
// and some actual code here, we can uncomment this include.
|
||||
//#include "Deck.h"
|
||||
|
|
|
@ -80,6 +80,7 @@ FrameType Frame::registerFrameType(const QString& frameTypeName) {
|
|||
std::call_once(once, [&] {
|
||||
auto headerType = frameTypes.registerValue("com.highfidelity.recording.Header");
|
||||
Q_ASSERT(headerType == Frame::TYPE_HEADER);
|
||||
Q_UNUSED(headerType); // FIXME - build system on unix still not upgraded to Qt 5.5.1 so Q_ASSERT still produces warnings
|
||||
});
|
||||
return frameTypes.registerValue(frameTypeName);
|
||||
}
|
||||
|
|
|
@ -94,6 +94,7 @@ void testClipOrdering() {
|
|||
for (auto writeFrame = writeClip->nextFrame(); writeFrame; writeFrame = writeClip->nextFrame()) {
|
||||
QVERIFY(writeClip->position() >= lastFrameTimeOffset);
|
||||
}
|
||||
Q_UNUSED(lastFrameTimeOffset); // FIXME - Unix build not yet upgraded to Qt 5.5.1 we can remove this once it is
|
||||
}
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
|
|
Loading…
Reference in a new issue