diff --git a/meshers/transvoxel_tables.cpp b/meshers/transvoxel_tables.cpp index 728d512..ab9fb05 100644 --- a/meshers/transvoxel_tables.cpp +++ b/meshers/transvoxel_tables.cpp @@ -75,7 +75,7 @@ const RegularCellData regularCellData[16] = { { 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 } }, { 0xC4, { 0, 4, 5, 6, 7, 8, 9, 10, 11, 1, 2, 3 } }, //A { 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 } }, + { 0xC4, { 0, 5, 4, 6, 8, 7, 9, 11, 10, 1, 3, 2 } }, //B { 0x64, { 0, 5, 4, 0, 4, 1, 1, 4, 3, 1, 3, 2 } }, { 0xC4, { 6, 9, 5, 0, 10, 11, 0, 1, 3, 7, 2, 8, } }, //{ 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 { 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 } }, @@ -117,7 +117,7 @@ unsigned short regularVertexData[256][12] = { { 0x4223, 0x4113, 0x8337, 0x3304, 0x1146, 0x2245 }, { 0x6201, 0x5102, 0x1146, 0x2245, 0x4223, 0x4113, 0x8337 }, { 0x4223, 0x6201, 0x2315, 0x8337, 0x3304, 0x1146, 0x2245 }, - { 0x4223, 0x8337, 0x2315, 0x2245, 0x1146, 0x5102 }, + { 0x4223, 0x8337, 0x2315, 0x2245, 0x1146, 0x5102, 0x4223, 0x8337, 0x1146, 0x8337, 0x2245, 0x1146 }, { 0x5102, 0x4113, 0x8337, 0x1326, 0x3304, 0x1146, 0x2245 }, { 0x4113, 0x8337, 0x1326, 0x1146, 0x2245, 0x6201, 0x4113, 0x8337, 0x2245, 0x8337, 0x1146, 0x2245 }, { 0x6201, 0x2315, 0x8337, 0x1326, 0x5102, 0x3304, 0x1146, 0x2245 }, @@ -137,7 +137,7 @@ unsigned short regularVertexData[256][12] = { { 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 }, + { 0x5102, 0x1326, 0x8337, 0x8157, 0x2245, 0x6201, 0x5102, 0x1326, 0x2245, 0x1326, 0x8157, 0x2245 }, { 0x8157, 0x8337, 0x1326, 0x3304, 0x2245, 0x8337, 0x3304, 0x8337, 0x2245 }, //48 1 2 7 11 { 0x2315, 0x3304, 0x1146, 0x8157, 0x2315, 0x1146 }, @@ -145,7 +145,7 @@ unsigned short regularVertexData[256][12] = { { 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 }, + { 0x1326, 0x4223, 0x6201, 0x2315, 0x8157, 0x1146, 0x1326, 0x4223, 0x8157, 0x4223, 0x2315, 0x8157 }, { 0x3304, 0x1146, 0x8157, 0x4113, 0x6201, 0x5102, 0x4223, 0x1326 }, { 0x1326, 0x1146, 0x8157, 0x4113, 0x4223, 0x1146, 0x4113, 0x1146, 0x4223 }, { 0x2315, 0x3304, 0x1146, 0x8157, 0x4223, 0x4113, 0x8337 }, @@ -164,7 +164,7 @@ unsigned short regularVertexData[256][12] = { { 0x5102, 0x4223, 0x8267, 0x1146, 0x5102, 0x8267 }, { 0x3304, 0x6201, 0x4223, 0x8267, 0x1146, 0x6201, 0x8267, 0x6201, 0x1146 }, { 0x5102, 0x4223, 0x8267, 0x1146, 0x6201, 0x2315, 0x4113 }, - { 0x1146, 0x8267, 0x4223, 0x4113, 0x2315, 0x3304 }, + { 0x1146, 0x8267, 0x4223, 0x4113, 0x2315, 0x3304, 0x1146, 0x8267, 0x2315, 0x8267, 0x4113, 0x2315 }, { 0x4113, 0x8337, 0x4223, 0x1326, 0x8267, 0x1146 }, { 0x6201, 0x5102, 0x3304, 0x4223, 0x4113, 0x8337, 0x1326, 0x8267, 0x1146 }, { 0x6201, 0x2315, 0x8337, 0x4223, 0x1326, 0x8267, 0x1146 }, @@ -186,7 +186,7 @@ unsigned short regularVertexData[256][12] = { { 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 }, + { 0x3304, 0x2245, 0x8267, 0x8337, 0x4113, 0x5102, 0x3304, 0x2245, 0x4113, 0x2245, 0x8337, 0x4113 }, { 0x8337, 0x8267, 0x2245, 0x6201, 0x4113, 0x8267, 0x6201, 0x8267, 0x4113 }, { 0x5102, 0x6201, 0x2315, 0x8337, 0x8267, 0x2245, 0x3304 }, { 0x2315, 0x8337, 0x8267, 0x2245, 0x2315, 0x8267 }, @@ -238,7 +238,7 @@ unsigned short regularVertexData[256][12] = { { 0x8157, 0x8267, 0x4223, 0x6201, 0x2315, 0x8267, 0x6201, 0x8267, 0x2315 }, { 0x3304, 0x2315, 0x8157, 0x8267, 0x4223, 0x5102, 0x3304, 0x2315, 0x4223, 0x2315, 0x8267, 0x4223 }, { 0x1326, 0x5102, 0x4113, 0x8157, 0x8267, 0x5102, 0x8157, 0x5102, 0x8267 }, - { 0x8157, 0x4113, 0x6201, 0x3304, 0x1326, 0x8267 }, + { 0x8157, 0x4113, 0x6201, 0x3304, 0x1326, 0x8267, 0x8157, 0x4113, 0x1326, 0x4113, 0x3304, 0x1326 }, { 0x1326, 0x5102, 0x6201, 0x2315, 0x8157, 0x8267, 0x1326, 0x5102, 0x2315, 0x8157, 0x2315, 0x8157 }, { 0x8267, 0x1326, 0x3304, 0x2315, 0x8157, 0x1326, 0x2315, 0x1326, 0x8157 }, //144 - @@ -262,7 +262,7 @@ unsigned short regularVertexData[256][12] = { { 0x2315, 0x2245, 0x8267, 0x8337, 0x2315, 0x8267 }, { 0x2315, 0x2245, 0x8267, 0x8337, 0x6201, 0x5102, 0x3304 }, { 0x4113, 0x6201, 0x2245, 0x8267, 0x8337, 0x6201, 0x8267, 0x6201, 0x8337 }, - { 0x5102, 0x4113, 0x8337, 0x8267, 0x2245, 0x3304 }, + { 0x5102, 0x4113, 0x8337, 0x8267, 0x2245, 0x3304, 0x5102, 0x4113, 0x2245, 0x4113, 0x8267, 0x2245 }, { 0x2315, 0x2245, 0x8267, 0x8337, 0x5102, 0x4223, 0x1326 }, { 0x6201, 0x4223, 0x1326, 0x3304, 0x8337, 0x2315, 0x2245, 0x8267 }, { 0x4113, 0x6201, 0x2245, 0x8267, 0x8337, 0x5102, 0x4223, 0x1326 }, @@ -284,7 +284,7 @@ unsigned short regularVertexData[256][12] = { { 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 }, + { 0x3304, 0x2315, 0x4113, 0x4223, 0x8267, 0x1146, 0x3304, 0x2315, 0x8267, 0x2315, 0x4223, 0x8267 }, { 0x2315, 0x6201, 0x5102, 0x1146, 0x8267, 0x4223, 0x4113 }, { 0x1146, 0x8267, 0x4223, 0x6201, 0x3304, 0x8267, 0x6201, 0x8267, 0x3304 }, { 0x5102, 0x1146, 0x8267, 0x4223, 0x5102, 0x8267 }, @@ -303,7 +303,7 @@ unsigned short regularVertexData[256][12] = { { 0x4223, 0x8337, 0x8157, 0x1146, 0x3304, 0x2315, 0x4113 }, { 0x4223, 0x4113, 0x8157, 0x1146, 0x1326, 0x4113, 0x1146, 0x4113, 0x1326 }, { 0x4223, 0x4113, 0x8157, 0x1146, 0x1326, 0x6201, 0x5102, 0x3304 }, - { 0x1146, 0x8157, 0x2315, 0x6201, 0x4223, 0x1326 }, + { 0x1146, 0x8157, 0x2315, 0x6201, 0x4223, 0x1326, 0x1146, 0x8157, 0x4223, 0x8157, 0x6201, 0x4223 }, { 0x4223, 0x5102, 0x3304, 0x2315, 0x8157, 0x1146, 0x1326 }, { 0x4113, 0x8157, 0x1146, 0x5102, 0x4113, 0x1146 }, { 0x6201, 0x4113, 0x8157, 0x1146, 0x3304, 0x4113, 0x1146, 0x4113, 0x3304 }, @@ -311,7 +311,7 @@ unsigned short regularVertexData[256][12] = { { 0x2315, 0x8157, 0x1146, 0x3304, 0x2315, 0x1146 }, //208 0 5 12 { 0x2245, 0x3304, 0x1326, 0x8337, 0x8157, 0x3304, 0x8337, 0x3304, 0x8157 }, - { 0x6201, 0x2245, 0x8157, 0x8337, 0x1326, 0x5102 }, + { 0x6201, 0x2245, 0x8157, 0x8337, 0x1326, 0x5102, 0x6201, 0x2245, 0x1326, 0x2245, 0x8337, 0x1326 }, { 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 }, @@ -331,7 +331,7 @@ unsigned short regularVertexData[256][12] = { { 0x1146, 0x1326, 0x8337, 0x2315, 0x2245, 0x6201, 0x5102, 0x3304 }, { 0x6201, 0x2245, 0x1146, 0x1326, 0x8337, 0x4113, 0x6201, 0x2245, 0x8337, 0x2245, 0x1326, 0x8337 }, { 0x2245, 0x1146, 0x1326, 0x8337, 0x4113, 0x5102, 0x3304 }, - { 0x5102, 0x1146, 0x2245, 0x2315, 0x8337, 0x4223 }, + { 0x5102, 0x1146, 0x2245, 0x2315, 0x8337, 0x4223, 0x5102, 0x1146, 0x8337, 0x1146, 0x2315, 0x8337 }, { 0x1146, 0x3304, 0x6201, 0x4223, 0x8337, 0x2315, 0x2245 }, { 0x8337, 0x4113, 0x6201, 0x2245, 0x1146, 0x5102, 0x4223 }, { 0x4223, 0x8337, 0x4113, 0x3304, 0x2245, 0x1146 },