minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Put files in the right places

This commit is contained in:
Josiah VanderZee 2024-04-18 12:00:03 -05:00
parent 53233b7ab2
commit c928cc8456
13 changed files with 1143 additions and 1143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1220
src/CGLTFMeshFileLoader.cpp → irr/src/CGLTFMeshFileLoader.cpp
View File

File diff suppressed because it is too large Load Diff

292
src/CGLTFMeshFileLoader.h → irr/src/CGLTFMeshFileLoader.h
View File

@ -1,146 +1,146 @@
#ifndef __C_GLTF_MESH_FILE_LOADER_INCLUDED__ #ifndef __C_GLTF_MESH_FILE_LOADER_INCLUDED__
#define __C_GLTF_MESH_FILE_LOADER_INCLUDED__ #define __C_GLTF_MESH_FILE_LOADER_INCLUDED__
#include "ISkinnedMesh.h" #include "ISkinnedMesh.h"
#include "IMeshLoader.h" #include "IMeshLoader.h"
#include "IReadFile.h" #include "IReadFile.h"
#include "irrTypes.h" #include "irrTypes.h"
#include "path.h" #include "path.h"
#include "S3DVertex.h" #include "S3DVertex.h"
#include "vector2d.h" #include "vector2d.h"
#include "vector3d.h" #include "vector3d.h"
#include <tiniergltf.hpp> #include <tiniergltf.hpp>
#include <cstddef> #include <cstddef>
#include <vector> #include <vector>
namespace irr namespace irr
{ {
namespace scene namespace scene
{ {
class CGLTFMeshFileLoader : public IMeshLoader class CGLTFMeshFileLoader : public IMeshLoader
{ {
public: public:
CGLTFMeshFileLoader() noexcept; CGLTFMeshFileLoader() noexcept;
bool isALoadableFileExtension(const io::path& filename) const override; bool isALoadableFileExtension(const io::path& filename) const override;
IAnimatedMesh* createMesh(io::IReadFile* file) override; IAnimatedMesh* createMesh(io::IReadFile* file) override;
private: private:
class BufferOffset class BufferOffset
{ {
public: public:
BufferOffset(const std::vector<unsigned char>& buf, BufferOffset(const std::vector<unsigned char>& buf,
const std::size_t offset); const std::size_t offset);
BufferOffset(const BufferOffset& other, BufferOffset(const BufferOffset& other,
const std::size_t fromOffset); const std::size_t fromOffset);
unsigned char at(const std::size_t fromOffset) const; unsigned char at(const std::size_t fromOffset) const;
private: private:
const std::vector<unsigned char>& m_buf; const std::vector<unsigned char>& m_buf;
std::size_t m_offset; std::size_t m_offset;
int m_filesize; int m_filesize;
}; };
class MeshExtractor { class MeshExtractor {
public: public:
using vertex_t = video::S3DVertex; using vertex_t = video::S3DVertex;
MeshExtractor(const tiniergltf::GlTF &model, MeshExtractor(const tiniergltf::GlTF &model,
ISkinnedMesh *mesh) noexcept ISkinnedMesh *mesh) noexcept
: m_gltf_model(model), m_irr_model(mesh) {}; : m_gltf_model(model), m_irr_model(mesh) {};
MeshExtractor(const tiniergltf::GlTF &&model, MeshExtractor(const tiniergltf::GlTF &&model,
ISkinnedMesh *mesh) noexcept ISkinnedMesh *mesh) noexcept
: m_gltf_model(model), m_irr_model(mesh) {}; : m_gltf_model(model), m_irr_model(mesh) {};
/* Gets indices for the given mesh/primitive. /* Gets indices for the given mesh/primitive.
* *
* Values are return in Irrlicht winding order. * Values are return in Irrlicht winding order.
*/ */
std::optional<std::vector<u16>> getIndices(const std::size_t meshIdx, std::optional<std::vector<u16>> getIndices(const std::size_t meshIdx,
const std::size_t primitiveIdx) const; const std::size_t primitiveIdx) const;
std::optional<std::vector<vertex_t>> getVertices(std::size_t meshIdx, std::optional<std::vector<vertex_t>> getVertices(std::size_t meshIdx,
const std::size_t primitiveIdx) const; const std::size_t primitiveIdx) const;
std::size_t getMeshCount() const; std::size_t getMeshCount() const;
std::size_t getPrimitiveCount(const std::size_t meshIdx) const; std::size_t getPrimitiveCount(const std::size_t meshIdx) const;
void loadNodes() const; void loadNodes() const;
private: private:
const tiniergltf::GlTF m_gltf_model; const tiniergltf::GlTF m_gltf_model;
ISkinnedMesh *m_irr_model; ISkinnedMesh *m_irr_model;
template <typename T> template <typename T>
static T readPrimitive(const BufferOffset& readFrom); static T readPrimitive(const BufferOffset& readFrom);
static core::vector2df readVec2DF( static core::vector2df readVec2DF(
const BufferOffset& readFrom); const BufferOffset& readFrom);
/* Read a vec3df from a buffer with transformations applied. /* Read a vec3df from a buffer with transformations applied.
* *
* Values are returned in Irrlicht coordinates. * Values are returned in Irrlicht coordinates.
*/ */
static core::vector3df readVec3DF( static core::vector3df readVec3DF(
const BufferOffset& readFrom, const BufferOffset& readFrom,
const core::vector3df scale); const core::vector3df scale);
void copyPositions(const std::size_t accessorIdx, void copyPositions(const std::size_t accessorIdx,
std::vector<vertex_t>& vertices) const; std::vector<vertex_t>& vertices) const;
void copyNormals(const std::size_t accessorIdx, void copyNormals(const std::size_t accessorIdx,
std::vector<vertex_t>& vertices) const; std::vector<vertex_t>& vertices) const;
void copyTCoords(const std::size_t accessorIdx, void copyTCoords(const std::size_t accessorIdx,
std::vector<vertex_t>& vertices) const; std::vector<vertex_t>& vertices) const;
std::size_t getElemCount(const std::size_t accessorIdx) const; std::size_t getElemCount(const std::size_t accessorIdx) const;
std::size_t getByteStride(const std::size_t accessorIdx) const; std::size_t getByteStride(const std::size_t accessorIdx) const;
bool isAccessorNormalized(const std::size_t accessorIdx) const; bool isAccessorNormalized(const std::size_t accessorIdx) const;
BufferOffset getBuffer(const std::size_t accessorIdx) const; BufferOffset getBuffer(const std::size_t accessorIdx) const;
std::optional<std::size_t> getIndicesAccessorIdx(const std::size_t meshIdx, std::optional<std::size_t> getIndicesAccessorIdx(const std::size_t meshIdx,
const std::size_t primitiveIdx) const; const std::size_t primitiveIdx) const;
std::optional<std::size_t> getPositionAccessorIdx(const std::size_t meshIdx, std::optional<std::size_t> getPositionAccessorIdx(const std::size_t meshIdx,
const std::size_t primitiveIdx) const; const std::size_t primitiveIdx) const;
/* Get the accessor id of the normals of a primitive. /* Get the accessor id of the normals of a primitive.
*/ */
std::optional<std::size_t> getNormalAccessorIdx(const std::size_t meshIdx, std::optional<std::size_t> getNormalAccessorIdx(const std::size_t meshIdx,
const std::size_t primitiveIdx) const; const std::size_t primitiveIdx) const;
/* Get the accessor id for the tcoords of a primitive. /* Get the accessor id for the tcoords of a primitive.
*/ */
std::optional<std::size_t> getTCoordAccessorIdx(const std::size_t meshIdx, std::optional<std::size_t> getTCoordAccessorIdx(const std::size_t meshIdx,
const std::size_t primitiveIdx) const; const std::size_t primitiveIdx) const;
void loadMesh( void loadMesh(
std::size_t meshIdx, std::size_t meshIdx,
ISkinnedMesh::SJoint *parentJoint) const; ISkinnedMesh::SJoint *parentJoint) const;
void loadNode( void loadNode(
const std::size_t nodeIdx, const std::size_t nodeIdx,
ISkinnedMesh::SJoint *parentJoint) const; ISkinnedMesh::SJoint *parentJoint) const;
}; };
std::optional<tiniergltf::GlTF> tryParseGLTF(io::IReadFile* file); std::optional<tiniergltf::GlTF> tryParseGLTF(io::IReadFile* file);
}; };
} // namespace scene } // namespace scene
} // namespace irr } // namespace irr
#endif // __C_GLTF_MESH_FILE_LOADER_INCLUDED__ #endif // __C_GLTF_MESH_FILE_LOADER_INCLUDED__

0
src/tests/CMakeLists.txt → irr/src/tests/CMakeLists.txt
View File

0
src/tests/assets/blender_cube.gltf → irr/src/tests/assets/blender_cube.gltf
View File

0
src/tests/assets/blender_cube_matrix_transform.gltf → irr/src/tests/assets/blender_cube_matrix_transform.gltf
View File

0
src/tests/assets/blender_cube_scaled.gltf → irr/src/tests/assets/blender_cube_scaled.gltf
View File

0
src/tests/assets/empty.gltf → irr/src/tests/assets/empty.gltf
View File

0
src/tests/assets/json_missing_brace.gltf → irr/src/tests/assets/json_missing_brace.gltf
View File

0
src/tests/assets/minimal_triangle.gltf → irr/src/tests/assets/minimal_triangle.gltf
View File

0
src/tests/assets/snow_man.gltf → irr/src/tests/assets/snow_man.gltf
View File

0
src/tests/assets/triangle_with_vertex_stride.gltf → irr/src/tests/assets/triangle_with_vertex_stride.gltf
View File

106
src/tests/assets/triangle_without_indices.gltf → irr/src/tests/assets/triangle_without_indices.gltf
View File

@ -1,54 +1,54 @@
{ {
"scene" : 0, "scene" : 0,
"scenes" : [ "scenes" : [
{ {
"nodes" : [ 0 ] "nodes" : [ 0 ]
} }
], ],
"nodes" : [ "nodes" : [
{ {
"mesh" : 0 "mesh" : 0
} }
], ],
"meshes" : [ "meshes" : [
{ {
"primitives" : [ { "primitives" : [ {
"attributes" : { "attributes" : {
"POSITION" : 0 "POSITION" : 0
} }
} ] } ]
} }
], ],
"buffers" : [ "buffers" : [
{ {
"uri" : "data:application/octet-stream;base64,AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAA", "uri" : "data:application/octet-stream;base64,AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAA",
"byteLength" : 36 "byteLength" : 36
} }
], ],
"bufferViews" : [ "bufferViews" : [
{ {
"buffer" : 0, "buffer" : 0,
"byteOffset" : 0, "byteOffset" : 0,
"byteLength" : 36, "byteLength" : 36,
"target" : 34962 "target" : 34962
} }
], ],
"accessors" : [ "accessors" : [
{ {
"bufferView" : 0, "bufferView" : 0,
"byteOffset" : 0, "byteOffset" : 0,
"componentType" : 5126, "componentType" : 5126,
"count" : 3, "count" : 3,
"type" : "VEC3", "type" : "VEC3",
"max" : [ 1.0, 1.0, 0.0 ], "max" : [ 1.0, 1.0, 0.0 ],
"min" : [ 0.0, 0.0, 0.0 ] "min" : [ 0.0, 0.0, 0.0 ]
} }
], ],
"asset" : { "asset" : {
"version" : "2.0" "version" : "2.0"
} }
} }

668
src/tests/testCGLTFMeshFileLoader.cpp → irr/src/tests/testCGLTFMeshFileLoader.cpp
View File

@ -1,334 +1,334 @@
#include "CReadFile.h" #include "CReadFile.h"
#include "vector3d.h" #include "vector3d.h"
#include <irrlicht.h> #include <irrlicht.h>
// Catch needs to be included after Irrlicht so that it sees operator<< // Catch needs to be included after Irrlicht so that it sees operator<<
// declarations. // declarations.
#define CATCH_CONFIG_MAIN #define CATCH_CONFIG_MAIN
#include <catch.hpp> #include <catch.hpp>
#include <iostream> #include <iostream>
using namespace std; using namespace std;
class ScopedMesh class ScopedMesh
{ {
public: public:
ScopedMesh(irr::io::IReadFile* file) ScopedMesh(irr::io::IReadFile* file)
: m_device { irr::createDevice(irr::video::EDT_NULL) } : m_device { irr::createDevice(irr::video::EDT_NULL) }
, m_mesh { nullptr } , m_mesh { nullptr }
{ {
auto* smgr = m_device->getSceneManager(); auto* smgr = m_device->getSceneManager();
m_mesh = smgr->getMesh(file); m_mesh = smgr->getMesh(file);
} }
ScopedMesh(const irr::io::path& filepath) ScopedMesh(const irr::io::path& filepath)
: m_device { irr::createDevice(irr::video::EDT_NULL) } : m_device { irr::createDevice(irr::video::EDT_NULL) }
, m_mesh { nullptr } , m_mesh { nullptr }
{ {
auto* smgr = m_device->getSceneManager(); auto* smgr = m_device->getSceneManager();
irr::io::CReadFile f = irr::io::CReadFile(filepath); irr::io::CReadFile f = irr::io::CReadFile(filepath);
m_mesh = smgr->getMesh(&f); m_mesh = smgr->getMesh(&f);
} }
~ScopedMesh() ~ScopedMesh()
{ {
m_device->drop(); m_device->drop();
m_mesh = nullptr; m_mesh = nullptr;
} }
const irr::scene::IAnimatedMesh* getMesh() const const irr::scene::IAnimatedMesh* getMesh() const
{ {
return m_mesh; return m_mesh;
} }
private: private:
irr::IrrlichtDevice* m_device; irr::IrrlichtDevice* m_device;
irr::scene::IAnimatedMesh* m_mesh; irr::scene::IAnimatedMesh* m_mesh;
}; };
TEST_CASE("load empty gltf file") { TEST_CASE("load empty gltf file") {
ScopedMesh sm("source/Irrlicht/tests/assets/empty.gltf"); ScopedMesh sm("source/Irrlicht/tests/assets/empty.gltf");
CHECK(sm.getMesh() == nullptr); CHECK(sm.getMesh() == nullptr);
} }
TEST_CASE("minimal triangle") { TEST_CASE("minimal triangle") {
auto path = GENERATE( auto path = GENERATE(
"source/Irrlicht/tests/assets/minimal_triangle.gltf", "source/Irrlicht/tests/assets/minimal_triangle.gltf",
"source/Irrlicht/tests/assets/triangle_with_vertex_stride.gltf", "source/Irrlicht/tests/assets/triangle_with_vertex_stride.gltf",
// Test non-indexed geometry. // Test non-indexed geometry.
"source/Irrlicht/tests/assets/triangle_without_indices.gltf"); "source/Irrlicht/tests/assets/triangle_without_indices.gltf");
INFO(path); INFO(path);
ScopedMesh sm(path); ScopedMesh sm(path);
REQUIRE(sm.getMesh() != nullptr); REQUIRE(sm.getMesh() != nullptr);
REQUIRE(sm.getMesh()->getMeshBufferCount() == 1); REQUIRE(sm.getMesh()->getMeshBufferCount() == 1);
SECTION("vertex coordinates are correct") { SECTION("vertex coordinates are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 3); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 3);
const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>( const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(0)->getVertices()); sm.getMesh()->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Pos == irr::core::vector3df {0.0f, 0.0f, 0.0f}); CHECK(vertices[0].Pos == irr::core::vector3df {0.0f, 0.0f, 0.0f});
CHECK(vertices[1].Pos == irr::core::vector3df {1.0f, 0.0f, 0.0f}); CHECK(vertices[1].Pos == irr::core::vector3df {1.0f, 0.0f, 0.0f});
CHECK(vertices[2].Pos == irr::core::vector3df {0.0f, 1.0f, 0.0f}); CHECK(vertices[2].Pos == irr::core::vector3df {0.0f, 1.0f, 0.0f});
} }
SECTION("vertex indices are correct") { SECTION("vertex indices are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 3); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 3);
const auto* indices = reinterpret_cast<irr::u16*>( const auto* indices = reinterpret_cast<irr::u16*>(
sm.getMesh()->getMeshBuffer(0)->getIndices()); sm.getMesh()->getMeshBuffer(0)->getIndices());
CHECK(indices[0] == 2); CHECK(indices[0] == 2);
CHECK(indices[1] == 1); CHECK(indices[1] == 1);
CHECK(indices[2] == 0); CHECK(indices[2] == 0);
} }
} }
TEST_CASE("blender cube") { TEST_CASE("blender cube") {
ScopedMesh sm("source/Irrlicht/tests/assets/blender_cube.gltf"); ScopedMesh sm("source/Irrlicht/tests/assets/blender_cube.gltf");
REQUIRE(sm.getMesh() != nullptr); REQUIRE(sm.getMesh() != nullptr);
REQUIRE(sm.getMesh()->getMeshBufferCount() == 1); REQUIRE(sm.getMesh()->getMeshBufferCount() == 1);
SECTION("vertex coordinates are correct") { SECTION("vertex coordinates are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>( const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(0)->getVertices()); sm.getMesh()->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Pos == irr::core::vector3df{-10.0f, -10.0f, -10.0f}); CHECK(vertices[0].Pos == irr::core::vector3df{-10.0f, -10.0f, -10.0f});
CHECK(vertices[3].Pos == irr::core::vector3df{-10.0f, 10.0f, -10.0f}); CHECK(vertices[3].Pos == irr::core::vector3df{-10.0f, 10.0f, -10.0f});
CHECK(vertices[6].Pos == irr::core::vector3df{-10.0f, -10.0f, 10.0f}); CHECK(vertices[6].Pos == irr::core::vector3df{-10.0f, -10.0f, 10.0f});
CHECK(vertices[9].Pos == irr::core::vector3df{-10.0f, 10.0f, 10.0f}); CHECK(vertices[9].Pos == irr::core::vector3df{-10.0f, 10.0f, 10.0f});
CHECK(vertices[12].Pos == irr::core::vector3df{10.0f, -10.0f, -10.0f}); CHECK(vertices[12].Pos == irr::core::vector3df{10.0f, -10.0f, -10.0f});
CHECK(vertices[15].Pos == irr::core::vector3df{10.0f, 10.0f, -10.0f}); CHECK(vertices[15].Pos == irr::core::vector3df{10.0f, 10.0f, -10.0f});
CHECK(vertices[18].Pos == irr::core::vector3df{10.0f, -10.0f, 10.0f}); CHECK(vertices[18].Pos == irr::core::vector3df{10.0f, -10.0f, 10.0f});
CHECK(vertices[21].Pos == irr::core::vector3df{10.0f, 10.0f, 10.0f}); CHECK(vertices[21].Pos == irr::core::vector3df{10.0f, 10.0f, 10.0f});
} }
SECTION("vertex indices are correct") { SECTION("vertex indices are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 36); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 36);
const auto* indices = reinterpret_cast<irr::u16*>( const auto* indices = reinterpret_cast<irr::u16*>(
sm.getMesh()->getMeshBuffer(0)->getIndices()); sm.getMesh()->getMeshBuffer(0)->getIndices());
CHECK(indices[0] == 16); CHECK(indices[0] == 16);
CHECK(indices[1] == 5); CHECK(indices[1] == 5);
CHECK(indices[2] == 22); CHECK(indices[2] == 22);
CHECK(indices[35] == 0); CHECK(indices[35] == 0);
} }
SECTION("vertex normals are correct") { SECTION("vertex normals are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>( const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(0)->getVertices()); sm.getMesh()->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Normal == irr::core::vector3df{-1.0f, 0.0f, 0.0f}); CHECK(vertices[0].Normal == irr::core::vector3df{-1.0f, 0.0f, 0.0f});
CHECK(vertices[1].Normal == irr::core::vector3df{0.0f, -1.0f, 0.0f}); CHECK(vertices[1].Normal == irr::core::vector3df{0.0f, -1.0f, 0.0f});
CHECK(vertices[2].Normal == irr::core::vector3df{0.0f, 0.0f, -1.0f}); CHECK(vertices[2].Normal == irr::core::vector3df{0.0f, 0.0f, -1.0f});
CHECK(vertices[3].Normal == irr::core::vector3df{-1.0f, 0.0f, 0.0f}); CHECK(vertices[3].Normal == irr::core::vector3df{-1.0f, 0.0f, 0.0f});
CHECK(vertices[6].Normal == irr::core::vector3df{-1.0f, 0.0f, 0.0f}); CHECK(vertices[6].Normal == irr::core::vector3df{-1.0f, 0.0f, 0.0f});
CHECK(vertices[23].Normal == irr::core::vector3df{1.0f, 0.0f, 0.0f}); CHECK(vertices[23].Normal == irr::core::vector3df{1.0f, 0.0f, 0.0f});
} }
SECTION("texture coords are correct") { SECTION("texture coords are correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>( const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(0)->getVertices()); sm.getMesh()->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].TCoords == irr::core::vector2df{0.375f, 1.0f}); CHECK(vertices[0].TCoords == irr::core::vector2df{0.375f, 1.0f});
CHECK(vertices[1].TCoords == irr::core::vector2df{0.125f, 0.25f}); CHECK(vertices[1].TCoords == irr::core::vector2df{0.125f, 0.25f});
CHECK(vertices[2].TCoords == irr::core::vector2df{0.375f, 0.0f}); CHECK(vertices[2].TCoords == irr::core::vector2df{0.375f, 0.0f});
CHECK(vertices[3].TCoords == irr::core::vector2df{0.6250f, 1.0f}); CHECK(vertices[3].TCoords == irr::core::vector2df{0.6250f, 1.0f});
CHECK(vertices[6].TCoords == irr::core::vector2df{0.375f, 0.75f}); CHECK(vertices[6].TCoords == irr::core::vector2df{0.375f, 0.75f});
} }
} }
TEST_CASE("mesh loader returns nullptr when given null file pointer") { TEST_CASE("mesh loader returns nullptr when given null file pointer") {
ScopedMesh sm(nullptr); ScopedMesh sm(nullptr);
CHECK(sm.getMesh() == nullptr); CHECK(sm.getMesh() == nullptr);
} }
TEST_CASE("invalid JSON returns nullptr") { TEST_CASE("invalid JSON returns nullptr") {
ScopedMesh sm("source/Irrlicht/tests/assets/json_missing_brace.gltf"); ScopedMesh sm("source/Irrlicht/tests/assets/json_missing_brace.gltf");
CHECK(sm.getMesh() == nullptr); CHECK(sm.getMesh() == nullptr);
} }
TEST_CASE("blender cube scaled") { TEST_CASE("blender cube scaled") {
ScopedMesh sm("source/Irrlicht/tests/assets/blender_cube_scaled.gltf"); ScopedMesh sm("source/Irrlicht/tests/assets/blender_cube_scaled.gltf");
REQUIRE(sm.getMesh() != nullptr); REQUIRE(sm.getMesh() != nullptr);
REQUIRE(sm.getMesh()->getMeshBufferCount() == 1); REQUIRE(sm.getMesh()->getMeshBufferCount() == 1);
SECTION("Scaling is correct") { SECTION("Scaling is correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>( const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(0)->getVertices()); sm.getMesh()->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Pos == irr::core::vector3df{-150.0f, -1.0f, -21.5f}); CHECK(vertices[0].Pos == irr::core::vector3df{-150.0f, -1.0f, -21.5f});
CHECK(vertices[3].Pos == irr::core::vector3df{-150.0f, 1.0f, -21.5f}); CHECK(vertices[3].Pos == irr::core::vector3df{-150.0f, 1.0f, -21.5f});
CHECK(vertices[6].Pos == irr::core::vector3df{-150.0f, -1.0f, 21.5f}); CHECK(vertices[6].Pos == irr::core::vector3df{-150.0f, -1.0f, 21.5f});
CHECK(vertices[9].Pos == irr::core::vector3df{-150.0f, 1.0f, 21.5f}); CHECK(vertices[9].Pos == irr::core::vector3df{-150.0f, 1.0f, 21.5f});
CHECK(vertices[12].Pos == irr::core::vector3df{150.0f, -1.0f, -21.5f}); CHECK(vertices[12].Pos == irr::core::vector3df{150.0f, -1.0f, -21.5f});
CHECK(vertices[15].Pos == irr::core::vector3df{150.0f, 1.0f, -21.5f}); CHECK(vertices[15].Pos == irr::core::vector3df{150.0f, 1.0f, -21.5f});
CHECK(vertices[18].Pos == irr::core::vector3df{150.0f, -1.0f, 21.5f}); CHECK(vertices[18].Pos == irr::core::vector3df{150.0f, -1.0f, 21.5f});
CHECK(vertices[21].Pos == irr::core::vector3df{150.0f, 1.0f, 21.5f}); CHECK(vertices[21].Pos == irr::core::vector3df{150.0f, 1.0f, 21.5f});
} }
} }
TEST_CASE("blender cube matrix transform") { TEST_CASE("blender cube matrix transform") {
ScopedMesh sm("source/Irrlicht/tests/assets/blender_cube_matrix_transform.gltf"); ScopedMesh sm("source/Irrlicht/tests/assets/blender_cube_matrix_transform.gltf");
REQUIRE(sm.getMesh() != nullptr); REQUIRE(sm.getMesh() != nullptr);
REQUIRE(sm.getMesh()->getMeshBufferCount() == 1); REQUIRE(sm.getMesh()->getMeshBufferCount() == 1);
SECTION("Transformation is correct") { SECTION("Transformation is correct") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>( const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(0)->getVertices()); sm.getMesh()->getMeshBuffer(0)->getVertices());
const auto checkVertex = [&](const std::size_t i, irr::core::vector3df vec) { const auto checkVertex = [&](const std::size_t i, irr::core::vector3df vec) {
// The transform scales by (1, 2, 3) and translates by (4, 5, 6). // The transform scales by (1, 2, 3) and translates by (4, 5, 6).
CHECK(vertices[i].Pos == vec * irr::core::vector3df{1, 2, 3} CHECK(vertices[i].Pos == vec * irr::core::vector3df{1, 2, 3}
// The -6 is due to the coordinate system conversion. // The -6 is due to the coordinate system conversion.
+ irr::core::vector3df{4, 5, -6}); + irr::core::vector3df{4, 5, -6});
}; };
checkVertex(0, irr::core::vector3df{-1, -1, -1}); checkVertex(0, irr::core::vector3df{-1, -1, -1});
checkVertex(3, irr::core::vector3df{-1, 1, -1}); checkVertex(3, irr::core::vector3df{-1, 1, -1});
checkVertex(6, irr::core::vector3df{-1, -1, 1}); checkVertex(6, irr::core::vector3df{-1, -1, 1});
checkVertex(9, irr::core::vector3df{-1, 1, 1}); checkVertex(9, irr::core::vector3df{-1, 1, 1});
checkVertex(12, irr::core::vector3df{1, -1, -1}); checkVertex(12, irr::core::vector3df{1, -1, -1});
checkVertex(15, irr::core::vector3df{1, 1, -1}); checkVertex(15, irr::core::vector3df{1, 1, -1});
checkVertex(18, irr::core::vector3df{1, -1, 1}); checkVertex(18, irr::core::vector3df{1, -1, 1});
checkVertex(21, irr::core::vector3df{1, 1, 1}); checkVertex(21, irr::core::vector3df{1, 1, 1});
} }
} }
TEST_CASE("snow man") { TEST_CASE("snow man") {
ScopedMesh sm("source/Irrlicht/tests/assets/snow_man.gltf"); ScopedMesh sm("source/Irrlicht/tests/assets/snow_man.gltf");
REQUIRE(sm.getMesh() != nullptr); REQUIRE(sm.getMesh() != nullptr);
REQUIRE(sm.getMesh()->getMeshBufferCount() == 3); REQUIRE(sm.getMesh()->getMeshBufferCount() == 3);
SECTION("vertex coordinates are correct for all buffers") { SECTION("vertex coordinates are correct for all buffers") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>( const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(0)->getVertices()); sm.getMesh()->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Pos == irr::core::vector3df{3.0f, 24.0f, -3.0f}); CHECK(vertices[0].Pos == irr::core::vector3df{3.0f, 24.0f, -3.0f});
CHECK(vertices[3].Pos == irr::core::vector3df{3.0f, 18.0f, 3.0f}); CHECK(vertices[3].Pos == irr::core::vector3df{3.0f, 18.0f, 3.0f});
CHECK(vertices[6].Pos == irr::core::vector3df{-3.0f, 18.0f, -3.0f}); CHECK(vertices[6].Pos == irr::core::vector3df{-3.0f, 18.0f, -3.0f});
CHECK(vertices[9].Pos == irr::core::vector3df{3.0f, 24.0f, 3.0f}); CHECK(vertices[9].Pos == irr::core::vector3df{3.0f, 24.0f, 3.0f});
CHECK(vertices[12].Pos == irr::core::vector3df{3.0f, 18.0f, -3.0f}); CHECK(vertices[12].Pos == irr::core::vector3df{3.0f, 18.0f, -3.0f});
CHECK(vertices[15].Pos == irr::core::vector3df{-3.0f, 18.0f, 3.0f}); CHECK(vertices[15].Pos == irr::core::vector3df{-3.0f, 18.0f, 3.0f});
CHECK(vertices[18].Pos == irr::core::vector3df{3.0f, 18.0f, -3.0f}); CHECK(vertices[18].Pos == irr::core::vector3df{3.0f, 18.0f, -3.0f});
CHECK(vertices[21].Pos == irr::core::vector3df{3.0f, 18.0f, 3.0f}); CHECK(vertices[21].Pos == irr::core::vector3df{3.0f, 18.0f, 3.0f});
vertices = reinterpret_cast<irr::video::S3DVertex*>( vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(1)->getVertices()); sm.getMesh()->getMeshBuffer(1)->getVertices());
CHECK(vertices[2].Pos == irr::core::vector3df{5.0f, 10.0f, 5.0f}); CHECK(vertices[2].Pos == irr::core::vector3df{5.0f, 10.0f, 5.0f});
CHECK(vertices[3].Pos == irr::core::vector3df{5.0f, 0.0f, 5.0f}); CHECK(vertices[3].Pos == irr::core::vector3df{5.0f, 0.0f, 5.0f});
CHECK(vertices[7].Pos == irr::core::vector3df{-5.0f, 0.0f, 5.0f}); CHECK(vertices[7].Pos == irr::core::vector3df{-5.0f, 0.0f, 5.0f});
CHECK(vertices[8].Pos == irr::core::vector3df{5.0f, 10.0f, -5.0f}); CHECK(vertices[8].Pos == irr::core::vector3df{5.0f, 10.0f, -5.0f});
CHECK(vertices[14].Pos == irr::core::vector3df{5.0f, 0.0f, 5.0f}); CHECK(vertices[14].Pos == irr::core::vector3df{5.0f, 0.0f, 5.0f});
CHECK(vertices[16].Pos == irr::core::vector3df{5.0f, 10.0f, -5.0f}); CHECK(vertices[16].Pos == irr::core::vector3df{5.0f, 10.0f, -5.0f});
CHECK(vertices[22].Pos == irr::core::vector3df{-5.0f, 10.0f, 5.0f}); CHECK(vertices[22].Pos == irr::core::vector3df{-5.0f, 10.0f, 5.0f});
CHECK(vertices[23].Pos == irr::core::vector3df{-5.0f, 0.0f, 5.0f}); CHECK(vertices[23].Pos == irr::core::vector3df{-5.0f, 0.0f, 5.0f});
vertices = reinterpret_cast<irr::video::S3DVertex*>( vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(2)->getVertices()); sm.getMesh()->getMeshBuffer(2)->getVertices());
CHECK(vertices[1].Pos == irr::core::vector3df{4.0f, 10.0f, -4.0f}); CHECK(vertices[1].Pos == irr::core::vector3df{4.0f, 10.0f, -4.0f});
CHECK(vertices[2].Pos == irr::core::vector3df{4.0f, 18.0f, 4.0f}); CHECK(vertices[2].Pos == irr::core::vector3df{4.0f, 18.0f, 4.0f});
CHECK(vertices[3].Pos == irr::core::vector3df{4.0f, 10.0f, 4.0f}); CHECK(vertices[3].Pos == irr::core::vector3df{4.0f, 10.0f, 4.0f});
CHECK(vertices[10].Pos == irr::core::vector3df{-4.0f, 18.0f, -4.0f}); CHECK(vertices[10].Pos == irr::core::vector3df{-4.0f, 18.0f, -4.0f});
CHECK(vertices[11].Pos == irr::core::vector3df{-4.0f, 18.0f, 4.0f}); CHECK(vertices[11].Pos == irr::core::vector3df{-4.0f, 18.0f, 4.0f});
CHECK(vertices[12].Pos == irr::core::vector3df{4.0f, 10.0f, -4.0f}); CHECK(vertices[12].Pos == irr::core::vector3df{4.0f, 10.0f, -4.0f});
CHECK(vertices[17].Pos == irr::core::vector3df{-4.0f, 18.0f, -4.0f}); CHECK(vertices[17].Pos == irr::core::vector3df{-4.0f, 18.0f, -4.0f});
CHECK(vertices[18].Pos == irr::core::vector3df{4.0f, 10.0f, -4.0f}); CHECK(vertices[18].Pos == irr::core::vector3df{4.0f, 10.0f, -4.0f});
} }
SECTION("vertex indices are correct for all buffers") { SECTION("vertex indices are correct for all buffers") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 36); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 36);
const auto* indices = reinterpret_cast<irr::u16*>( const auto* indices = reinterpret_cast<irr::u16*>(
sm.getMesh()->getMeshBuffer(0)->getIndices()); sm.getMesh()->getMeshBuffer(0)->getIndices());
CHECK(indices[0] == 23); CHECK(indices[0] == 23);
CHECK(indices[1] == 21); CHECK(indices[1] == 21);
CHECK(indices[2] == 22); CHECK(indices[2] == 22);
CHECK(indices[35] == 2); CHECK(indices[35] == 2);
REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36); REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36);
indices = reinterpret_cast<irr::u16*>( indices = reinterpret_cast<irr::u16*>(
sm.getMesh()->getMeshBuffer(1)->getIndices()); sm.getMesh()->getMeshBuffer(1)->getIndices());
CHECK(indices[10] == 16); CHECK(indices[10] == 16);
CHECK(indices[11] == 18); CHECK(indices[11] == 18);
CHECK(indices[15] == 13); CHECK(indices[15] == 13);
CHECK(indices[27] == 5); CHECK(indices[27] == 5);
REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36); REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36);
indices = reinterpret_cast<irr::u16*>( indices = reinterpret_cast<irr::u16*>(
sm.getMesh()->getMeshBuffer(2)->getIndices()); sm.getMesh()->getMeshBuffer(2)->getIndices());
CHECK(indices[26] == 6); CHECK(indices[26] == 6);
CHECK(indices[27] == 5); CHECK(indices[27] == 5);
CHECK(indices[29] == 6); CHECK(indices[29] == 6);
CHECK(indices[32] == 2); CHECK(indices[32] == 2);
} }
SECTION("vertex normals are correct for all buffers") { SECTION("vertex normals are correct for all buffers") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>( const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(0)->getVertices()); sm.getMesh()->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f}); CHECK(vertices[0].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
CHECK(vertices[1].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f}); CHECK(vertices[1].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
CHECK(vertices[2].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f}); CHECK(vertices[2].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
CHECK(vertices[3].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f}); CHECK(vertices[3].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
CHECK(vertices[6].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f}); CHECK(vertices[6].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f});
CHECK(vertices[23].Normal == irr::core::vector3df{0.0f, 0.0f, 1.0f}); CHECK(vertices[23].Normal == irr::core::vector3df{0.0f, 0.0f, 1.0f});
vertices = reinterpret_cast<irr::video::S3DVertex*>( vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(1)->getVertices()); sm.getMesh()->getMeshBuffer(1)->getVertices());
CHECK(vertices[0].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f}); CHECK(vertices[0].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
CHECK(vertices[1].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f}); CHECK(vertices[1].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
CHECK(vertices[3].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f}); CHECK(vertices[3].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
CHECK(vertices[6].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f}); CHECK(vertices[6].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f});
CHECK(vertices[7].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f}); CHECK(vertices[7].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f});
CHECK(vertices[22].Normal == irr::core::vector3df{0.0f, 0.0f, 1.0f}); CHECK(vertices[22].Normal == irr::core::vector3df{0.0f, 0.0f, 1.0f});
vertices = reinterpret_cast<irr::video::S3DVertex*>( vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(2)->getVertices()); sm.getMesh()->getMeshBuffer(2)->getVertices());
CHECK(vertices[3].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f}); CHECK(vertices[3].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
CHECK(vertices[4].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f}); CHECK(vertices[4].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f});
CHECK(vertices[5].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f}); CHECK(vertices[5].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f});
CHECK(vertices[10].Normal == irr::core::vector3df{0.0f, 1.0f, -0.0f}); CHECK(vertices[10].Normal == irr::core::vector3df{0.0f, 1.0f, -0.0f});
CHECK(vertices[11].Normal == irr::core::vector3df{0.0f, 1.0f, -0.0f}); CHECK(vertices[11].Normal == irr::core::vector3df{0.0f, 1.0f, -0.0f});
CHECK(vertices[19].Normal == irr::core::vector3df{0.0f, 0.0f, -1.0f}); CHECK(vertices[19].Normal == irr::core::vector3df{0.0f, 0.0f, -1.0f});
} }
SECTION("texture coords are correct for all buffers") { SECTION("texture coords are correct for all buffers") {
REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>( const auto* vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(0)->getVertices()); sm.getMesh()->getMeshBuffer(0)->getVertices());
CHECK(vertices[0].TCoords == irr::core::vector2df{0.583333, 0.791667}); CHECK(vertices[0].TCoords == irr::core::vector2df{0.583333, 0.791667});
CHECK(vertices[1].TCoords == irr::core::vector2df{0.583333, 0.666667}); CHECK(vertices[1].TCoords == irr::core::vector2df{0.583333, 0.666667});
CHECK(vertices[2].TCoords == irr::core::vector2df{0.708333, 0.791667}); CHECK(vertices[2].TCoords == irr::core::vector2df{0.708333, 0.791667});
CHECK(vertices[5].TCoords == irr::core::vector2df{0.375, 0.416667}); CHECK(vertices[5].TCoords == irr::core::vector2df{0.375, 0.416667});
CHECK(vertices[6].TCoords == irr::core::vector2df{0.5, 0.291667}); CHECK(vertices[6].TCoords == irr::core::vector2df{0.5, 0.291667});
CHECK(vertices[19].TCoords == irr::core::vector2df{0.708333, 0.75}); CHECK(vertices[19].TCoords == irr::core::vector2df{0.708333, 0.75});
vertices = reinterpret_cast<irr::video::S3DVertex*>( vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(1)->getVertices()); sm.getMesh()->getMeshBuffer(1)->getVertices());
CHECK(vertices[1].TCoords == irr::core::vector2df{0, 0.791667}); CHECK(vertices[1].TCoords == irr::core::vector2df{0, 0.791667});
CHECK(vertices[4].TCoords == irr::core::vector2df{0.208333, 0.791667}); CHECK(vertices[4].TCoords == irr::core::vector2df{0.208333, 0.791667});
CHECK(vertices[5].TCoords == irr::core::vector2df{0, 0.791667}); CHECK(vertices[5].TCoords == irr::core::vector2df{0, 0.791667});
CHECK(vertices[6].TCoords == irr::core::vector2df{0.208333, 0.583333}); CHECK(vertices[6].TCoords == irr::core::vector2df{0.208333, 0.583333});
CHECK(vertices[12].TCoords == irr::core::vector2df{0.416667, 0.791667}); CHECK(vertices[12].TCoords == irr::core::vector2df{0.416667, 0.791667});
CHECK(vertices[15].TCoords == irr::core::vector2df{0.208333, 0.583333}); CHECK(vertices[15].TCoords == irr::core::vector2df{0.208333, 0.583333});
vertices = reinterpret_cast<irr::video::S3DVertex*>( vertices = reinterpret_cast<irr::video::S3DVertex*>(
sm.getMesh()->getMeshBuffer(2)->getVertices()); sm.getMesh()->getMeshBuffer(2)->getVertices());
CHECK(vertices[10].TCoords == irr::core::vector2df{0.375, 0.416667}); CHECK(vertices[10].TCoords == irr::core::vector2df{0.375, 0.416667});
CHECK(vertices[11].TCoords == irr::core::vector2df{0.375, 0.583333}); CHECK(vertices[11].TCoords == irr::core::vector2df{0.375, 0.583333});
CHECK(vertices[12].TCoords == irr::core::vector2df{0.708333, 0.625}); CHECK(vertices[12].TCoords == irr::core::vector2df{0.708333, 0.625});
CHECK(vertices[17].TCoords == irr::core::vector2df{0.541667, 0.458333}); CHECK(vertices[17].TCoords == irr::core::vector2df{0.541667, 0.458333});
CHECK(vertices[20].TCoords == irr::core::vector2df{0.208333, 0.416667}); CHECK(vertices[20].TCoords == irr::core::vector2df{0.208333, 0.416667});
CHECK(vertices[22].TCoords == irr::core::vector2df{0.375, 0.416667}); CHECK(vertices[22].TCoords == irr::core::vector2df{0.375, 0.416667});
} }
} }