Test fixes (get rid of device creation, fix error case tests)

This commit is contained in:
Lars Mueller 2024-06-08 18:08:28 +02:00
parent 37c3edfc38
commit 997926461e

@ -1,6 +1,7 @@
// Minetest
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "CSceneManager.h"
#include "content/subgames.h"
#include "filesys.h"
@ -15,47 +16,17 @@
#include <cstring>
using namespace std;
class ScopedMesh
{
public:
ScopedMesh(irr::io::IReadFile *file)
: m_device { irr::createDevice(irr::video::EDT_NULL) }
{
auto *smgr = m_device->getSceneManager();
m_mesh = smgr->getMesh(file);
}
ScopedMesh(const irr::io::path& filepath)
: m_device { irr::createDevice(irr::video::EDT_NULL) }
{
auto *smgr = m_device->getSceneManager();
irr::io::CReadFile f = irr::io::CReadFile(filepath);
m_mesh = smgr->getMesh(&f);
}
~ScopedMesh()
{
m_device->drop();
}
const irr::scene::IAnimatedMesh *getMesh() const
{
return m_mesh;
}
private:
irr::IrrlichtDevice *m_device;
irr::scene::IAnimatedMesh *m_mesh = nullptr;
};
using v3f = irr::core::vector3df;
using v2f = irr::core::vector2df;
TEST_CASE("gltf") {
const auto gamespec = findSubgame("devtest");
irr::scene::CSceneManager smgr(nullptr, nullptr, nullptr);
const auto loadMesh = [&smgr](const irr::io::path& filepath) {
irr::io::CReadFile file(filepath);
return smgr.getMesh(&file);
};
REQUIRE(gamespec.isValid());
// TODO use SKIP() when Catch2 is upgraded to v3
@ -66,45 +37,42 @@ SECTION("error cases") {
const static auto invalid_model_path = gamespec.gamemods_path + DIR_DELIM + "gltf" + DIR_DELIM + "invalid" + DIR_DELIM;
SECTION("empty gltf file") {
ScopedMesh sm(model_path + "empty.gltf");
CHECK(sm.getMesh() == nullptr);
CHECK(loadMesh(invalid_model_path + "empty.gltf") == nullptr);
}
SECTION("null file pointer") {
ScopedMesh sm(nullptr);
CHECK(sm.getMesh() == nullptr);
CHECK(smgr.getMesh(nullptr) == nullptr);
}
SECTION("invalid JSON") {
ScopedMesh sm(model_path + "json_missing_brace.gltf");
CHECK(sm.getMesh() == nullptr);
CHECK(loadMesh(invalid_model_path + "json_missing_brace.gltf") == nullptr);
}
}
SECTION("minimal triangle") {
auto path = GENERATE(
const auto path = GENERATE(
model_path + "minimal_triangle.gltf",
model_path + "triangle_with_vertex_stride.gltf",
// Test non-indexed geometry.
model_path + "triangle_without_indices.gltf");
INFO(path);
ScopedMesh sm(path);
REQUIRE(sm.getMesh() != nullptr);
REQUIRE(sm.getMesh()->getMeshBufferCount() == 1);
const auto mesh = loadMesh(path);
REQUIRE(mesh != nullptr);
REQUIRE(mesh->getMeshBufferCount() == 1);
SECTION("vertex coordinates are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 3);
REQUIRE(mesh->getMeshBuffer(0)->getVertexCount() == 3);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(0)->getVertices());
mesh->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Pos == v3f {0.0f, 0.0f, 0.0f});
CHECK(vertices[1].Pos == v3f {1.0f, 0.0f, 0.0f});
CHECK(vertices[2].Pos == v3f {0.0f, 1.0f, 0.0f});
}
SECTION("vertex indices are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 3);
REQUIRE(mesh->getMeshBuffer(0)->getIndexCount() == 3);
auto indices = static_cast<const irr::u16 *>(
sm.getMesh()->getMeshBuffer(0)->getIndices());
mesh->getMeshBuffer(0)->getIndices());
CHECK(indices[0] == 2);
CHECK(indices[1] == 1);
CHECK(indices[2] == 0);
@ -112,13 +80,13 @@ SECTION("minimal triangle") {
}
SECTION("blender cube") {
ScopedMesh sm(model_path + "blender_cube.gltf");
REQUIRE(sm.getMesh() != nullptr);
REQUIRE(sm.getMesh()->getMeshBufferCount() == 1);
const auto mesh = loadMesh(model_path + "blender_cube.gltf");
REQUIRE(mesh != nullptr);
REQUIRE(mesh->getMeshBufferCount() == 1);
SECTION("vertex coordinates are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(0)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(0)->getVertices());
mesh->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Pos == v3f{-10.0f, -10.0f, -10.0f});
CHECK(vertices[3].Pos == v3f{-10.0f, 10.0f, -10.0f});
CHECK(vertices[6].Pos == v3f{-10.0f, -10.0f, 10.0f});
@ -130,9 +98,9 @@ SECTION("blender cube") {
}
SECTION("vertex indices are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 36);
REQUIRE(mesh->getMeshBuffer(0)->getIndexCount() == 36);
auto indices = static_cast<const irr::u16 *>(
sm.getMesh()->getMeshBuffer(0)->getIndices());
mesh->getMeshBuffer(0)->getIndices());
CHECK(indices[0] == 16);
CHECK(indices[1] == 5);
CHECK(indices[2] == 22);
@ -140,9 +108,9 @@ SECTION("blender cube") {
}
SECTION("vertex normals are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(0)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(0)->getVertices());
mesh->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Normal == v3f{-1.0f, 0.0f, 0.0f});
CHECK(vertices[1].Normal == v3f{0.0f, -1.0f, 0.0f});
CHECK(vertices[2].Normal == v3f{0.0f, 0.0f, -1.0f});
@ -153,9 +121,9 @@ SECTION("blender cube") {
}
SECTION("texture coords are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(0)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(0)->getVertices());
mesh->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].TCoords == v2f{0.375f, 1.0f});
CHECK(vertices[1].TCoords == v2f{0.125f, 0.25f});
CHECK(vertices[2].TCoords == v2f{0.375f, 0.0f});
@ -165,14 +133,14 @@ SECTION("blender cube") {
}
SECTION("blender cube scaled") {
ScopedMesh sm(model_path + "blender_cube_scaled.gltf");
REQUIRE(sm.getMesh() != nullptr);
REQUIRE(sm.getMesh()->getMeshBufferCount() == 1);
const auto mesh = loadMesh(model_path + "blender_cube_scaled.gltf");
REQUIRE(mesh != nullptr);
REQUIRE(mesh->getMeshBufferCount() == 1);
SECTION("Scaling is correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(0)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(0)->getVertices());
mesh->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Pos == v3f{-150.0f, -1.0f, -21.5f});
CHECK(vertices[3].Pos == v3f{-150.0f, 1.0f, -21.5f});
@ -186,14 +154,14 @@ SECTION("blender cube scaled") {
}
SECTION("blender cube matrix transform") {
ScopedMesh sm(model_path + "blender_cube_matrix_transform.gltf");
REQUIRE(sm.getMesh() != nullptr);
REQUIRE(sm.getMesh()->getMeshBufferCount() == 1);
const auto mesh = loadMesh(model_path + "blender_cube_matrix_transform.gltf");
REQUIRE(mesh != nullptr);
REQUIRE(mesh->getMeshBufferCount() == 1);
SECTION("Transformation is correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(0)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(0)->getVertices());
mesh->getMeshBuffer(0)->getVertices());
const auto checkVertex = [&](const std::size_t i, v3f vec) {
// The transform scales by (1, 2, 3) and translates by (4, 5, 6).
CHECK(vertices[i].Pos == vec * v3f{1, 2, 3}
@ -212,15 +180,15 @@ SECTION("blender cube matrix transform") {
}
SECTION("snow man") {
ScopedMesh sm(model_path + "snow_man.gltf");
REQUIRE(sm.getMesh() != nullptr);
REQUIRE(sm.getMesh()->getMeshBufferCount() == 3);
const auto mesh = loadMesh(model_path + "snow_man.gltf");
REQUIRE(mesh != nullptr);
REQUIRE(mesh->getMeshBufferCount() == 3);
SECTION("vertex coordinates are correct for all buffers") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(0)->getVertexCount() == 24);
{
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(0)->getVertices());
mesh->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Pos == v3f{3.0f, 24.0f, -3.0f});
CHECK(vertices[3].Pos == v3f{3.0f, 18.0f, 3.0f});
CHECK(vertices[6].Pos == v3f{-3.0f, 18.0f, -3.0f});
@ -231,9 +199,9 @@ SECTION("snow man") {
CHECK(vertices[21].Pos == v3f{3.0f, 18.0f, 3.0f});
}
{
REQUIRE(sm.getMesh()->getMeshBuffer(1)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(1)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(1)->getVertices());
mesh->getMeshBuffer(1)->getVertices());
CHECK(vertices[2].Pos == v3f{5.0f, 10.0f, 5.0f});
CHECK(vertices[3].Pos == v3f{5.0f, 0.0f, 5.0f});
CHECK(vertices[7].Pos == v3f{-5.0f, 0.0f, 5.0f});
@ -244,9 +212,9 @@ SECTION("snow man") {
CHECK(vertices[23].Pos == v3f{-5.0f, 0.0f, 5.0f});
}
{
REQUIRE(sm.getMesh()->getMeshBuffer(2)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(2)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(2)->getVertices());
mesh->getMeshBuffer(2)->getVertices());
CHECK(vertices[1].Pos == v3f{4.0f, 10.0f, -4.0f});
CHECK(vertices[2].Pos == v3f{4.0f, 18.0f, 4.0f});
CHECK(vertices[3].Pos == v3f{4.0f, 10.0f, 4.0f});
@ -260,27 +228,27 @@ SECTION("snow man") {
SECTION("vertex indices are correct for all buffers") {
{
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 36);
REQUIRE(mesh->getMeshBuffer(0)->getIndexCount() == 36);
auto indices = static_cast<const irr::u16 *>(
sm.getMesh()->getMeshBuffer(0)->getIndices());
mesh->getMeshBuffer(0)->getIndices());
CHECK(indices[0] == 23);
CHECK(indices[1] == 21);
CHECK(indices[2] == 22);
CHECK(indices[35] == 2);
}
{
REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36);
REQUIRE(mesh->getMeshBuffer(1)->getIndexCount() == 36);
auto indices = static_cast<const irr::u16 *>(
sm.getMesh()->getMeshBuffer(1)->getIndices());
mesh->getMeshBuffer(1)->getIndices());
CHECK(indices[10] == 16);
CHECK(indices[11] == 18);
CHECK(indices[15] == 13);
CHECK(indices[27] == 5);
}
{
REQUIRE(sm.getMesh()->getMeshBuffer(2)->getIndexCount() == 36);
REQUIRE(mesh->getMeshBuffer(2)->getIndexCount() == 36);
auto indices = static_cast<const irr::u16 *>(
sm.getMesh()->getMeshBuffer(2)->getIndices());
mesh->getMeshBuffer(2)->getIndices());
CHECK(indices[26] == 6);
CHECK(indices[27] == 5);
CHECK(indices[29] == 6);
@ -291,9 +259,9 @@ SECTION("snow man") {
SECTION("vertex normals are correct for all buffers") {
{
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(0)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(0)->getVertices());
mesh->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Normal == v3f{1.0f, 0.0f, -0.0f});
CHECK(vertices[1].Normal == v3f{1.0f, 0.0f, -0.0f});
CHECK(vertices[2].Normal == v3f{1.0f, 0.0f, -0.0f});
@ -302,9 +270,9 @@ SECTION("snow man") {
CHECK(vertices[23].Normal == v3f{0.0f, 0.0f, 1.0f});
}
{
REQUIRE(sm.getMesh()->getMeshBuffer(1)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(1)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(1)->getVertices());
mesh->getMeshBuffer(1)->getVertices());
CHECK(vertices[0].Normal == v3f{1.0f, 0.0f, -0.0f});
CHECK(vertices[1].Normal == v3f{1.0f, 0.0f, -0.0f});
CHECK(vertices[3].Normal == v3f{1.0f, 0.0f, -0.0f});
@ -313,9 +281,9 @@ SECTION("snow man") {
CHECK(vertices[22].Normal == v3f{0.0f, 0.0f, 1.0f});
}
{
REQUIRE(sm.getMesh()->getMeshBuffer(2)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(2)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(2)->getVertices());
mesh->getMeshBuffer(2)->getVertices());
CHECK(vertices[3].Normal == v3f{1.0f, 0.0f, -0.0f});
CHECK(vertices[4].Normal == v3f{-1.0f, 0.0f, -0.0f});
CHECK(vertices[5].Normal == v3f{-1.0f, 0.0f, -0.0f});
@ -328,9 +296,9 @@ SECTION("snow man") {
SECTION("texture coords are correct for all buffers") {
{
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(0)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(0)->getVertices());
mesh->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].TCoords == v2f{0.583333313f, 0.791666686f});
CHECK(vertices[1].TCoords == v2f{0.583333313f, 0.666666686f});
CHECK(vertices[2].TCoords == v2f{0.708333313f, 0.791666686f});
@ -339,9 +307,9 @@ SECTION("snow man") {
CHECK(vertices[19].TCoords == v2f{0.708333313f, 0.75f});
}
{
REQUIRE(sm.getMesh()->getMeshBuffer(1)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(1)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(1)->getVertices());
mesh->getMeshBuffer(1)->getVertices());
CHECK(vertices[1].TCoords == v2f{0.0f, 0.791666686f});
CHECK(vertices[4].TCoords == v2f{0.208333328f, 0.791666686f});
@ -351,9 +319,9 @@ SECTION("snow man") {
CHECK(vertices[15].TCoords == v2f{0.208333328f, 0.583333313f});
}
{
REQUIRE(sm.getMesh()->getMeshBuffer(2)->getVertexCount() == 24);
REQUIRE(mesh->getMeshBuffer(2)->getVertexCount() == 24);
auto vertices = static_cast<const irr::video::S3DVertex *>(
sm.getMesh()->getMeshBuffer(2)->getVertices());
mesh->getMeshBuffer(2)->getVertices());
CHECK(vertices[10].TCoords == v2f{0.375f, 0.416666657f});
CHECK(vertices[11].TCoords == v2f{0.375f, 0.583333313f});
CHECK(vertices[12].TCoords == v2f{0.708333313f, 0.625f});