Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-05 21:12:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings generated when building tests

Browse source
This commit is contained in:
Dale Glass 2022-11-27 19:51:58 +01:00
parent ecb3913c1a
commit 9a80e696ed
5 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/test-utils/src/test-utils/QTestExtensions.h
View file

@ -307,7 +307,7 @@ inline QString getTestResource(const QString& relativePath) {
QFileInfo fileInfo(__FILE__); QFileInfo fileInfo(__FILE__);
auto parentDir = fileInfo.absoluteDir(); auto parentDir = fileInfo.absoluteDir();
auto rootDir = parentDir.absoluteFilePath(".."); auto rootDir = parentDir.absoluteFilePath("..");
dir = QDir::cleanPath(rootDir); dir.setPath(QDir::cleanPath(rootDir));
}); });
return QDir::cleanPath(dir.absoluteFilePath(relativePath)); return QDir::cleanPath(dir.absoluteFilePath(relativePath));

6
tests/animation/src/AnimTests.cpp
View file

@ -300,19 +300,17 @@ void AnimTests::testAccumulateTime() {
QString id = "testNode"; QString id = "testNode";
AnimVariantMap triggers; AnimVariantMap triggers;
float loopFlag = true; float loopFlag = true;
float resultFrame = accumulateTime(startFrame, endFrame, timeScale, startFrame, dt, loopFlag, id, triggers); accumulateTime(startFrame, endFrame, timeScale, startFrame, dt, loopFlag, id, triggers);
// a one frame looping animation should NOT trigger onLoop events // a one frame looping animation should NOT trigger onLoop events
QVERIFY(!triggers.hasKey("testNodeOnLoop")); QVERIFY(!triggers.hasKey("testNodeOnLoop"));
const uint32_t MAX_TRIGGER_COUNT = 3;
startFrame = 0.0f; startFrame = 0.0f;
endFrame = 1.1f; endFrame = 1.1f;
timeScale = 10.0f; timeScale = 10.0f;
dt = 10.0f; dt = 10.0f;
triggers.clearMap(); triggers.clearMap();
loopFlag = true; loopFlag = true;
resultFrame = accumulateTime(startFrame, endFrame, timeScale, startFrame, dt, loopFlag, id, triggers); accumulateTime(startFrame, endFrame, timeScale, startFrame, dt, loopFlag, id, triggers);
// a short animation with a large dt & a large timescale, should generate a onLoop event. // a short animation with a large dt & a large timescale, should generate a onLoop event.
QVERIFY(triggers.hasKey("testNodeOnLoop")); QVERIFY(triggers.hasKey("testNodeOnLoop"));
} }

10
tests/animation/src/RotationConstraintTests.cpp
View file

