Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reformat unittests.

Browse Source
This commit is contained in:
Kim Kulling
2020-03-22 12:13:09 +01:00
parent edc73552cd
commit 68a9fa2df3
77 changed files with 2555 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test/unit/utTriangulate.cpp
View File

@@ -44,7 +44,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "PostProcessing/TriangulateProcess.h"
using namespace std;
using namespace Assimp;
@@ -54,8 +53,8 @@ public:
virtual void TearDown();
protected:
aiMesh* pcMesh;
TriangulateProcess* piProcess;
aiMesh *pcMesh;
TriangulateProcess *piProcess;
};
void TriangulateProcessTest::SetUp() {
@@ -67,27 +66,27 @@ void TriangulateProcessTest::SetUp() {
pcMesh->mVertices = new aiVector3D[10000];
pcMesh->mPrimitiveTypes = aiPrimitiveType_POINT | aiPrimitiveType_LINE |
aiPrimitiveType_LINE | aiPrimitiveType_POLYGON;
aiPrimitiveType_LINE | aiPrimitiveType_POLYGON;
for (unsigned int m = 0, t = 0, q = 4; m < 1000; ++m) {
++t;
aiFace& face = pcMesh->mFaces[m];
aiFace &face = pcMesh->mFaces[m];
face.mNumIndices = t;
if (4 == t) {
face.mNumIndices = q++;
t = 0;
if (10 == q)q = 4;
if (10 == q) q = 4;
}
face.mIndices = new unsigned int[face.mNumIndices];
for (unsigned int p = 0; p < face.mNumIndices; ++p) {
face.mIndices[ p ] = pcMesh->mNumVertices;
face.mIndices[p] = pcMesh->mNumVertices;
// construct fully convex input data in ccw winding, xy plane
aiVector3D& v = pcMesh->mVertices[pcMesh->mNumVertices++];
aiVector3D &v = pcMesh->mVertices[pcMesh->mNumVertices++];
v.z = 0.f;
v.x = cos (p * (float)(AI_MATH_TWO_PI)/face.mNumIndices);
v.y = sin (p * (float)(AI_MATH_TWO_PI)/face.mNumIndices);
v.x = cos(p * (float)(AI_MATH_TWO_PI) / face.mNumIndices);
v.y = sin(p * (float)(AI_MATH_TWO_PI) / face.mNumIndices);
}
}
}
@@ -100,17 +99,17 @@ void TriangulateProcessTest::TearDown() {
TEST_F(TriangulateProcessTest, testTriangulation) {
piProcess->TriangulateMesh(pcMesh);
for (unsigned int m = 0, t = 0, q = 4, max = 1000, idx = 0; m < max;++m) {
for (unsigned int m = 0, t = 0, q = 4, max = 1000, idx = 0; m < max; ++m) {
++t;
aiFace& face = pcMesh->mFaces[m];
aiFace &face = pcMesh->mFaces[m];
if (4 == t) {
t = 0;
max += q-3;
max += q - 3;
std::vector<bool> ait(q,false);
std::vector<bool> ait(q, false);
for (unsigned int i = 0, tt = q-2; i < tt; ++i,++m) {
aiFace& curFace = pcMesh->mFaces[m];
for (unsigned int i = 0, tt = q - 2; i < tt; ++i, ++m) {
aiFace &curFace = pcMesh->mFaces[m];
EXPECT_EQ(3U, curFace.mNumIndices);
for (unsigned int qqq = 0; qqq < curFace.mNumIndices; ++qqq) {
@@ -121,14 +120,14 @@ TEST_F(TriangulateProcessTest, testTriangulation) {
EXPECT_TRUE(*it);
}
--m;
idx+=q;
if ( ++q == 10 ) {
idx += q;
if (++q == 10) {
q = 4;
}
} else {
EXPECT_EQ(t, face.mNumIndices);
for (unsigned int i = 0; i < face.mNumIndices; ++i,++idx) {
for (unsigned int i = 0; i < face.mNumIndices; ++i, ++idx) {
EXPECT_EQ(idx, face.mIndices[i]);
}
}
@@ -137,4 +136,3 @@ TEST_F(TriangulateProcessTest, testTriangulation) {
// we should have no valid normal vectors now necause we aren't a pure polygon mesh
EXPECT_TRUE(pcMesh->mNormals == NULL);
}