From fde13cb4cf5790979e264427fa24edf66fbdf0dc Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 4 Sep 2019 23:13:58 +0200 Subject: [PATCH] More work on the uv glitches. --- meshers/transvoxel_tables.cpp | 88 ++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/meshers/transvoxel_tables.cpp b/meshers/transvoxel_tables.cpp index 6e98387..d29548d 100644 --- a/meshers/transvoxel_tables.cpp +++ b/meshers/transvoxel_tables.cpp @@ -67,16 +67,18 @@ const RegularCellData regularCellData[16] = { { 0x00, {} }, { 0x31, { 0, 1, 2 } }, { 0x62, { 0, 1, 2, 3, 4, 5 } }, - { 0x42, { 0, 1, 2, 0, 2, 3 } }, - { 0x73, { 0, 1, 4, 1, 3, 4, 2, 5, 6 } }, //{ 0x53, { 0, 1, 4, 1, 3, 4, 1, 2, 3 } }, + //{ 0x42, { 0, 1, 2, 0, 2, 3 } }, copy 0-1-2 delete 1 (mid) + { 0x62, { 0, 1, 2, 4, 5, 3 } }, + { 0x73, { 0, 1, 4, 1, 3, 4, 5, 2, 6 } }, //{ 0x53, { 0, 1, 4, 1, 3, 4, 1, 2, 3 } }, { 0x73, { 0, 1, 2, 0, 2, 3, 4, 5, 6 } }, { 0x93, { 0, 1, 2, 3, 4, 5, 6, 7, 8 } }, { 0x84, { 0, 1, 4, 1, 3, 4, 1, 2, 3, 5, 6, 7 } }, { 0x84, { 0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7 } }, { 0xC4, { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 } }, { 0x64, { 0, 4, 5, 0, 1, 4, 1, 3, 4, 1, 2, 3 } }, - { 0x64, { 0, 5, 4, 0, 4, 1, 1, 4, 3, 1, 3, 2 } }, - { 0x64, { 0, 4, 5, 0, 3, 4, 0, 1, 3, 1, 2, 3 } }, + { 0x64, { 0, 5, 4, 0, 4, 1, 1, 4, 3, 1, 3, 2 } }, + //{ 0x64, { 0, 4, 5, 0, 3, 4, 0, 1, 3, 1, 2, 3, } }, //C 2 0,4 -> 6,9 | 1,3->7,8 copy 0-5, del 2, then copy 3-4 to the end + { 0xC4, { 6, 9, 5, 0, 10, 11, 0, 1, 3, 7, 2, 8, } }, //C { 0x64, { 0, 1, 2, 0, 2, 3, 0, 3, 4, 0, 4, 5 } }, { 0x75, { 0, 1, 2, 0, 2, 3, 0, 3, 4, 0, 4, 5, 0, 5, 6 } }, { 0x95, { 0, 4, 5, 0, 3, 4, 0, 1, 3, 1, 2, 3, 6, 7, 8 } } @@ -92,28 +94,28 @@ unsigned short regularVertexData[256][12] = { {}, { 0x6201, 0x5102, 0x3304 }, { 0x6201, 0x2315, 0x4113 }, - { 0x5102, 0x3304, 0x2315, 0x4113 }, + { 0x5102, 0x3304, 0x2315, 0x4113, 0x5102, 0x2315 }, { 0x5102, 0x4223, 0x1326 }, - { 0x3304, 0x6201, 0x4223, 0x1326 }, + { 0x3304, 0x6201, 0x4223, 0x1326, 0x3304, 0x4223 }, { 0x6201, 0x2315, 0x4113, 0x5102, 0x4223, 0x1326 }, - { 0x4223, 0x1326, 0x3304, 0x2315, 0x4113, 0x3304, 0x2315 }, //7 + { 0x4223, 0x1326, 0x3304, 0x2315, 0x4113, 0x1326, 0x2315 }, //7 { 0x4113, 0x8337, 0x4223 }, { 0x6201, 0x5102, 0x3304, 0x4223, 0x4113, 0x8337 }, - { 0x6201, 0x2315, 0x8337, 0x4223 }, + { 0x6201, 0x2315, 0x8337, 0x4223, 0x6201, 0x8337 }, { 0x5102, 0x3304, 0x2315, 0x8337, 0x4223, 0x3304, 0x8337 }, - { 0x5102, 0x4113, 0x8337, 0x1326 }, + { 0x5102, 0x4113, 0x8337, 0x1326, 0x5102, 0x8337 }, { 0x4113, 0x8337, 0x1326, 0x3304, 0x6201, 0x8337, 0x3304 }, { 0x6201, 0x2315, 0x8337, 0x1326, 0x5102, 0x2315, 0x1326 }, - { 0x3304, 0x2315, 0x8337, 0x1326 }, + { 0x3304, 0x2315, 0x8337, 0x1326, 0x3304, 0x8337 }, //16 3 5 15 { 0x3304, 0x1146, 0x2245 }, - { 0x6201, 0x5102, 0x1146, 0x2245 }, + { 0x6201, 0x5102, 0x1146, 0x2245, 0x6201, 0x1146 }, { 0x6201, 0x2315, 0x4113, 0x3304, 0x1146, 0x2245 }, { 0x2315, 0x4113, 0x5102, 0x1146, 0x2245, 0x4113, 0x1146 }, { 0x5102, 0x4223, 0x1326, 0x3304, 0x1146, 0x2245 }, { 0x1146, 0x2245, 0x6201, 0x4223, 0x1326, 0x2245, 0x4223 }, { 0x3304, 0x1146, 0x2245, 0x6201, 0x2315, 0x4113, 0x5102, 0x4223, 0x1326 }, - { 0x4223, 0x1326, 0x1146, 0x2245, 0x2315, 0x4113 }, + { 0x4223, 0x1326, 0x1146, 0x2245, 0x2315, 0x4113, 0x4223, 0x1326, 0x2245, 0x2315, 0x2245, 0x2315 }, //C { 0x4223, 0x4113, 0x8337, 0x3304, 0x1146, 0x2245 }, { 0x6201, 0x5102, 0x1146, 0x2245, 0x4223, 0x4113, 0x8337 }, { 0x4223, 0x6201, 0x2315, 0x8337, 0x3304, 0x1146, 0x2245 }, @@ -125,7 +127,7 @@ unsigned short regularVertexData[256][12] = { //32 3 10 15 { 0x2315, 0x2245, 0x8157 }, { 0x6201, 0x5102, 0x3304, 0x2315, 0x2245, 0x8157 }, - { 0x4113, 0x6201, 0x2245, 0x8157 }, + { 0x4113, 0x6201, 0x2245, 0x8157, 0x4113, 0x2245 }, { 0x2245, 0x8157, 0x4113, 0x5102, 0x3304, 0x8157, 0x5102 }, { 0x5102, 0x4223, 0x1326, 0x2315, 0x2245, 0x8157 }, { 0x6201, 0x4223, 0x1326, 0x3304, 0x2315, 0x2245, 0x8157 }, @@ -134,16 +136,16 @@ unsigned short regularVertexData[256][12] = { { 0x4223, 0x4113, 0x8337, 0x2315, 0x2245, 0x8157 }, { 0x6201, 0x5102, 0x3304, 0x4223, 0x4113, 0x8337, 0x2315, 0x2245, 0x8157 }, { 0x8337, 0x4223, 0x6201, 0x2245, 0x8157, 0x4223, 0x2245 }, - { 0x5102, 0x3304, 0x2245, 0x8157, 0x8337, 0x4223 }, + { 0x5102, 0x3304, 0x2245, 0x8157, 0x8337, 0x4223, 0x5102, 0x3304, 0x8157, 0x8337, 0x8157, 0x8337 }, { 0x5102, 0x4113, 0x8337, 0x1326, 0x2315, 0x2245, 0x8157 }, { 0x4113, 0x8337, 0x1326, 0x3304, 0x6201, 0x2315, 0x2245, 0x8157 }, { 0x5102, 0x1326, 0x8337, 0x8157, 0x2245, 0x6201 }, { 0x8157, 0x8337, 0x1326, 0x3304, 0x2245, 0x8337, 0x3304 }, //48 1 2 7 11 - { 0x2315, 0x3304, 0x1146, 0x8157 }, + { 0x2315, 0x3304, 0x1146, 0x8157, 0x2315, 0x1146 }, { 0x6201, 0x5102, 0x1146, 0x8157, 0x2315, 0x5102, 0x8157 }, { 0x3304, 0x1146, 0x8157, 0x4113, 0x6201, 0x1146, 0x4113 }, - { 0x4113, 0x5102, 0x1146, 0x8157 }, + { 0x4113, 0x5102, 0x1146, 0x8157, 0x4113, 0x1146 }, { 0x2315, 0x3304, 0x1146, 0x8157, 0x5102, 0x4223, 0x1326 }, { 0x1326, 0x4223, 0x6201, 0x2315, 0x8157, 0x1146 }, { 0x3304, 0x1146, 0x8157, 0x4113, 0x6201, 0x5102, 0x4223, 0x1326 }, @@ -155,13 +157,13 @@ unsigned short regularVertexData[256][12] = { { 0x2315, 0x3304, 0x1146, 0x8157, 0x5102, 0x4113, 0x8337, 0x1326 }, { 0x6201, 0x4113, 0x8337, 0x1326, 0x1146, 0x8157, 0x2315 }, { 0x6201, 0x3304, 0x1146, 0x8157, 0x8337, 0x1326, 0x5102 }, - { 0x1326, 0x1146, 0x8157, 0x8337 }, + { 0x1326, 0x1146, 0x8157, 0x8337, 0x1326, 0x8157 }, //64 5 12 15 { 0x1326, 0x8267, 0x1146 }, { 0x6201, 0x5102, 0x3304, 0x1326, 0x8267, 0x1146 }, { 0x6201, 0x2315, 0x4113, 0x1326, 0x8267, 0x1146 }, { 0x5102, 0x3304, 0x2315, 0x4113, 0x1326, 0x8267, 0x1146 }, - { 0x5102, 0x4223, 0x8267, 0x1146 }, + { 0x5102, 0x4223, 0x8267, 0x1146, 0x5102, 0x8267 }, { 0x3304, 0x6201, 0x4223, 0x8267, 0x1146, 0x6201, 0x8267 }, { 0x5102, 0x4223, 0x8267, 0x1146, 0x6201, 0x2315, 0x4113 }, { 0x1146, 0x8267, 0x4223, 0x4113, 0x2315, 0x3304 }, @@ -170,16 +172,16 @@ unsigned short regularVertexData[256][12] = { { 0x6201, 0x2315, 0x8337, 0x4223, 0x1326, 0x8267, 0x1146 }, { 0x5102, 0x3304, 0x2315, 0x8337, 0x4223, 0x1326, 0x8267, 0x1146 }, { 0x8267, 0x1146, 0x5102, 0x4113, 0x8337, 0x1146, 0x4113 }, - { 0x6201, 0x4113, 0x8337, 0x8267, 0x1146, 0x3304 }, + { 0x6201, 0x4113, 0x8337, 0x8267, 0x1146, 0x3304, 0x6201, 0x4113, 0x8267, 0x1146, 0x8267, 0x1146 }, { 0x6201, 0x2315, 0x8337, 0x8267, 0x1146, 0x5102 }, { 0x1146, 0x3304, 0x2315, 0x8337, 0x8267, 0x3304, 0x8337 }, //80 1 4 7 13 - { 0x3304, 0x1326, 0x8267, 0x2245 }, + { 0x3304, 0x1326, 0x8267, 0x2245, 0x3304, 0x8267 }, { 0x1326, 0x8267, 0x2245, 0x6201, 0x5102, 0x8267, 0x6201 }, { 0x3304, 0x1326, 0x8267, 0x2245, 0x6201, 0x2315, 0x4113 }, { 0x1326, 0x8267, 0x2245, 0x2315, 0x4113, 0x5102 }, { 0x5102, 0x4223, 0x8267, 0x2245, 0x3304, 0x4223, 0x2245 }, - { 0x6201, 0x4223, 0x8267, 0x2245 }, + { 0x6201, 0x4223, 0x8267, 0x2245, 0x6201, 0x8267 }, { 0x5102, 0x4223, 0x8267, 0x2245, 0x3304, 0x6201, 0x2315, 0x4113 }, { 0x4113, 0x4223, 0x8267, 0x2245, 0x2315, 0x4223, 0x2245 }, { 0x3304, 0x1326, 0x8267, 0x2245, 0x4223, 0x4113, 0x8337 }, @@ -189,7 +191,7 @@ unsigned short regularVertexData[256][12] = { { 0x3304, 0x2245, 0x8267, 0x8337, 0x4113, 0x5102 }, { 0x8337, 0x8267, 0x2245, 0x6201, 0x4113, 0x8267, 0x6201 }, { 0x5102, 0x6201, 0x2315, 0x8337, 0x8267, 0x2245, 0x3304 }, - { 0x2315, 0x8337, 0x8267, 0x2245 }, + { 0x2315, 0x8337, 0x8267, 0x2245, 0x2315, 0x8267 }, //96 - { 0x2315, 0x2245, 0x8157, 0x1326, 0x8267, 0x1146 }, { 0x6201, 0x5102, 0x3304, 0x2315, 0x2245, 0x8157, 0x1326, 0x8267, 0x1146 }, @@ -210,12 +212,12 @@ unsigned short regularVertexData[256][12] = { //112 0 3 5 { 0x8157, 0x2315, 0x3304, 0x1326, 0x8267, 0x2315, 0x1326 }, { 0x8267, 0x8157, 0x2315, 0x6201, 0x5102, 0x1326 }, - { 0x8267, 0x1326, 0x3304, 0x6201, 0x4113, 0x8157 }, + { 0x8267, 0x1326, 0x3304, 0x6201, 0x4113, 0x8157, 0x8267, 0x1326, 0x6201, 0x4113, 0x6201, 0x4113 }, { 0x8267, 0x8157, 0x4113, 0x5102, 0x1326, 0x8157, 0x5102 }, { 0x5102, 0x4223, 0x8267, 0x8157, 0x2315, 0x3304 }, { 0x2315, 0x6201, 0x4223, 0x8267, 0x8157, 0x6201, 0x8267 }, { 0x3304, 0x5102, 0x4223, 0x8267, 0x8157, 0x4113, 0x6201 }, - { 0x4113, 0x4223, 0x8267, 0x8157 }, + { 0x4113, 0x4223, 0x8267, 0x8157, 0x4113, 0x8267 }, { 0x8157, 0x2315, 0x3304, 0x1326, 0x8267, 0x4223, 0x4113, 0x8337 }, { 0x8157, 0x2315, 0x6201, 0x5102, 0x1326, 0x8267, 0x4223, 0x4113, 0x8337 }, { 0x8157, 0x8337, 0x4223, 0x6201, 0x3304, 0x1326, 0x8267 }, @@ -233,13 +235,13 @@ unsigned short regularVertexData[256][12] = { { 0x6201, 0x4223, 0x1326, 0x3304, 0x8337, 0x8157, 0x8267 }, { 0x6201, 0x2315, 0x4113, 0x5102, 0x4223, 0x1326, 0x8337, 0x8157, 0x8267 }, { 0x4223, 0x1326, 0x3304, 0x2315, 0x4113, 0x8337, 0x8157, 0x8267 }, - { 0x4113, 0x8157, 0x8267, 0x4223 }, + { 0x4113, 0x8157, 0x8267, 0x4223, 0x4113, 0x8267 }, { 0x4223, 0x4113, 0x8157, 0x8267, 0x6201, 0x5102, 0x3304 }, { 0x8157, 0x8267, 0x4223, 0x6201, 0x2315, 0x8267, 0x6201 }, { 0x3304, 0x2315, 0x8157, 0x8267, 0x4223, 0x5102 }, { 0x1326, 0x5102, 0x4113, 0x8157, 0x8267, 0x5102, 0x8157 }, { 0x8157, 0x4113, 0x6201, 0x3304, 0x1326, 0x8267 }, - { 0x1326, 0x5102, 0x6201, 0x2315, 0x8157, 0x8267 }, + { 0x1326, 0x5102, 0x6201, 0x2315, 0x8157, 0x8267, 0x1326, 0x5102, 0x2315, 0x8157, 0x2315, 0x8157 }, { 0x8267, 0x1326, 0x3304, 0x2315, 0x8157, 0x1326, 0x2315 }, //144 - { 0x3304, 0x1146, 0x2245, 0x8337, 0x8157, 0x8267 }, @@ -259,7 +261,7 @@ unsigned short regularVertexData[256][12] = { { 0x5102, 0x6201, 0x2315, 0x8157, 0x8267, 0x1326, 0x3304, 0x1146, 0x2245 }, { 0x1326, 0x1146, 0x2245, 0x2315, 0x8157, 0x8267 }, //160 2 8 11 14 - { 0x2315, 0x2245, 0x8267, 0x8337 }, + { 0x2315, 0x2245, 0x8267, 0x8337, 0x2315, 0x8267 }, { 0x2315, 0x2245, 0x8267, 0x8337, 0x6201, 0x5102, 0x3304 }, { 0x4113, 0x6201, 0x2245, 0x8267, 0x8337, 0x6201, 0x8267 }, { 0x5102, 0x4113, 0x8337, 0x8267, 0x2245, 0x3304 }, @@ -269,16 +271,16 @@ unsigned short regularVertexData[256][12] = { { 0x4113, 0x4223, 0x1326, 0x3304, 0x2245, 0x8267, 0x8337 }, { 0x2315, 0x2245, 0x8267, 0x4223, 0x4113, 0x2245, 0x4223 }, { 0x2315, 0x2245, 0x8267, 0x4223, 0x4113, 0x6201, 0x5102, 0x3304 }, - { 0x6201, 0x2245, 0x8267, 0x4223 }, + { 0x6201, 0x2245, 0x8267, 0x4223, 0x6201, 0x8267 }, { 0x3304, 0x2245, 0x8267, 0x4223, 0x5102, 0x2245, 0x4223 }, { 0x5102, 0x4113, 0x2315, 0x2245, 0x8267, 0x1326 }, { 0x4113, 0x2315, 0x2245, 0x8267, 0x1326, 0x3304, 0x6201 }, { 0x5102, 0x6201, 0x2245, 0x8267, 0x1326, 0x6201, 0x8267 }, - { 0x3304, 0x2245, 0x8267, 0x1326 }, + { 0x3304, 0x2245, 0x8267, 0x1326, 0x3304, 0x8267 }, //176 0 3 10 { 0x8267, 0x8337, 0x2315, 0x3304, 0x1146, 0x8337, 0x3304 }, { 0x5102, 0x1146, 0x8267, 0x8337, 0x2315, 0x6201 }, - { 0x3304, 0x1146, 0x8267, 0x8337, 0x4113, 0x6201 }, + { 0x3304, 0x1146, 0x8267, 0x8337, 0x4113, 0x6201, 0x3304, 0x1146, 0x8337, 0x4113, 0x8337, 0x4113 }, { 0x8337, 0x4113, 0x5102, 0x1146, 0x8267, 0x4113, 0x1146 }, { 0x8267, 0x8337, 0x2315, 0x3304, 0x1146, 0x5102, 0x4223, 0x1326 }, { 0x1146, 0x8267, 0x8337, 0x2315, 0x6201, 0x4223, 0x1326 }, @@ -287,13 +289,13 @@ unsigned short regularVertexData[256][12] = { { 0x3304, 0x2315, 0x4113, 0x4223, 0x8267, 0x1146 }, { 0x2315, 0x6201, 0x5102, 0x1146, 0x8267, 0x4223, 0x4113 }, { 0x1146, 0x8267, 0x4223, 0x6201, 0x3304, 0x8267, 0x6201 }, - { 0x5102, 0x1146, 0x8267, 0x4223 }, + { 0x5102, 0x1146, 0x8267, 0x4223, 0x5102, 0x8267 }, { 0x8267, 0x1326, 0x5102, 0x4113, 0x2315, 0x3304, 0x1146 }, { 0x6201, 0x4113, 0x2315, 0x1326, 0x1146, 0x8267 }, { 0x6201, 0x3304, 0x1146, 0x8267, 0x1326, 0x5102 }, { 0x1326, 0x1146, 0x8267 }, //192 4 8 13 14 - { 0x1326, 0x8337, 0x8157, 0x1146 }, + { 0x1326, 0x8337, 0x8157, 0x1146, 0x1326, 0x8157 }, { 0x8337, 0x8157, 0x1146, 0x1326, 0x6201, 0x5102, 0x3304 }, { 0x8337, 0x8157, 0x1146, 0x1326, 0x6201, 0x2315, 0x4113 }, { 0x4113, 0x5102, 0x3304, 0x2315, 0x1326, 0x8337, 0x8157, 0x1146 }, @@ -305,16 +307,16 @@ unsigned short regularVertexData[256][12] = { { 0x4223, 0x4113, 0x8157, 0x1146, 0x1326, 0x6201, 0x5102, 0x3304 }, { 0x1146, 0x8157, 0x2315, 0x6201, 0x4223, 0x1326 }, { 0x4223, 0x5102, 0x3304, 0x2315, 0x8157, 0x1146, 0x1326 }, - { 0x4113, 0x8157, 0x1146, 0x5102 }, + { 0x4113, 0x8157, 0x1146, 0x5102, 0x4113, 0x1146 }, { 0x6201, 0x4113, 0x8157, 0x1146, 0x3304, 0x4113, 0x1146 }, { 0x2315, 0x8157, 0x1146, 0x5102, 0x6201, 0x8157, 0x5102 }, - { 0x2315, 0x8157, 0x1146, 0x3304 }, + { 0x2315, 0x8157, 0x1146, 0x3304, 0x2315, 0x1146 }, //208 0 5 12 { 0x2245, 0x3304, 0x1326, 0x8337, 0x8157, 0x3304, 0x8337 }, { 0x6201, 0x2245, 0x8157, 0x8337, 0x1326, 0x5102 }, { 0x2245, 0x3304, 0x1326, 0x8337, 0x8157, 0x6201, 0x2315, 0x4113 }, { 0x2245, 0x2315, 0x4113, 0x5102, 0x1326, 0x8337, 0x8157 }, - { 0x4223, 0x8337, 0x8157, 0x2245, 0x3304, 0x5102 }, + { 0x4223, 0x8337, 0x8157, 0x2245, 0x3304, 0x5102, 0x4223, 0x8337, 0x2245, 0x3304, 0x2245, 0x3304 }, { 0x8157, 0x2245, 0x6201, 0x4223, 0x8337, 0x2245, 0x4223 }, { 0x2245, 0x3304, 0x5102, 0x4223, 0x8337, 0x8157, 0x4113, 0x6201, 0x2315 }, { 0x4223, 0x8337, 0x8157, 0x2245, 0x2315, 0x4113 }, @@ -323,7 +325,7 @@ unsigned short regularVertexData[256][12] = { { 0x8157, 0x2245, 0x3304, 0x1326, 0x4223, 0x6201, 0x2315 }, { 0x5102, 0x1326, 0x4223, 0x2315, 0x8157, 0x2245 }, { 0x3304, 0x5102, 0x4113, 0x8157, 0x2245, 0x5102, 0x8157 }, - { 0x4113, 0x8157, 0x2245, 0x6201 }, + { 0x4113, 0x8157, 0x2245, 0x6201, 0x4113, 0x2245 }, { 0x5102, 0x6201, 0x2315, 0x8157, 0x2245, 0x3304 }, { 0x2315, 0x8157, 0x2245 }, //224 0 10 12 @@ -335,28 +337,28 @@ unsigned short regularVertexData[256][12] = { { 0x1146, 0x3304, 0x6201, 0x4223, 0x8337, 0x2315, 0x2245 }, { 0x8337, 0x4113, 0x6201, 0x2245, 0x1146, 0x5102, 0x4223 }, { 0x4223, 0x8337, 0x4113, 0x3304, 0x2245, 0x1146 }, - { 0x4113, 0x2315, 0x2245, 0x1146, 0x1326, 0x4223 }, + { 0x4113, 0x2315, 0x2245, 0x1146, 0x1326, 0x4223, 0x4113, 0x2315, 0x1146, 0x1326, 0x1146, 0x1326 }, { 0x1146, 0x1326, 0x4223, 0x4113, 0x2315, 0x2245, 0x6201, 0x5102, 0x3304 }, { 0x1326, 0x4223, 0x6201, 0x2245, 0x1146, 0x4223, 0x2245 }, { 0x4223, 0x5102, 0x3304, 0x2245, 0x1146, 0x1326 }, { 0x2245, 0x1146, 0x5102, 0x4113, 0x2315, 0x1146, 0x4113 }, { 0x4113, 0x2315, 0x2245, 0x1146, 0x3304, 0x6201 }, - { 0x6201, 0x2245, 0x1146, 0x5102 }, + { 0x6201, 0x2245, 0x1146, 0x5102, 0x6201, 0x1146 }, { 0x3304, 0x2245, 0x1146 }, //240 1 2 4 8 - { 0x3304, 0x1326, 0x8337, 0x2315 }, + { 0x3304, 0x1326, 0x8337, 0x2315, 0x3304, 0x8337 }, { 0x5102, 0x1326, 0x8337, 0x2315, 0x6201, 0x1326, 0x2315 }, { 0x6201, 0x3304, 0x1326, 0x8337, 0x4113, 0x3304, 0x8337 }, - { 0x5102, 0x1326, 0x8337, 0x4113 }, + { 0x5102, 0x1326, 0x8337, 0x4113, 0x5102, 0x8337 }, { 0x4223, 0x8337, 0x2315, 0x3304, 0x5102, 0x8337, 0x3304 }, - { 0x6201, 0x4223, 0x8337, 0x2315 }, + { 0x6201, 0x4223, 0x8337, 0x2315, 0x6201, 0x8337 }, { 0x3304, 0x5102, 0x4223, 0x8337, 0x4113, 0x6201 }, { 0x4113, 0x4223, 0x8337 }, { 0x4113, 0x2315, 0x3304, 0x1326, 0x4223, 0x2315, 0x1326 }, { 0x1326, 0x4223, 0x4113, 0x2315, 0x6201, 0x5102 }, - { 0x3304, 0x1326, 0x4223, 0x6201 }, + { 0x3304, 0x1326, 0x4223, 0x6201, 0x3304, 0x4223 }, { 0x5102, 0x1326, 0x4223 }, - { 0x5102, 0x4113, 0x2315, 0x3304 }, + { 0x5102, 0x4113, 0x2315, 0x3304, 0x5102, 0x2315 }, { 0x6201, 0x4113, 0x2315 }, { 0x6201, 0x3304, 0x5102 }, {}