From a806aa7eea4912d464f246b0bf63e0b53660e26b Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 4 Sep 2019 23:34:23 +0200 Subject: [PATCH] More uv fixes. --- meshers/transvoxel_tables.cpp | 101 +++++++++++++++++----------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/meshers/transvoxel_tables.cpp b/meshers/transvoxel_tables.cpp index d29548d..c5c6d74 100644 --- a/meshers/transvoxel_tables.cpp +++ b/meshers/transvoxel_tables.cpp @@ -67,9 +67,8 @@ const RegularCellData regularCellData[16] = { { 0x00, {} }, { 0x31, { 0, 1, 2 } }, { 0x62, { 0, 1, 2, 3, 4, 5 } }, - //{ 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 } }, + { 0x62, { 0, 1, 2, 4, 5, 3 } }, //{ 0x42, { 0, 1, 2, 0, 2, 3 } }, copy 0-1-2 delete 1 (mid) + { 0x93, { 0, 1, 4, 7, 3, 8, 5, 2, 6 } }, //{ 0x53, { 0, 1, 4, 1, 3, 4, 1, 2, 3 } }, copy 1-2-3-4 to the end delete 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 } }, @@ -98,22 +97,22 @@ unsigned short regularVertexData[256][12] = { { 0x5102, 0x4223, 0x1326 }, { 0x3304, 0x6201, 0x4223, 0x1326, 0x3304, 0x4223 }, { 0x6201, 0x2315, 0x4113, 0x5102, 0x4223, 0x1326 }, - { 0x4223, 0x1326, 0x3304, 0x2315, 0x4113, 0x1326, 0x2315 }, //7 + { 0x4223, 0x1326, 0x3304, 0x2315, 0x4113, 0x1326, 0x2315, 0x1326, 0x4113 }, { 0x4113, 0x8337, 0x4223 }, { 0x6201, 0x5102, 0x3304, 0x4223, 0x4113, 0x8337 }, { 0x6201, 0x2315, 0x8337, 0x4223, 0x6201, 0x8337 }, - { 0x5102, 0x3304, 0x2315, 0x8337, 0x4223, 0x3304, 0x8337 }, + { 0x5102, 0x3304, 0x2315, 0x8337, 0x4223, 0x3304, 0x8337, 0x3304, 0x4223 }, { 0x5102, 0x4113, 0x8337, 0x1326, 0x5102, 0x8337 }, - { 0x4113, 0x8337, 0x1326, 0x3304, 0x6201, 0x8337, 0x3304 }, - { 0x6201, 0x2315, 0x8337, 0x1326, 0x5102, 0x2315, 0x1326 }, + { 0x4113, 0x8337, 0x1326, 0x3304, 0x6201, 0x8337, 0x3304, 0x8337, 0x6201 }, + { 0x6201, 0x2315, 0x8337, 0x1326, 0x5102, 0x2315, 0x1326, 0x2315, 0x5102 }, { 0x3304, 0x2315, 0x8337, 0x1326, 0x3304, 0x8337 }, //16 3 5 15 { 0x3304, 0x1146, 0x2245 }, { 0x6201, 0x5102, 0x1146, 0x2245, 0x6201, 0x1146 }, { 0x6201, 0x2315, 0x4113, 0x3304, 0x1146, 0x2245 }, - { 0x2315, 0x4113, 0x5102, 0x1146, 0x2245, 0x4113, 0x1146 }, + { 0x2315, 0x4113, 0x5102, 0x1146, 0x2245, 0x4113, 0x114, 0x4113, 0x22456 }, { 0x5102, 0x4223, 0x1326, 0x3304, 0x1146, 0x2245 }, - { 0x1146, 0x2245, 0x6201, 0x4223, 0x1326, 0x2245, 0x4223 }, + { 0x1146, 0x2245, 0x6201, 0x4223, 0x1326, 0x2245, 0x4223, 0x2245, 0x1326 }, { 0x3304, 0x1146, 0x2245, 0x6201, 0x2315, 0x4113, 0x5102, 0x4223, 0x1326 }, { 0x4223, 0x1326, 0x1146, 0x2245, 0x2315, 0x4113, 0x4223, 0x1326, 0x2245, 0x2315, 0x2245, 0x2315 }, //C { 0x4223, 0x4113, 0x8337, 0x3304, 0x1146, 0x2245 }, @@ -123,37 +122,37 @@ unsigned short regularVertexData[256][12] = { { 0x5102, 0x4113, 0x8337, 0x1326, 0x3304, 0x1146, 0x2245 }, { 0x4113, 0x8337, 0x1326, 0x1146, 0x2245, 0x6201 }, { 0x6201, 0x2315, 0x8337, 0x1326, 0x5102, 0x3304, 0x1146, 0x2245 }, - { 0x2245, 0x2315, 0x8337, 0x1326, 0x1146, 0x2315, 0x1326 }, + { 0x2245, 0x2315, 0x8337, 0x1326, 0x1146, 0x2315, 0x1326, 0x2315, 0x1146 }, //32 3 10 15 { 0x2315, 0x2245, 0x8157 }, { 0x6201, 0x5102, 0x3304, 0x2315, 0x2245, 0x8157 }, { 0x4113, 0x6201, 0x2245, 0x8157, 0x4113, 0x2245 }, - { 0x2245, 0x8157, 0x4113, 0x5102, 0x3304, 0x8157, 0x5102 }, + { 0x2245, 0x8157, 0x4113, 0x5102, 0x3304, 0x8157, 0x5102, 0x8157, 0x3304 }, { 0x5102, 0x4223, 0x1326, 0x2315, 0x2245, 0x8157 }, { 0x6201, 0x4223, 0x1326, 0x3304, 0x2315, 0x2245, 0x8157 }, { 0x6201, 0x2245, 0x8157, 0x4113, 0x5102, 0x4223, 0x1326 }, { 0x4223, 0x1326, 0x3304, 0x2245, 0x8157, 0x4113 }, { 0x4223, 0x4113, 0x8337, 0x2315, 0x2245, 0x8157 }, { 0x6201, 0x5102, 0x3304, 0x4223, 0x4113, 0x8337, 0x2315, 0x2245, 0x8157 }, - { 0x8337, 0x4223, 0x6201, 0x2245, 0x8157, 0x4223, 0x2245 }, + { 0x8337, 0x4223, 0x6201, 0x2245, 0x8157, 0x4223, 0x2245, 0x4223, 0x8157 }, { 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 }, + { 0x8157, 0x8337, 0x1326, 0x3304, 0x2245, 0x8337, 0x3304, 0x8337, 0x2245 }, //48 1 2 7 11 { 0x2315, 0x3304, 0x1146, 0x8157, 0x2315, 0x1146 }, - { 0x6201, 0x5102, 0x1146, 0x8157, 0x2315, 0x5102, 0x8157 }, - { 0x3304, 0x1146, 0x8157, 0x4113, 0x6201, 0x1146, 0x4113 }, + { 0x6201, 0x5102, 0x1146, 0x8157, 0x2315, 0x5102, 0x8157, 0x5102, 0x2315 }, + { 0x3304, 0x1146, 0x8157, 0x4113, 0x6201, 0x1146, 0x4113, 0x1146, 0x6201 }, { 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 }, - { 0x1326, 0x1146, 0x8157, 0x4113, 0x4223, 0x1146, 0x4113 }, + { 0x1326, 0x1146, 0x8157, 0x4113, 0x4223, 0x1146, 0x4113, 0x1146, 0x4223 }, { 0x2315, 0x3304, 0x1146, 0x8157, 0x4223, 0x4113, 0x8337 }, { 0x6201, 0x5102, 0x1146, 0x8157, 0x2315, 0x4223, 0x4113, 0x8337 }, { 0x3304, 0x1146, 0x8157, 0x8337, 0x4223, 0x6201 }, - { 0x4223, 0x5102, 0x1146, 0x8157, 0x8337, 0x5102, 0x8157 }, + { 0x4223, 0x5102, 0x1146, 0x8157, 0x8337, 0x5102, 0x8157, 0x5102, 0x8337 }, { 0x2315, 0x3304, 0x1146, 0x8157, 0x5102, 0x4113, 0x8337, 0x1326 }, { 0x6201, 0x4113, 0x8337, 0x1326, 0x1146, 0x8157, 0x2315 }, { 0x6201, 0x3304, 0x1146, 0x8157, 0x8337, 0x1326, 0x5102 }, @@ -164,32 +163,32 @@ unsigned short regularVertexData[256][12] = { { 0x6201, 0x2315, 0x4113, 0x1326, 0x8267, 0x1146 }, { 0x5102, 0x3304, 0x2315, 0x4113, 0x1326, 0x8267, 0x1146 }, { 0x5102, 0x4223, 0x8267, 0x1146, 0x5102, 0x8267 }, - { 0x3304, 0x6201, 0x4223, 0x8267, 0x1146, 0x6201, 0x8267 }, + { 0x3304, 0x6201, 0x4223, 0x8267, 0x1146, 0x6201, 0x8267, 0x6201, 0x1146 }, { 0x5102, 0x4223, 0x8267, 0x1146, 0x6201, 0x2315, 0x4113 }, { 0x1146, 0x8267, 0x4223, 0x4113, 0x2315, 0x3304 }, { 0x4113, 0x8337, 0x4223, 0x1326, 0x8267, 0x1146 }, { 0x6201, 0x5102, 0x3304, 0x4223, 0x4113, 0x8337, 0x1326, 0x8267, 0x1146 }, { 0x6201, 0x2315, 0x8337, 0x4223, 0x1326, 0x8267, 0x1146 }, { 0x5102, 0x3304, 0x2315, 0x8337, 0x4223, 0x1326, 0x8267, 0x1146 }, - { 0x8267, 0x1146, 0x5102, 0x4113, 0x8337, 0x1146, 0x4113 }, + { 0x8267, 0x1146, 0x5102, 0x4113, 0x8337, 0x1146, 0x4113, 0x1146, 0x8337 }, { 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 }, + { 0x1146, 0x3304, 0x2315, 0x8337, 0x8267, 0x3304, 0x8337, 0x3304, 0x8267 }, //80 1 4 7 13 { 0x3304, 0x1326, 0x8267, 0x2245, 0x3304, 0x8267 }, - { 0x1326, 0x8267, 0x2245, 0x6201, 0x5102, 0x8267, 0x6201 }, + { 0x1326, 0x8267, 0x2245, 0x6201, 0x5102, 0x8267, 0x6201, 0x8267, 0x5102 }, { 0x3304, 0x1326, 0x8267, 0x2245, 0x6201, 0x2315, 0x4113 }, { 0x1326, 0x8267, 0x2245, 0x2315, 0x4113, 0x5102 }, - { 0x5102, 0x4223, 0x8267, 0x2245, 0x3304, 0x4223, 0x2245 }, + { 0x5102, 0x4223, 0x8267, 0x2245, 0x3304, 0x4223, 0x2245, 0x4223, 0x3304 }, { 0x6201, 0x4223, 0x8267, 0x2245, 0x6201, 0x8267 }, { 0x5102, 0x4223, 0x8267, 0x2245, 0x3304, 0x6201, 0x2315, 0x4113 }, - { 0x4113, 0x4223, 0x8267, 0x2245, 0x2315, 0x4223, 0x2245 }, + { 0x4113, 0x4223, 0x8267, 0x2245, 0x2315, 0x4223, 0x2245, 0x4223, 0x2315 }, { 0x3304, 0x1326, 0x8267, 0x2245, 0x4223, 0x4113, 0x8337 }, { 0x1326, 0x8267, 0x2245, 0x6201, 0x5102, 0x4223, 0x4113, 0x8337 }, { 0x3304, 0x1326, 0x8267, 0x2245, 0x4223, 0x6201, 0x2315, 0x8337 }, { 0x5102, 0x1326, 0x8267, 0x2245, 0x2315, 0x8337, 0x4223 }, { 0x3304, 0x2245, 0x8267, 0x8337, 0x4113, 0x5102 }, - { 0x8337, 0x8267, 0x2245, 0x6201, 0x4113, 0x8267, 0x6201 }, + { 0x8337, 0x8267, 0x2245, 0x6201, 0x4113, 0x8267, 0x6201, 0x8267, 0x4113 }, { 0x5102, 0x6201, 0x2315, 0x8337, 0x8267, 0x2245, 0x3304 }, { 0x2315, 0x8337, 0x8267, 0x2245, 0x2315, 0x8267 }, //96 - @@ -210,12 +209,12 @@ unsigned short regularVertexData[256][12] = { { 0x8337, 0x8267, 0x1146, 0x5102, 0x6201, 0x2245, 0x8157 }, { 0x3304, 0x2245, 0x8157, 0x8337, 0x8267, 0x1146 }, //112 0 3 5 - { 0x8157, 0x2315, 0x3304, 0x1326, 0x8267, 0x2315, 0x1326 }, + { 0x8157, 0x2315, 0x3304, 0x1326, 0x8267, 0x2315, 0x1326, 0x2315, 0x8267 }, { 0x8267, 0x8157, 0x2315, 0x6201, 0x5102, 0x1326 }, { 0x8267, 0x1326, 0x3304, 0x6201, 0x4113, 0x8157, 0x8267, 0x1326, 0x6201, 0x4113, 0x6201, 0x4113 }, - { 0x8267, 0x8157, 0x4113, 0x5102, 0x1326, 0x8157, 0x5102 }, + { 0x8267, 0x8157, 0x4113, 0x5102, 0x1326, 0x8157, 0x5102, 0x8157, 0x1326 }, { 0x5102, 0x4223, 0x8267, 0x8157, 0x2315, 0x3304 }, - { 0x2315, 0x6201, 0x4223, 0x8267, 0x8157, 0x6201, 0x8267 }, + { 0x2315, 0x6201, 0x4223, 0x8267, 0x8157, 0x6201, 0x8267, 0x6201, 0x8157 }, { 0x3304, 0x5102, 0x4223, 0x8267, 0x8157, 0x4113, 0x6201 }, { 0x4113, 0x4223, 0x8267, 0x8157, 0x4113, 0x8267 }, { 0x8157, 0x2315, 0x3304, 0x1326, 0x8267, 0x4223, 0x4113, 0x8337 }, @@ -237,12 +236,12 @@ unsigned short regularVertexData[256][12] = { { 0x4223, 0x1326, 0x3304, 0x2315, 0x4113, 0x8337, 0x8157, 0x8267 }, { 0x4113, 0x8157, 0x8267, 0x4223, 0x4113, 0x8267 }, { 0x4223, 0x4113, 0x8157, 0x8267, 0x6201, 0x5102, 0x3304 }, - { 0x8157, 0x8267, 0x4223, 0x6201, 0x2315, 0x8267, 0x6201 }, + { 0x8157, 0x8267, 0x4223, 0x6201, 0x2315, 0x8267, 0x6201, 0x8267, 0x2315 }, { 0x3304, 0x2315, 0x8157, 0x8267, 0x4223, 0x5102 }, - { 0x1326, 0x5102, 0x4113, 0x8157, 0x8267, 0x5102, 0x8157 }, + { 0x1326, 0x5102, 0x4113, 0x8157, 0x8267, 0x5102, 0x8157, 0x5102, 0x8267 }, { 0x8157, 0x4113, 0x6201, 0x3304, 0x1326, 0x8267 }, { 0x1326, 0x5102, 0x6201, 0x2315, 0x8157, 0x8267, 0x1326, 0x5102, 0x2315, 0x8157, 0x2315, 0x8157 }, - { 0x8267, 0x1326, 0x3304, 0x2315, 0x8157, 0x1326, 0x2315 }, + { 0x8267, 0x1326, 0x3304, 0x2315, 0x8157, 0x1326, 0x2315, 0x1326, 0x8157 }, //144 - { 0x3304, 0x1146, 0x2245, 0x8337, 0x8157, 0x8267 }, { 0x6201, 0x5102, 0x1146, 0x2245, 0x8337, 0x8157, 0x8267 }, @@ -263,32 +262,32 @@ unsigned short regularVertexData[256][12] = { //160 2 8 11 14 { 0x2315, 0x2245, 0x8267, 0x8337, 0x2315, 0x8267 }, { 0x2315, 0x2245, 0x8267, 0x8337, 0x6201, 0x5102, 0x3304 }, - { 0x4113, 0x6201, 0x2245, 0x8267, 0x8337, 0x6201, 0x8267 }, + { 0x4113, 0x6201, 0x2245, 0x8267, 0x8337, 0x6201, 0x8267, 0x6201, 0x8337 }, { 0x5102, 0x4113, 0x8337, 0x8267, 0x2245, 0x3304 }, { 0x2315, 0x2245, 0x8267, 0x8337, 0x5102, 0x4223, 0x1326 }, { 0x6201, 0x4223, 0x1326, 0x3304, 0x8337, 0x2315, 0x2245, 0x8267 }, { 0x4113, 0x6201, 0x2245, 0x8267, 0x8337, 0x5102, 0x4223, 0x1326 }, { 0x4113, 0x4223, 0x1326, 0x3304, 0x2245, 0x8267, 0x8337 }, - { 0x2315, 0x2245, 0x8267, 0x4223, 0x4113, 0x2245, 0x4223 }, + { 0x2315, 0x2245, 0x8267, 0x4223, 0x4113, 0x2245, 0x4223, 0x2245, 0x4113 }, { 0x2315, 0x2245, 0x8267, 0x4223, 0x4113, 0x6201, 0x5102, 0x3304 }, { 0x6201, 0x2245, 0x8267, 0x4223, 0x6201, 0x8267 }, - { 0x3304, 0x2245, 0x8267, 0x4223, 0x5102, 0x2245, 0x4223 }, + { 0x3304, 0x2245, 0x8267, 0x4223, 0x5102, 0x2245, 0x4223, 0x2245, 0x5102 }, { 0x5102, 0x4113, 0x2315, 0x2245, 0x8267, 0x1326 }, { 0x4113, 0x2315, 0x2245, 0x8267, 0x1326, 0x3304, 0x6201 }, - { 0x5102, 0x6201, 0x2245, 0x8267, 0x1326, 0x6201, 0x8267 }, + { 0x5102, 0x6201, 0x2245, 0x8267, 0x1326, 0x6201, 0x8267, 0x6201, 0x1326 }, { 0x3304, 0x2245, 0x8267, 0x1326, 0x3304, 0x8267 }, //176 0 3 10 - { 0x8267, 0x8337, 0x2315, 0x3304, 0x1146, 0x8337, 0x3304 }, + { 0x8267, 0x8337, 0x2315, 0x3304, 0x1146, 0x8337, 0x3304, 0x8337, 0x1146 }, { 0x5102, 0x1146, 0x8267, 0x8337, 0x2315, 0x6201 }, { 0x3304, 0x1146, 0x8267, 0x8337, 0x4113, 0x6201, 0x3304, 0x1146, 0x8337, 0x4113, 0x8337, 0x4113 }, - { 0x8337, 0x4113, 0x5102, 0x1146, 0x8267, 0x4113, 0x1146 }, + { 0x8337, 0x4113, 0x5102, 0x1146, 0x8267, 0x4113, 0x1146, 0x4113, 0x8267 }, { 0x8267, 0x8337, 0x2315, 0x3304, 0x1146, 0x5102, 0x4223, 0x1326 }, { 0x1146, 0x8267, 0x8337, 0x2315, 0x6201, 0x4223, 0x1326 }, { 0x8267, 0x8337, 0x4113, 0x6201, 0x3304, 0x1146, 0x5102, 0x4223, 0x1326 }, { 0x4113, 0x4223, 0x1326, 0x1146, 0x8267, 0x8337 }, { 0x3304, 0x2315, 0x4113, 0x4223, 0x8267, 0x1146 }, { 0x2315, 0x6201, 0x5102, 0x1146, 0x8267, 0x4223, 0x4113 }, - { 0x1146, 0x8267, 0x4223, 0x6201, 0x3304, 0x8267, 0x6201 }, + { 0x1146, 0x8267, 0x4223, 0x6201, 0x3304, 0x8267, 0x6201, 0x8267, 0x3304 }, { 0x5102, 0x1146, 0x8267, 0x4223, 0x5102, 0x8267 }, { 0x8267, 0x1326, 0x5102, 0x4113, 0x2315, 0x3304, 0x1146 }, { 0x6201, 0x4113, 0x2315, 0x1326, 0x1146, 0x8267 }, @@ -299,37 +298,37 @@ unsigned short regularVertexData[256][12] = { { 0x8337, 0x8157, 0x1146, 0x1326, 0x6201, 0x5102, 0x3304 }, { 0x8337, 0x8157, 0x1146, 0x1326, 0x6201, 0x2315, 0x4113 }, { 0x4113, 0x5102, 0x3304, 0x2315, 0x1326, 0x8337, 0x8157, 0x1146 }, - { 0x8337, 0x8157, 0x1146, 0x5102, 0x4223, 0x8157, 0x5102 }, + { 0x8337, 0x8157, 0x1146, 0x5102, 0x4223, 0x8157, 0x5102, 0x8157, 0x4223 }, { 0x6201, 0x4223, 0x8337, 0x8157, 0x1146, 0x3304 }, { 0x8337, 0x8157, 0x1146, 0x5102, 0x4223, 0x6201, 0x2315, 0x4113 }, { 0x4223, 0x8337, 0x8157, 0x1146, 0x3304, 0x2315, 0x4113 }, - { 0x4223, 0x4113, 0x8157, 0x1146, 0x1326, 0x4113, 0x1146 }, + { 0x4223, 0x4113, 0x8157, 0x1146, 0x1326, 0x4113, 0x1146, 0x4113, 0x1326 }, { 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, 0x1146 }, - { 0x6201, 0x4113, 0x8157, 0x1146, 0x3304, 0x4113, 0x1146 }, - { 0x2315, 0x8157, 0x1146, 0x5102, 0x6201, 0x8157, 0x5102 }, + { 0x6201, 0x4113, 0x8157, 0x1146, 0x3304, 0x4113, 0x1146, 0x4113, 0x3304 }, + { 0x2315, 0x8157, 0x1146, 0x5102, 0x6201, 0x8157, 0x5102, 0x8157, 0x6201 }, { 0x2315, 0x8157, 0x1146, 0x3304, 0x2315, 0x1146 }, //208 0 5 12 - { 0x2245, 0x3304, 0x1326, 0x8337, 0x8157, 0x3304, 0x8337 }, + { 0x2245, 0x3304, 0x1326, 0x8337, 0x8157, 0x3304, 0x8337, 0x3304, 0x8157 }, { 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, 0x2245, 0x3304, 0x2245, 0x3304 }, - { 0x8157, 0x2245, 0x6201, 0x4223, 0x8337, 0x2245, 0x4223 }, + { 0x8157, 0x2245, 0x6201, 0x4223, 0x8337, 0x2245, 0x4223, 0x2245, 0x8337 }, { 0x2245, 0x3304, 0x5102, 0x4223, 0x8337, 0x8157, 0x4113, 0x6201, 0x2315 }, { 0x4223, 0x8337, 0x8157, 0x2245, 0x2315, 0x4113 }, { 0x4113, 0x8157, 0x2245, 0x3304, 0x1326, 0x4223 }, { 0x1326, 0x4223, 0x4113, 0x8157, 0x2245, 0x6201, 0x5102 }, { 0x8157, 0x2245, 0x3304, 0x1326, 0x4223, 0x6201, 0x2315 }, { 0x5102, 0x1326, 0x4223, 0x2315, 0x8157, 0x2245 }, - { 0x3304, 0x5102, 0x4113, 0x8157, 0x2245, 0x5102, 0x8157 }, + { 0x3304, 0x5102, 0x4113, 0x8157, 0x2245, 0x5102, 0x8157, 0x5102, 0x2245 }, { 0x4113, 0x8157, 0x2245, 0x6201, 0x4113, 0x2245 }, { 0x5102, 0x6201, 0x2315, 0x8157, 0x2245, 0x3304 }, { 0x2315, 0x8157, 0x2245 }, //224 0 10 12 - { 0x1146, 0x1326, 0x8337, 0x2315, 0x2245, 0x1326, 0x2315 }, + { 0x1146, 0x1326, 0x8337, 0x2315, 0x2245, 0x1326, 0x2315, 0x1326, 0x2245 }, { 0x1146, 0x1326, 0x8337, 0x2315, 0x2245, 0x6201, 0x5102, 0x3304 }, { 0x6201, 0x2245, 0x1146, 0x1326, 0x8337, 0x4113 }, { 0x2245, 0x1146, 0x1326, 0x8337, 0x4113, 0x5102, 0x3304 }, @@ -339,22 +338,22 @@ unsigned short regularVertexData[256][12] = { { 0x4223, 0x8337, 0x4113, 0x3304, 0x2245, 0x1146 }, { 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 }, + { 0x1326, 0x4223, 0x6201, 0x2245, 0x1146, 0x4223, 0x2245, 0x4223, 0x1146 }, { 0x4223, 0x5102, 0x3304, 0x2245, 0x1146, 0x1326 }, - { 0x2245, 0x1146, 0x5102, 0x4113, 0x2315, 0x1146, 0x4113 }, + { 0x2245, 0x1146, 0x5102, 0x4113, 0x2315, 0x1146, 0x4113, 0x1146, 0x2315 }, { 0x4113, 0x2315, 0x2245, 0x1146, 0x3304, 0x6201 }, { 0x6201, 0x2245, 0x1146, 0x5102, 0x6201, 0x1146 }, { 0x3304, 0x2245, 0x1146 }, //240 1 2 4 8 { 0x3304, 0x1326, 0x8337, 0x2315, 0x3304, 0x8337 }, - { 0x5102, 0x1326, 0x8337, 0x2315, 0x6201, 0x1326, 0x2315 }, - { 0x6201, 0x3304, 0x1326, 0x8337, 0x4113, 0x3304, 0x8337 }, + { 0x5102, 0x1326, 0x8337, 0x2315, 0x6201, 0x1326, 0x2315, 0x1326, 0x6201 }, + { 0x6201, 0x3304, 0x1326, 0x8337, 0x4113, 0x3304, 0x8337, 0x3304, 0x4113 }, { 0x5102, 0x1326, 0x8337, 0x4113, 0x5102, 0x8337 }, - { 0x4223, 0x8337, 0x2315, 0x3304, 0x5102, 0x8337, 0x3304 }, + { 0x4223, 0x8337, 0x2315, 0x3304, 0x5102, 0x8337, 0x3304, 0x8337, 0x5102 }, { 0x6201, 0x4223, 0x8337, 0x2315, 0x6201, 0x8337 }, { 0x3304, 0x5102, 0x4223, 0x8337, 0x4113, 0x6201 }, { 0x4113, 0x4223, 0x8337 }, - { 0x4113, 0x2315, 0x3304, 0x1326, 0x4223, 0x2315, 0x1326 }, + { 0x4113, 0x2315, 0x3304, 0x1326, 0x4223, 0x2315, 0x1326, 0x2315, 0x4223 }, { 0x1326, 0x4223, 0x4113, 0x2315, 0x6201, 0x5102 }, { 0x3304, 0x1326, 0x4223, 0x6201, 0x3304, 0x4223 }, { 0x5102, 0x1326, 0x4223 },