From dfbade5670133779a4ea876850771f34e49754ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 20 Sep 2022 01:09:56 +0200 Subject: [PATCH] sceneconverter: make test files resemble a triangle fan. Need that in order to test certain cases better without having to craft completely new files. --- .../quad-duplicates-fuzzy.obj | 6 +++--- .../SceneConverterTestFiles/quad-duplicates.obj | 6 +++--- .../SceneConverterTestFiles/quad-duplicates.ply | Bin 268 -> 268 bytes .../quad-normals-texcoords.obj | 8 ++++---- .../Test/SceneConverterTestFiles/quad.obj | 8 ++++---- .../Test/SceneConverterTestFiles/quad.ply | Bin 244 -> 244 bytes .../two-triangles-transformed.bin | Bin 72 -> 72 bytes .../two-triangles-transformed.bin.in | 7 ++++++- .../SceneConverterTestFiles/two-triangles.obj | 6 +++--- 9 files changed, 23 insertions(+), 18 deletions(-) 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 aa319b3447f2ad881b65a2d76822387377ab21b0..2771bedf8c361dc2965f11c62fb749de65a72eed 100644 GIT binary patch delta 12 TcmeBS>S3C&apGQui5IN_Ai4!< delta 18 YcmeBS>S3C&k=3372qvylpLkav05PZqp#T5? 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 e36655e079aa069fade0b05851a29fa77223c94f..ddec9ad7210a362c286e0a0984b18d7c3505f9d3 100644 GIT binary patch delta 48 ocmeyu_=R!8M#=pQV9;RCz|a6=1L+3)iKpavn1FJOK+Fup05DAnivR!s delta 31 gcmeyu_=R!8Mpk