@ -46,7 +46,7 @@ void RotationConstraintTests::testElbowConstraint() {
{ // test reference rotation -- should be unconstrained { // test reference rotation -- should be unconstrained
glm::quat inputRotation = referenceRotation; glm::quat inputRotation = referenceRotation;
glm::quat outputRotation = inputRotation; glm::quat outputRotation = inputRotation;
bool updated = elbow.apply(outputRotation); elbow.apply(outputRotation);
glm::quat expectedRotation = referenceRotation; glm::quat expectedRotation = referenceRotation;
QCOMPARE_WITH_ABS_ERROR(expectedRotation, outputRotation, EPSILON); QCOMPARE_WITH_ABS_ERROR(expectedRotation, outputRotation, EPSILON);
} }
@ -60,7 +60,7 @@ void RotationConstraintTests::testElbowConstraint() {
for (float angle = startAngle; angle < endAngle + 0.5f * deltaAngle; angle += deltaAngle) { for (float angle = startAngle; angle < endAngle + 0.5f * deltaAngle; angle += deltaAngle) {
glm::quat inputRotation = glm::angleAxis(angle, hingeAxis) * referenceRotation; glm::quat inputRotation = glm::angleAxis(angle, hingeAxis) * referenceRotation;
glm::quat outputRotation = inputRotation; glm::quat outputRotation = inputRotation;
bool updated = elbow.apply(outputRotation); elbow.apply(outputRotation);
QCOMPARE_WITH_ABS_ERROR(inputRotation, outputRotation, EPSILON); QCOMPARE_WITH_ABS_ERROR(inputRotation, outputRotation, EPSILON);
} }
} }
@ -69,7 +69,7 @@ void RotationConstraintTests::testElbowConstraint() {
float angle = minAngle - smallAngle; float angle = minAngle - smallAngle;
glm::quat inputRotation = glm::angleAxis(angle, hingeAxis) * referenceRotation; glm::quat inputRotation = glm::angleAxis(angle, hingeAxis) * referenceRotation;
glm::quat outputRotation = inputRotation; glm::quat outputRotation = inputRotation;
bool updated = elbow.apply(outputRotation); elbow.apply(outputRotation);
glm::quat expectedRotation = glm::angleAxis(minAngle, hingeAxis) * referenceRotation; glm::quat expectedRotation = glm::angleAxis(minAngle, hingeAxis) * referenceRotation;
QCOMPARE_WITH_ABS_ERROR(expectedRotation, outputRotation, EPSILON); QCOMPARE_WITH_ABS_ERROR(expectedRotation, outputRotation, EPSILON);
} }
@ -78,7 +78,7 @@ void RotationConstraintTests::testElbowConstraint() {
float angle = maxAngle + smallAngle; float angle = maxAngle + smallAngle;
glm::quat inputRotation = glm::angleAxis(angle, hingeAxis) * referenceRotation; glm::quat inputRotation = glm::angleAxis(angle, hingeAxis) * referenceRotation;
glm::quat outputRotation = inputRotation; glm::quat outputRotation = inputRotation;
bool updated = elbow.apply(outputRotation); elbow.apply(outputRotation);
glm::quat expectedRotation = glm::angleAxis(maxAngle, hingeAxis) * referenceRotation; glm::quat expectedRotation = glm::angleAxis(maxAngle, hingeAxis) * referenceRotation;
QCOMPARE_WITH_ABS_ERROR(expectedRotation, outputRotation, EPSILON); QCOMPARE_WITH_ABS_ERROR(expectedRotation, outputRotation, EPSILON);
} }
@ -89,7 +89,7 @@ void RotationConstraintTests::testElbowConstraint() {
float someAngle = 0.789f; float someAngle = 0.789f;
glm::quat inputRotation = glm::angleAxis(someAngle, twistVector) * referenceRotation; glm::quat inputRotation = glm::angleAxis(someAngle, twistVector) * referenceRotation;
glm::quat outputRotation = inputRotation; glm::quat outputRotation = inputRotation;
bool updated = elbow.apply(outputRotation); elbow.apply(outputRotation);
glm::quat expectedRotation = referenceRotation; glm::quat expectedRotation = referenceRotation;
QCOMPARE_WITH_ABS_ERROR(expectedRotation, outputRotation, EPSILON); QCOMPARE_WITH_ABS_ERROR(expectedRotation, outputRotation, EPSILON);
} }

2
tests/baking/src/JSBakerTest.cpp
View file

@ -83,7 +83,7 @@ void JSBakerTest::setTestCases() {
void JSBakerTest::testJSBaking() { void JSBakerTest::testJSBaking() {
for (int i = 0;i < _testCases.size();i++) { for (decltype(_testCases)::size_type i = 0;i < _testCases.size();i++) {
QByteArray output; QByteArray output;
auto input = _testCases.at(i).first; auto input = _testCases.at(i).first;
JSBaker::bakeJS(input, output); JSBaker::bakeJS(input, output);

2
tests/shared/src/GLMHelpersTests.cpp
View file

@ -239,7 +239,7 @@ void GLMHelpersTests::roundPerf() {
auto manualTime = std::chrono::high_resolution_clock::now() - start; auto manualTime = std::chrono::high_resolution_clock::now() - start;
bool identical = true; bool identical = true;
for (int i = 0; i < vecs.size(); i++) { for (decltype(vecs)::size_type i = 0; i < vecs.size(); i++) {
identical &= vecs[i] == vecs2[i]; identical &= vecs[i] == vecs2[i];
if (vecs[i] != vecs2[i]) { if (vecs[i] != vecs2[i]) {
qDebug() << "glm: " << vecs[i].x << vecs[i].y << vecs[i].z << ", manual: " << vecs2[i].x << vecs2[i].y << vecs2[i].z; qDebug() << "glm: " << vecs[i].x << vecs[i].y << vecs[i].z << ", manual: " << vecs2[i].x << vecs2[i].y << vecs2[i].z;