diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates-fuzzy.obj b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates-fuzzy.obj index f3f2acd4c..24145e037 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates-fuzzy.obj +++ b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates-fuzzy.obj @@ -1,10 +1,10 @@ -# 1 4--6 +# 3 4--6 # |\ \ | # | \ \| -# 2--3 5 -v -1 1 0 +# 1--2 5 v -1 -1 0 v 1 -1 0 +v -1 1 0 f 1 2 3 v -0.9 0.9 0 v 0.9 -0.9 0 diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates.obj b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates.obj index 9c6d005ff..5ac2cd76a 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates.obj +++ b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates.obj @@ -1,10 +1,10 @@ -# 1 4--6 +# 3 4--6 # |\ \ | # | \ \| -# 2--3 5 -v -1 1 0 +# 1--2 5 v -1 -1 0 v 1 -1 0 +v -1 1 0 f 1 2 3 v -1 1 0 v 1 -1 0 diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates.ply b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates.ply index aa319b344..2771bedf8 100644 Binary files a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates.ply and b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-duplicates.ply differ diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-normals-texcoords.obj b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-normals-texcoords.obj index e96d09630..b8e08f5e5 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-normals-texcoords.obj +++ b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad-normals-texcoords.obj @@ -1,12 +1,12 @@ -# 1 1--4 +# 3 3--4 # |\ \ | # | \ \| -# 2--3 3 -v -1 1 0 +# 1--2 2 v -1 -1 0 v 1 -1 0 +v -1 1 0 v 1 1 0 vn 0 0 1 vt 0 0 f 1/1/1 2/1/1 3/1/1 -f 1/1/1 3/1/1 4/1/1 +f 3/1/1 2/1/1 4/1/1 diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad.obj b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad.obj index a552bb87c..31d1de191 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad.obj +++ b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad.obj @@ -1,10 +1,10 @@ -# 1 1--4 +# 3 3--4 # |\ \ | # | \ \| -# 2--3 3 -v -1 1 0 +# 1--2 2 v -1 -1 0 v 1 -1 0 +v -1 1 0 v 1 1 0 f 1 2 3 -f 1 3 4 +f 3 2 4 diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad.ply b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad.ply index e36655e07..ddec9ad72 100644 Binary files a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad.ply and b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/quad.ply differ diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles-transformed.bin b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles-transformed.bin index 84f5a85a4..85aa2f617 100644 Binary files a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles-transformed.bin and b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles-transformed.bin differ diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles-transformed.bin.in b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles-transformed.bin.in index 9845ee6e9..b9055d78d 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles-transformed.bin.in +++ b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles-transformed.bin.in @@ -1,9 +1,14 @@ # Like two-triangles.obj, but the second triangle moved 10 units on Y type = "3f3f3f 3f3f3f" input = [ - -1, 1, 0, + # 2 3--5 + # |\ \ | + # | \ \| + # 0--1 4 + -1, -1, 0, 1, -1, 0, + -1, 1, 0, -1, 11, 0, 1, 9, 0, diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles.obj b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles.obj index 66a190eb5..24a29956e 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles.obj +++ b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/two-triangles.obj @@ -1,11 +1,11 @@ -# 1 4--6 +# 3 4--6 # |\ \ | # | \ \| -# 2--3 5 +# 1--2 5 o First -v -1 1 0 v -1 -1 0 v 1 -1 0 +v -1 1 0 f 1 2 3 o Second v -1 1 0