From a73e6895d8ec3705961db09018740043438fe6b3 Mon Sep 17 00:00:00 2001 From: jordan4ibanez Date: Mon, 30 Jan 2023 21:36:53 -0500 Subject: [PATCH] spaces->tabs --- source/Irrlicht/CGLTFMeshFileLoader.cpp | 8 +- .../tests/testCGLTFMeshFileLoader.cpp | 120 +++++++++--------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/source/Irrlicht/CGLTFMeshFileLoader.cpp b/source/Irrlicht/CGLTFMeshFileLoader.cpp index 83c0eaf5a..0fc67b0ba 100644 --- a/source/Irrlicht/CGLTFMeshFileLoader.cpp +++ b/source/Irrlicht/CGLTFMeshFileLoader.cpp @@ -260,17 +260,17 @@ IAnimatedMesh* CGLTFMeshFileLoader::createMesh(io::IReadFile* file) // This is used to copy data into the vertexBuffer Span verticesBuffer{vertexBuffer,vertices_count}; // Create dynamic indices buffer so it's easier to work with. - // Preallocate needed resources to boost game startup speed + // Preallocate needed resources to boost game startup speed std::vector indicesBuffer(model.accessors[ - indicesAccessorId].count); + indicesAccessorId].count); getIndices(model, indicesAccessorId, indicesBuffer); getVertices(model, positionAccessorId, verticesBuffer, mesh_index, primitive_index); - // Inverse the order of indices due to the axis of the model being + // Inverse the order of indices due to the axis of the model being // inverted when going from left handed to right handed coordinates - std::reverse(indicesBuffer.begin(),indicesBuffer.end()); + std::reverse(indicesBuffer.begin(),indicesBuffer.end()); // Create the mesh buffer SMeshBuffer* meshbuf { new SMeshBuffer {} }; diff --git a/source/Irrlicht/tests/testCGLTFMeshFileLoader.cpp b/source/Irrlicht/tests/testCGLTFMeshFileLoader.cpp index 78bc82d34..d960e8609 100644 --- a/source/Irrlicht/tests/testCGLTFMeshFileLoader.cpp +++ b/source/Irrlicht/tests/testCGLTFMeshFileLoader.cpp @@ -141,7 +141,7 @@ TEST_CASE("snow man") { REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); const auto* vertices = reinterpret_cast( sm.getMesh()->getMeshBuffer(0)->getVertices()); - + 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[6].Pos == irr::core::vector3df{-3.0f, 18.0f, -3.0f}); @@ -150,11 +150,11 @@ TEST_CASE("snow man") { 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[21].Pos == irr::core::vector3df{3.0f, 18.0f, 3.0f}); - - vertices = reinterpret_cast( + + vertices = reinterpret_cast( 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[7].Pos == irr::core::vector3df{-5.0f, 0.0f, 5.0f}); CHECK(vertices[8].Pos == irr::core::vector3df{5.0f, 10.0f, -5.0f}); @@ -163,17 +163,17 @@ TEST_CASE("snow man") { 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}); - vertices = reinterpret_cast( + vertices = reinterpret_cast( sm.getMesh()->getMeshBuffer(2)->getVertices()); - - 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[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[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[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[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[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[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[17].Pos == irr::core::vector3df{-4.0f, 18.0f, -4.0f}); + CHECK(vertices[18].Pos == irr::core::vector3df{4.0f, 10.0f, -4.0f}); } SECTION("vertex indices are correct for all buffers") { @@ -185,7 +185,7 @@ TEST_CASE("snow man") { CHECK(indices[2] == 22); CHECK(indices[35] == 2); - REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36); + REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36); indices = reinterpret_cast( sm.getMesh()->getMeshBuffer(1)->getIndices()); CHECK(indices[10] == 16); @@ -193,7 +193,7 @@ TEST_CASE("snow man") { CHECK(indices[15] == 13); CHECK(indices[27] == 5); - REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36); + REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36); indices = reinterpret_cast( sm.getMesh()->getMeshBuffer(2)->getIndices()); CHECK(indices[26] == 6); @@ -202,72 +202,72 @@ TEST_CASE("snow man") { CHECK(indices[32] == 2); } - + SECTION("vertex normals are correct for all buffers") { REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); const auto* vertices = reinterpret_cast( sm.getMesh()->getMeshBuffer(0)->getVertices()); 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[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[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[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[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[23].Normal == irr::core::vector3df{0.0f, 0.0f, 1.0f}); - vertices = reinterpret_cast( + vertices = reinterpret_cast( sm.getMesh()->getMeshBuffer(1)->getVertices()); - - 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[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[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[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[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[7].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f}); + CHECK(vertices[22].Normal == irr::core::vector3df{0.0f, 0.0f, 1.0f}); - vertices = reinterpret_cast( + vertices = reinterpret_cast( sm.getMesh()->getMeshBuffer(2)->getVertices()); - 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[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[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[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[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[11].Normal == irr::core::vector3df{0.0f, 1.0f, -0.0f}); + CHECK(vertices[19].Normal == irr::core::vector3df{0.0f, 0.0f, -1.0f}); } - + SECTION("texture coords are correct for all buffers") { REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24); const auto* vertices = reinterpret_cast( sm.getMesh()->getMeshBuffer(0)->getVertices()); - CHECK(vertices[0].TCoords == irr::core::vector2df{0.583333, 0.791667}); - CHECK(vertices[1].TCoords == irr::core::vector2df{0.583333, 0.666667}); - CHECK(vertices[2].TCoords == irr::core::vector2df{0.708333, 0.791667}); - CHECK(vertices[5].TCoords == irr::core::vector2df{0.375, 0.416667}); - CHECK(vertices[6].TCoords == irr::core::vector2df{0.5, 0.291667}); - CHECK(vertices[19].TCoords == irr::core::vector2df{0.708333, 0.75}); + CHECK(vertices[0].TCoords == irr::core::vector2df{0.583333, 0.791667}); + CHECK(vertices[1].TCoords == irr::core::vector2df{0.583333, 0.666667}); + CHECK(vertices[2].TCoords == irr::core::vector2df{0.708333, 0.791667}); + CHECK(vertices[5].TCoords == irr::core::vector2df{0.375, 0.416667}); + CHECK(vertices[6].TCoords == irr::core::vector2df{0.5, 0.291667}); + CHECK(vertices[19].TCoords == irr::core::vector2df{0.708333, 0.75}); - vertices = reinterpret_cast( + vertices = reinterpret_cast( sm.getMesh()->getMeshBuffer(1)->getVertices()); - - CHECK(vertices[1].TCoords == irr::core::vector2df{0, 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[6].TCoords == irr::core::vector2df{0.208333, 0.583333}); - CHECK(vertices[12].TCoords == irr::core::vector2df{0.416667, 0.791667}); - CHECK(vertices[15].TCoords == irr::core::vector2df{0.208333, 0.583333}); - vertices = reinterpret_cast( + CHECK(vertices[1].TCoords == irr::core::vector2df{0, 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[6].TCoords == irr::core::vector2df{0.208333, 0.583333}); + CHECK(vertices[12].TCoords == irr::core::vector2df{0.416667, 0.791667}); + CHECK(vertices[15].TCoords == irr::core::vector2df{0.208333, 0.583333}); + + vertices = reinterpret_cast( sm.getMesh()->getMeshBuffer(2)->getVertices()); - CHECK(vertices[10].TCoords == irr::core::vector2df{0.375, 0.416667}); - CHECK(vertices[11].TCoords == irr::core::vector2df{0.375, 0.583333}); - CHECK(vertices[12].TCoords == irr::core::vector2df{0.708333, 0.625}); - CHECK(vertices[17].TCoords == irr::core::vector2df{0.541667, 0.458333}); - CHECK(vertices[20].TCoords == irr::core::vector2df{0.208333, 0.416667}); - CHECK(vertices[22].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[12].TCoords == irr::core::vector2df{0.708333, 0.625}); + CHECK(vertices[17].TCoords == irr::core::vector2df{0.541667, 0.458333}); + CHECK(vertices[20].TCoords == irr::core::vector2df{0.208333, 0.416667}); + CHECK(vertices[22].TCoords == irr::core::vector2df{0.375, 0.416667}); } } \ No newline at end of file