From 729882debba7c01ac0c7992eb9c84a178d01511c Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 11 Aug 2020 19:57:36 +0200 Subject: [PATCH 1/6] Fix incorrect index closes https://github.com/assimp/assimp/issues/3364 --- code/Common/StandardShapes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Common/StandardShapes.cpp b/code/Common/StandardShapes.cpp index b30fa2e25..99029a925 100644 --- a/code/Common/StandardShapes.cpp +++ b/code/Common/StandardShapes.cpp @@ -139,7 +139,7 @@ aiMesh *StandardShapes::MakeMesh(const std::vector &positions, aiFace &f = out->mFaces[i]; f.mNumIndices = numIndices; f.mIndices = new unsigned int[numIndices]; - for (unsigned int j = 0; i < numIndices; ++i, ++a) { + for (unsigned int j = 0; j < numIndices; ++j, ++a) { f.mIndices[j] = a; } } From 153a6efecc3de7d090b577f9c0391f39e1a9a3c1 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 11 Aug 2020 20:02:14 +0200 Subject: [PATCH 2/6] Add test --- test/unit/Common/utStandardShapes.cpp | 54 +++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 test/unit/Common/utStandardShapes.cpp diff --git a/test/unit/Common/utStandardShapes.cpp b/test/unit/Common/utStandardShapes.cpp new file mode 100644 index 000000000..2a6d30651 --- /dev/null +++ b/test/unit/Common/utStandardShapes.cpp @@ -0,0 +1,54 @@ +/* +Open Asset Import Library (assimp) +---------------------------------------------------------------------- +Copyright (c) 2006-2020, assimp team +All rights reserved. +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the +following conditions are met: +* Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. +* Neither the name of the assimp team, nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior + written permission of the assimp team. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +---------------------------------------------------------------------- +*/#include "UnitTestPCH.h" +#include + +using namespace Assimp; + +class utStandardShapes : public ::testing::Test { + // empty +}; + +TEST_F( utStandardShapes, testMakeMesh ) { + // Make sphere positions + std::vector positions; + Assimp::StandardShapes::MakeSphere(1, positions); + + // Make mesh + const auto numIndicesPerPrimitive = 3; + auto aiMeshPtr = Assimp::StandardShapes::MakeMesh(positions, numIndicesPerPrimitive); + + // The mNumIndices member of the second face is now incorrect + const auto& face = aiMeshPtr->mFaces[0]; + EXPECT_EQ(face.mNumIndices, numIndicesPerPrimitive); +} + From 45f76f36f3ad1f093ce048cff0bbd135f0e35387 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 11 Aug 2020 20:03:23 +0200 Subject: [PATCH 3/6] Add test to CMakeLists --- test/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ff4d51d78..5a150482d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -2,8 +2,7 @@ # ---------------------------------------------------------------------- # # Copyright (c) 2006-2020, assimp team - - +# # All rights reserved. # # Redistribution and use of this software in source and binary forms, @@ -40,8 +39,8 @@ cmake_minimum_required( VERSION 3.0 ) INCLUDE_DIRECTORIES( - ${Assimp_SOURCE_DIR}/contrib/gtest/include - ${Assimp_SOURCE_DIR}/contrib/gtest/ + ${Assimp_SOURCE_DIR}/contrib/gtest/include + ${Assimp_SOURCE_DIR}/contrib/gtest/ ${Assimp_SOURCE_DIR}/test/unit ${Assimp_SOURCE_DIR}/include ${Assimp_SOURCE_DIR}/code @@ -84,6 +83,7 @@ SET( COMMON unit/utProfiler.cpp unit/utSharedPPData.cpp unit/utStringUtils.cpp + unit/Common/utStandardShapes.cpp unit/Common/uiScene.cpp unit/Common/utLineSplitter.cpp unit/Common/utSpatialSort.cpp From 9bad20e99e27bafd3574ebf998d21be40214d717 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 11 Aug 2020 20:03:30 +0200 Subject: [PATCH 4/6] Add test to CMakeLists From b1b9fa94cfcca5706bcde81a2410c81809d70e7e Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 11 Aug 2020 20:21:35 +0200 Subject: [PATCH 5/6] Update utStandardShapes.cpp --- test/unit/Common/utStandardShapes.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/unit/Common/utStandardShapes.cpp b/test/unit/Common/utStandardShapes.cpp index 2a6d30651..8b333b08d 100644 --- a/test/unit/Common/utStandardShapes.cpp +++ b/test/unit/Common/utStandardShapes.cpp @@ -29,7 +29,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- -*/#include "UnitTestPCH.h" +*/ +#include "UnitTestPCH.h" +#include #include using namespace Assimp; From 1bbae197792549269149a1a261d1c361cf8adcd7 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 11 Aug 2020 20:28:12 +0200 Subject: [PATCH 6/6] Fix leak --- test/unit/Common/utStandardShapes.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unit/Common/utStandardShapes.cpp b/test/unit/Common/utStandardShapes.cpp index 8b333b08d..8469fecd6 100644 --- a/test/unit/Common/utStandardShapes.cpp +++ b/test/unit/Common/utStandardShapes.cpp @@ -47,10 +47,11 @@ TEST_F( utStandardShapes, testMakeMesh ) { // Make mesh const auto numIndicesPerPrimitive = 3; - auto aiMeshPtr = Assimp::StandardShapes::MakeMesh(positions, numIndicesPerPrimitive); + aiMesh *aiMeshPtr = Assimp::StandardShapes::MakeMesh(positions, numIndicesPerPrimitive); // The mNumIndices member of the second face is now incorrect const auto& face = aiMeshPtr->mFaces[0]; EXPECT_EQ(face.mNumIndices, numIndicesPerPrimitive); + delete aiMeshPtr; }