From 040ef5aa7789ffc8cf5c9df817b310837229e83f Mon Sep 17 00:00:00 2001 From: kovacsv Date: Mon, 23 Oct 2023 20:34:29 +0200 Subject: [PATCH] Add line count to tests. --- test/tests/importer3ds_test.js | 16 +++++++++++ test/tests/importergltf_test.js | 49 ++++++++++++++++++++++++--------- test/tests/importerobj_test.js | 5 ++++ test/tests/importeroff_test.js | 1 + test/tests/importerply_test.js | 4 +++ test/tests/importerstl_test.js | 4 +++ test/utils/testutils.js | 1 + 7 files changed, 67 insertions(+), 13 deletions(-) diff --git a/test/tests/importer3ds_test.js b/test/tests/importer3ds_test.js index 2c67dde..610a441 100644 --- a/test/tests/importer3ds_test.js +++ b/test/tests/importer3ds_test.js @@ -26,6 +26,7 @@ describe ('3ds Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 8, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -57,6 +58,7 @@ describe ('3ds Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 8, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -88,6 +90,7 @@ describe ('3ds Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 8, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -100,6 +103,7 @@ describe ('3ds Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 8, + lineCount : 0, triangleCount : 12, boundingBox : { min : [2, 0, 0], @@ -131,6 +135,7 @@ describe ('3ds Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 8, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -143,6 +148,7 @@ describe ('3ds Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 8, + lineCount : 0, triangleCount : 12, boundingBox : { min : [2, 0, 0], @@ -155,6 +161,7 @@ describe ('3ds Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 8, + lineCount : 0, triangleCount : 12, boundingBox : { min : [2, 2, 0], @@ -167,6 +174,7 @@ describe ('3ds Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 8, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 2, 0], @@ -192,6 +200,7 @@ describe ('3ds Importer', function() { vertexColorCount: 0, normalCount: 12, uvCount: 8, + lineCount : 0, triangleCount: 12, boundingBox: { min: [ -1, -1, -1 ], max: [ 1, 1, 1 ] } }, @@ -201,6 +210,7 @@ describe ('3ds Importer', function() { vertexColorCount: 0, normalCount: 12, uvCount: 8, + lineCount : 0, triangleCount: 12, boundingBox: { min: [ 2, -1, -1 ], max: [ 4, 1, 1 ] } }, @@ -210,6 +220,7 @@ describe ('3ds Importer', function() { vertexColorCount: 0, normalCount: 12, uvCount: 8, + lineCount : 0, triangleCount: 12, boundingBox: { min: [ 2, 2, -1 ], max: [ 4, 4, 1 ] } }, @@ -219,6 +230,7 @@ describe ('3ds Importer', function() { vertexColorCount: 0, normalCount: 12, uvCount: 8, + lineCount : 0, triangleCount: 12, boundingBox: { min: [ -1, 2, -1 ], max: [ 1, 4, 1 ] } }, @@ -228,6 +240,7 @@ describe ('3ds Importer', function() { vertexColorCount: 0, normalCount: 12, uvCount: 8, + lineCount : 0, triangleCount: 12, boundingBox: { min: [ -1, -1, 2 ], max: [ 1, 1, 4 ] } }, @@ -237,6 +250,7 @@ describe ('3ds Importer', function() { vertexColorCount: 0, normalCount: 12, uvCount: 8, + lineCount : 0, triangleCount: 12, boundingBox: { min: [ 2, -1, 2 ], max: [ 4, 1, 4 ] } }, @@ -246,6 +260,7 @@ describe ('3ds Importer', function() { vertexColorCount: 0, normalCount: 12, uvCount: 8, + lineCount : 0, triangleCount: 12, boundingBox: { min: [ 2, 2, 2 ], max: [ 4, 4, 4 ] } }, @@ -255,6 +270,7 @@ describe ('3ds Importer', function() { vertexColorCount: 0, normalCount: 12, uvCount: 8, + lineCount : 0, triangleCount: 12, boundingBox: { min: [ -1, 2, 2 ], max: [ 1, 4, 4 ] } } diff --git a/test/tests/importergltf_test.js b/test/tests/importergltf_test.js index 27d08e1..8892630 100644 --- a/test/tests/importergltf_test.js +++ b/test/tests/importergltf_test.js @@ -45,6 +45,7 @@ describe ('Gltf Importer', function () { vertexColorCount : 0, normalCount : 1, uvCount : 0, + lineCount : 0, triangleCount : 1, boundingBox : { min : [0.0, 0.0, 0.0], @@ -102,6 +103,7 @@ describe ('Gltf Importer', function () { vertexColorCount : 0, normalCount : 24, uvCount : 0, + lineCount : 0, triangleCount : 12, boundingBox : { min : [-0.5, -0.5, -0.5], @@ -158,6 +160,7 @@ describe ('Gltf Importer', function () { vertexColorCount : 24, normalCount : 24, uvCount : 24, + lineCount : 0, triangleCount : 12, boundingBox : { min : [-0.5, -0.5, -0.5], @@ -214,6 +217,7 @@ describe ('Gltf Importer', function () { vertexColorCount : 0, normalCount : 24, uvCount : 0, + lineCount : 0, triangleCount : 12, boundingBox : { min : [-0.5, -0.5, -0.5], @@ -270,6 +274,7 @@ describe ('Gltf Importer', function () { vertexColorCount : 0, normalCount : 24, uvCount : 24, + lineCount : 0, triangleCount : 12, boundingBox : { min : [-0.5, -0.5, -0.5], @@ -324,6 +329,7 @@ describe ('Gltf Importer', function () { vertexColorCount : 0, normalCount : 3, uvCount : 0, + lineCount : 0, triangleCount : 1, boundingBox : { min : [0.0, 0.0, 0.0], @@ -336,6 +342,7 @@ describe ('Gltf Importer', function () { vertexColorCount : 0, normalCount : 3, uvCount : 0, + lineCount : 0, triangleCount : 1, boundingBox : { min : [1.0, 0.0, 0.0], @@ -381,7 +388,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 78, uvCount: 0, - triangleCount: 38, + lineCount : 0, + triangleCount : 38, boundingBox : { min: [ -0.6921195564310951, -1.0785199551363698, -5.330651201963446 ], max: [ 1.0439303242310798, 2.868914373727357, -4.66934876823423 ] @@ -393,7 +401,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 50, uvCount: 0, - triangleCount: 26, + lineCount : 0, + triangleCount : 26, boundingBox : { min: [ 0.8097413778305054, 2.8717148303985596, -5.33065128326416 ], max: [ 1.4936277866363525, 3.9211390018463135, -4.66934871673584 ] @@ -405,7 +414,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 50, uvCount: 0, - triangleCount: 26, + lineCount : 0, + triangleCount : 26, boundingBox : { min: [ -1.1686336994171143, -5.330650806427002, 2.93727445602417 ], max: [ -0.46912679076194763, -4.66934871673584, 3.9916374683380127 ] @@ -417,7 +427,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 78, uvCount: 0, - triangleCount: 38, + lineCount : 0, + triangleCount : 38, boundingBox : { min: [ -0.9557393651589479, -5.330651177643153, -1.06505742884149 ], max: [ 0.6167901044859734, -4.6693486435429055, 2.934442924096579 ] @@ -429,7 +440,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 78, uvCount: 0, - triangleCount: 38, + lineCount : 0, + triangleCount : 38, boundingBox : { min: [ -5.330651171390089, -1.0326269494863676, -0.6059335185163844 ], max: [ -4.669348828609911, 2.9885841671721116, 0.8202131194767724 ] @@ -441,7 +453,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 54, uvCount: 0, - triangleCount: 26, + lineCount : 0, + triangleCount : 26, boundingBox : { min: [ -5.33065128326416, 2.991360902786255, -0.012430161237716675 ], max: [ -4.66934871673584, 4.039160251617432, 0.6999828815460205 ] @@ -453,7 +466,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 52, uvCount: 0, - triangleCount: 26, + lineCount : 0, + triangleCount : 26, boundingBox : { min: [ -1.3648574352264404, 2.9005930423736572, 4.66934871673584 ], max: [ -0.6740907430648804, 3.9529545307159424, 5.33065128326416 ] @@ -465,7 +479,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 74, uvCount: 0, - triangleCount: 38, + lineCount : 0, + triangleCount : 38, boundingBox : { min: [ -1.009571011381568, -1.074115497823536, 4.669348895549774 ], max: [ 0.6625885973069405, 2.8977772707193465, 5.330651104450226 ] @@ -477,7 +492,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 54, uvCount: 0, - triangleCount: 26, + lineCount : 0, + triangleCount : 26, boundingBox : { min: [ 4.66934871673584, 2.4595587253570557, -2.553251266479492 ], max: [ 5.33065128326416, 3.432579517364502, -1.7226401567459106 ] @@ -489,7 +505,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 78, uvCount: 0, - triangleCount: 38, + lineCount : 0, + triangleCount : 38, boundingBox : { min: [ 4.669348835945129, -1.0589144181932033, -1.7207290818192755 ], max: [ 5.330651164054871, 2.4574561383341145, 0.9159925616542917 ] @@ -501,7 +518,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 52, uvCount: 0, - triangleCount: 26, + lineCount : 0, + triangleCount : 26, boundingBox : { min: [ 2.8218495845794678, 4.669349193572998, -1.6833229064941406 ], max: [ 3.864471435546875, 5.33065128326416, -1.0113166570663452 ] @@ -513,7 +531,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 78, uvCount: 0, - triangleCount: 38, + lineCount : 0, + triangleCount : 38, boundingBox : { min: [ -1.0826615032554154, 4.669348806142807, -1.093071740019906 ], max: [ 2.8190779754834807, 5.3306513130664825, 0.7348238365226794 ] @@ -525,7 +544,8 @@ describe ('Gltf Importer', function () { vertexColorCount: 0, normalCount: 272, uvCount: 0, - triangleCount: 140, + lineCount : 0, + triangleCount : 140, boundingBox : { min: [ -5.000001907348633, -5, -5.000001907348633 ], max: [ 5.000002384185791, 5, 5.000002861022949 ] @@ -566,6 +586,7 @@ describe ('Gltf Importer', function () { vertexColorCount : 0, normalCount : 2, uvCount : 0, + lineCount : 0, triangleCount : 2, boundingBox : { min : [-0.5, -0.5, 0.0], @@ -603,6 +624,7 @@ describe ('Gltf Importer', function () { vertexColorCount : 0, normalCount : 2, uvCount : 0, + lineCount : 0, triangleCount : 2, boundingBox : { min : [-0.5, -0.5, 0.0], @@ -641,6 +663,7 @@ describe ('Gltf Importer', function () { vertexColorCount : 0, normalCount : 12, uvCount : 0, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0.0, 0.0, 0.0], diff --git a/test/tests/importerobj_test.js b/test/tests/importerobj_test.js index 24ddaa8..3afec30 100644 --- a/test/tests/importerobj_test.js +++ b/test/tests/importerobj_test.js @@ -507,6 +507,7 @@ describe ('Obj Importer', function () { vertexColorCount : 0, normalCount : 6, uvCount : 4, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -537,6 +538,7 @@ describe ('Obj Importer', function () { vertexColorCount : 0, normalCount : 6, uvCount : 4, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -568,6 +570,7 @@ describe ('Obj Importer', function () { vertexColorCount : 0, normalCount : 6, uvCount : 4, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -599,6 +602,7 @@ describe ('Obj Importer', function () { vertexColorCount : 0, normalCount : 6, uvCount : 4, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -626,6 +630,7 @@ describe ('Obj Importer', function () { vertexColorCount : 0, normalCount : 20, uvCount : 0, + lineCount : 0, triangleCount : 20, boundingBox : { min : [-0.85065080835204, -0.85065080835204, -0.85065080835204], diff --git a/test/tests/importeroff_test.js b/test/tests/importeroff_test.js index 352f46d..b5e0d46 100644 --- a/test/tests/importeroff_test.js +++ b/test/tests/importeroff_test.js @@ -142,6 +142,7 @@ describe ('Off Importer', function () { vertexColorCount : 0, normalCount : 12, uvCount : 0, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], diff --git a/test/tests/importerply_test.js b/test/tests/importerply_test.js index 7e7e11d..68b2248 100644 --- a/test/tests/importerply_test.js +++ b/test/tests/importerply_test.js @@ -142,6 +142,7 @@ describe ('Ply Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 0, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -169,6 +170,7 @@ describe ('Ply Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 0, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -196,6 +198,7 @@ describe ('Ply Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 0, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -226,6 +229,7 @@ describe ('Ply Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 0, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], diff --git a/test/tests/importerstl_test.js b/test/tests/importerstl_test.js index ea28375..59fffbb 100644 --- a/test/tests/importerstl_test.js +++ b/test/tests/importerstl_test.js @@ -136,6 +136,7 @@ describe ('Stl Importer', function() { vertexColorCount : 0, normalCount : 572, uvCount : 0, + lineCount : 0, triangleCount : 572, boundingBox : { min : [0, -1.10792799192095, 0], @@ -163,6 +164,7 @@ describe ('Stl Importer', function() { vertexColorCount : 0, normalCount : 728, uvCount : 0, + lineCount : 0, triangleCount : 728, boundingBox : { min : [0, -1.1079280376434326, 0], @@ -191,6 +193,7 @@ describe ('Stl Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 0, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], @@ -218,6 +221,7 @@ describe ('Stl Importer', function() { vertexColorCount : 0, normalCount : 12, uvCount : 0, + lineCount : 0, triangleCount : 12, boundingBox : { min : [0, 0, 0], diff --git a/test/utils/testutils.js b/test/utils/testutils.js index b09b666..bf59856 100644 --- a/test/utils/testutils.js +++ b/test/utils/testutils.js @@ -162,6 +162,7 @@ export function ModelToObjectSimple (model) vertexColorCount : mesh.VertexColorCount (), normalCount : mesh.NormalCount (), uvCount : mesh.TextureUVCount (), + lineCount : mesh.LineSegmentCount (), triangleCount : mesh.TriangleCount (), boundingBox : { min : [boundingBox.min.x, boundingBox.min.y, boundingBox.min.z],