From 5ff408758b33582f7b58d34e8ea669f75171034e Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 5 Sep 2019 13:01:27 +0200 Subject: [PATCH] Fixed equivalence class 13's uvs. --- meshers/transvoxel_tables.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/meshers/transvoxel_tables.cpp b/meshers/transvoxel_tables.cpp index cd49c8b..46ae35e 100644 --- a/meshers/transvoxel_tables.cpp +++ b/meshers/transvoxel_tables.cpp @@ -77,9 +77,9 @@ const RegularCellData regularCellData[16] = { { 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 } }, { 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, { 0, 4, 5, 6, 7, 8, 9, 10, 11, 1, 2, 3 } }, //C { 0x64, { 0, 4, 5, 0, 3, 4, 0, 1, 3, 1, 2, 3 } }, - { 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 } } + { 0xC4, { 0, 1, 2, 6, 7, 3, 8, 9, 4, 10, 11, 5 } }, //D { 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 } } }; // The regularVertexData table gives the vertex locations for every one of the 256 possible @@ -206,7 +206,7 @@ const unsigned short regularVertexData[256][12] = { { 0x8267, 0x1146, 0x5102, 0x4113, 0x8337, 0x2315, 0x2245, 0x8157 }, { 0x6201, 0x4113, 0x8337, 0x8267, 0x1146, 0x3304, 0x2315, 0x2245, 0x8157 }, { 0x8337, 0x8267, 0x1146, 0x5102, 0x6201, 0x2245, 0x8157 }, - { 0x3304, 0x2245, 0x8157, 0x8337, 0x8267, 0x1146 }, + { 0x3304, 0x2245, 0x8157, 0x8337, 0x8267, 0x1146, 0x3304, 0x8157, 0x3304, 0x8337, 0x3304, 0x8267 }, //112 0 3 5 { 0x8157, 0x2315, 0x3304, 0x1326, 0x8267, 0x2315, 0x1326, 0x2315, 0x8267 }, { 0x8267, 0x8157, 0x2315, 0x6201, 0x5102, 0x1326, 0x8267, 0x6201, 0x5102, 0x8267, 0x8157, 0x6201 }, @@ -219,9 +219,9 @@ const unsigned short regularVertexData[256][12] = { { 0x8157, 0x2315, 0x3304, 0x1326, 0x8267, 0x4223, 0x4113, 0x8337 }, { 0x8157, 0x2315, 0x6201, 0x5102, 0x1326, 0x8267, 0x4223, 0x4113, 0x8337 }, { 0x8157, 0x8337, 0x4223, 0x6201, 0x3304, 0x1326, 0x8267 }, - { 0x5102, 0x1326, 0x8267, 0x8157, 0x8337, 0x4223 }, + { 0x5102, 0x1326, 0x8267, 0x8157, 0x8337, 0x4223, 0x5102, 0x8267, 0x5102, 0x8157, 0x5102, 0x8337 }, { 0x8267, 0x8157, 0x2315, 0x3304, 0x5102, 0x4113, 0x8337 }, - { 0x6201, 0x4113, 0x8337, 0x8267, 0x8157, 0x2315 }, + { 0x6201, 0x4113, 0x8337, 0x8267, 0x8157, 0x2315, 0x6201, 0x8337, 0x6201, 0x8267, 0x6201, 0x8157 }, { 0x6201, 0x3304, 0x5102, 0x8337, 0x8267, 0x8157 }, { 0x8337, 0x8267, 0x8157 }, //128 10 12 15 @@ -257,7 +257,7 @@ const unsigned short regularVertexData[256][12] = { { 0x1326, 0x5102, 0x4113, 0x8157, 0x8267, 0x3304, 0x1146, 0x2245 }, { 0x1326, 0x1146, 0x2245, 0x6201, 0x4113, 0x8157, 0x8267 }, { 0x5102, 0x6201, 0x2315, 0x8157, 0x8267, 0x1326, 0x3304, 0x1146, 0x2245 }, - { 0x1326, 0x1146, 0x2245, 0x2315, 0x8157, 0x8267 }, + { 0x1326, 0x1146, 0x2245, 0x2315, 0x8157, 0x8267, 0x1326, 0x2245, 0x1326, 0x2315, 0x1326, 0x8157 }, //160 2 8 11 14 { 0x2315, 0x2245, 0x8267, 0x8337, 0x2315, 0x8267 }, { 0x2315, 0x2245, 0x8267, 0x8337, 0x6201, 0x5102, 0x3304 }, @@ -283,14 +283,14 @@ const unsigned short regularVertexData[256][12] = { { 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 }, + { 0x4113, 0x4223, 0x1326, 0x1146, 0x8267, 0x8337, 0x4113, 0x1326, 0x4113, 0x1146, 0x4113, 0x8267 }, { 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 }, { 0x8267, 0x1326, 0x5102, 0x4113, 0x2315, 0x3304, 0x1146 }, { 0x6201, 0x4113, 0x2315, 0x1326, 0x1146, 0x8267 }, - { 0x6201, 0x3304, 0x1146, 0x8267, 0x1326, 0x5102 }, + { 0x6201, 0x3304, 0x1146, 0x8267, 0x1326, 0x5102, 0x6201, 0x1146, 0x6201, 0x8267, 0x6201, 0x1326 }, { 0x1326, 0x1146, 0x8267 }, //192 4 8 13 14 { 0x1326, 0x8337, 0x8157, 0x1146, 0x1326, 0x8157 }, @@ -317,14 +317,14 @@ const unsigned short regularVertexData[256][12] = { { 0x4223, 0x8337, 0x8157, 0x2245, 0x3304, 0x5102, 0x4223, 0x2245, 0x3304, 0x4223, 0x8337, 0x2245 }, { 0x8157, 0x2245, 0x6201, 0x4223, 0x8337, 0x2245, 0x4223, 0x2245, 0x8337 }, { 0x2245, 0x3304, 0x5102, 0x4223, 0x8337, 0x8157, 0x4113, 0x6201, 0x2315 }, - { 0x4223, 0x8337, 0x8157, 0x2245, 0x2315, 0x4113 }, + { 0x4223, 0x8337, 0x8157, 0x2245, 0x2315, 0x4113, 0x4223, 0x8157, 0x4223, 0x2245, 0x4223, 0x2315 }, { 0x4113, 0x8157, 0x2245, 0x3304, 0x1326, 0x4223, 0x4113, 0x8157, 0x1326, 0x8157, 0x3304, 0x1326 }, { 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, 0x5102, 0x2245 }, { 0x4113, 0x8157, 0x2245, 0x6201, 0x4113, 0x2245 }, - { 0x5102, 0x6201, 0x2315, 0x8157, 0x2245, 0x3304 }, + { 0x5102, 0x6201, 0x2315, 0x8157, 0x2245, 0x3304, 0x5102, 0x2315, 0x5102, 0x8157, 0x5102, 0x2245 }, { 0x2315, 0x8157, 0x2245 }, //224 0 10 12 { 0x1146, 0x1326, 0x8337, 0x2315, 0x2245, 0x1326, 0x2315, 0x1326, 0x2245 }, @@ -338,9 +338,9 @@ const unsigned short regularVertexData[256][12] = { { 0x4113, 0x2315, 0x2245, 0x1146, 0x1326, 0x4223, 0x4113, 0x1146, 0x1326, 0x4113, 0x2315, 0x1146 }, { 0x1146, 0x1326, 0x4223, 0x4113, 0x2315, 0x2245, 0x6201, 0x5102, 0x3304 }, { 0x1326, 0x4223, 0x6201, 0x2245, 0x1146, 0x4223, 0x2245, 0x4223, 0x1146 }, - { 0x4223, 0x5102, 0x3304, 0x2245, 0x1146, 0x1326 }, + { 0x4223, 0x5102, 0x3304, 0x2245, 0x1146, 0x1326, 0x4223, 0x3304, 0x4223, 0x2245, 0x4223, 0x1146 }, { 0x2245, 0x1146, 0x5102, 0x4113, 0x2315, 0x1146, 0x4113, 0x1146, 0x2315 }, - { 0x4113, 0x2315, 0x2245, 0x1146, 0x3304, 0x6201 }, + { 0x4113, 0x2315, 0x2245, 0x1146, 0x3304, 0x6201, 0x4113, 0x2245, 0x4113, 0x1146, 0x4113, 0x3304 }, { 0x6201, 0x2245, 0x1146, 0x5102, 0x6201, 0x1146 }, { 0x3304, 0x2245, 0x1146 }, //240 1 2 4 8 @@ -350,10 +350,10 @@ const unsigned short regularVertexData[256][12] = { { 0x5102, 0x1326, 0x8337, 0x4113, 0x5102, 0x8337 }, { 0x4223, 0x8337, 0x2315, 0x3304, 0x5102, 0x8337, 0x3304, 0x8337, 0x5102 }, { 0x6201, 0x4223, 0x8337, 0x2315, 0x6201, 0x8337 }, - { 0x3304, 0x5102, 0x4223, 0x8337, 0x4113, 0x6201 }, + { 0x3304, 0x5102, 0x4223, 0x8337, 0x4113, 0x6201, 0x3304, 0x4223, 0x3304, 0x8337, 0x3304, 0x4113 }, { 0x4113, 0x4223, 0x8337 }, { 0x4113, 0x2315, 0x3304, 0x1326, 0x4223, 0x2315, 0x1326, 0x2315, 0x4223 }, - { 0x1326, 0x4223, 0x4113, 0x2315, 0x6201, 0x5102 }, + { 0x1326, 0x4223, 0x4113, 0x2315, 0x6201, 0x5102, 0x1326, 0x4113, 0x1326, 0x2315, 0x1326, 0x6201 }, { 0x3304, 0x1326, 0x4223, 0x6201, 0x3304, 0x4223 }, { 0x5102, 0x1326, 0x4223 }, { 0x5102, 0x4113, 0x2315, 0x3304, 0x5102, 0x2315 },