Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2024-11-14 10:17:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed thee 10th equivalence class's uv artifacts.

Browse Source
This commit is contained in:
Relintai 2019-09-05 00:41:40 +02:00
parent a806aa7eea
commit 8cf78ef519
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meshers/transvoxel_tables.cpp
View File

@ -74,10 +74,9 @@ const RegularCellData regularCellData[16] = {
{ 0x84, { 0, 1, 4, 1, 3, 4, 1, 2, 3, 5, 6, 7 } }, { 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 } }, { 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, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 } },
{ 0x64, { 0, 4, 5, 0, 1, 4, 1, 3, 4, 1, 2, 3 } }, { 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 } }, { 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, } }, //{ 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 } }, { 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 } }, { 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 } } { 0x95, { 0, 4, 5, 0, 3, 4, 0, 1, 3, 1, 2, 3, 6, 7, 8 } }
@ -120,7 +119,7 @@ unsigned short regularVertexData[256][12] = {
{ 0x4223, 0x6201, 0x2315, 0x8337, 0x3304, 0x1146, 0x2245 }, { 0x4223, 0x6201, 0x2315, 0x8337, 0x3304, 0x1146, 0x2245 },
{ 0x4223, 0x8337, 0x2315, 0x2245, 0x1146, 0x5102 }, { 0x4223, 0x8337, 0x2315, 0x2245, 0x1146, 0x5102 },
{ 0x5102, 0x4113, 0x8337, 0x1326, 0x3304, 0x1146, 0x2245 }, { 0x5102, 0x4113, 0x8337, 0x1326, 0x3304, 0x1146, 0x2245 },
{ 0x4113, 0x8337, 0x1326, 0x1146, 0x2245, 0x6201 }, { 0x4113, 0x8337, 0x1326, 0x1146, 0x2245, 0x6201, 0x4113, 0x8337, 0x2245, 0x8337, 0x1146, 0x2245 },
{ 0x6201, 0x2315, 0x8337, 0x1326, 0x5102, 0x3304, 0x1146, 0x2245 }, { 0x6201, 0x2315, 0x8337, 0x1326, 0x5102, 0x3304, 0x1146, 0x2245 },
{ 0x2245, 0x2315, 0x8337, 0x1326, 0x1146, 0x2315, 0x1326, 0x2315, 0x1146 }, { 0x2245, 0x2315, 0x8337, 0x1326, 0x1146, 0x2315, 0x1326, 0x2315, 0x1146 },
//32 3 10 15 //32 3 10 15
@ -131,7 +130,7 @@ unsigned short regularVertexData[256][12] = {
{ 0x5102, 0x4223, 0x1326, 0x2315, 0x2245, 0x8157 }, { 0x5102, 0x4223, 0x1326, 0x2315, 0x2245, 0x8157 },
{ 0x6201, 0x4223, 0x1326, 0x3304, 0x2315, 0x2245, 0x8157 }, { 0x6201, 0x4223, 0x1326, 0x3304, 0x2315, 0x2245, 0x8157 },
{ 0x6201, 0x2245, 0x8157, 0x4113, 0x5102, 0x4223, 0x1326 }, { 0x6201, 0x2245, 0x8157, 0x4113, 0x5102, 0x4223, 0x1326 },
{ 0x4223, 0x1326, 0x3304, 0x2245, 0x8157, 0x4113 }, { 0x4223, 0x1326, 0x3304, 0x2245, 0x8157, 0x4113, 0x4223, 0x1326, 0x8157, 0x1326, 0x2245, 0x8157 },
{ 0x4223, 0x4113, 0x8337, 0x2315, 0x2245, 0x8157 }, { 0x4223, 0x4113, 0x8337, 0x2315, 0x2245, 0x8157 },
{ 0x6201, 0x5102, 0x3304, 0x4223, 0x4113, 0x8337, 0x2315, 0x2245, 0x8157 }, { 0x6201, 0x5102, 0x3304, 0x4223, 0x4113, 0x8337, 0x2315, 0x2245, 0x8157 },
{ 0x8337, 0x4223, 0x6201, 0x2245, 0x8157, 0x4223, 0x2245, 0x4223, 0x8157 }, { 0x8337, 0x4223, 0x6201, 0x2245, 0x8157, 0x4223, 0x2245, 0x4223, 0x8157 },
@ -151,7 +150,7 @@ unsigned short regularVertexData[256][12] = {
{ 0x1326, 0x1146, 0x8157, 0x4113, 0x4223, 0x1146, 0x4113, 0x1146, 0x4223 }, { 0x1326, 0x1146, 0x8157, 0x4113, 0x4223, 0x1146, 0x4113, 0x1146, 0x4223 },
{ 0x2315, 0x3304, 0x1146, 0x8157, 0x4223, 0x4113, 0x8337 }, { 0x2315, 0x3304, 0x1146, 0x8157, 0x4223, 0x4113, 0x8337 },
{ 0x6201, 0x5102, 0x1146, 0x8157, 0x2315, 0x4223, 0x4113, 0x8337 }, { 0x6201, 0x5102, 0x1146, 0x8157, 0x2315, 0x4223, 0x4113, 0x8337 },
{ 0x3304, 0x1146, 0x8157, 0x8337, 0x4223, 0x6201 }, { 0x3304, 0x1146, 0x8157, 0x8337, 0x4223, 0x6201, 0x3304, 0x1146, 0x4223, 0x1146, 0x8337, 0x4223 },
{ 0x4223, 0x5102, 0x1146, 0x8157, 0x8337, 0x5102, 0x8157, 0x5102, 0x8337 }, { 0x4223, 0x5102, 0x1146, 0x8157, 0x8337, 0x5102, 0x8157, 0x5102, 0x8337 },
{ 0x2315, 0x3304, 0x1146, 0x8157, 0x5102, 0x4113, 0x8337, 0x1326 }, { 0x2315, 0x3304, 0x1146, 0x8157, 0x5102, 0x4113, 0x8337, 0x1326 },
{ 0x6201, 0x4113, 0x8337, 0x1326, 0x1146, 0x8157, 0x2315 }, { 0x6201, 0x4113, 0x8337, 0x1326, 0x1146, 0x8157, 0x2315 },
@ -172,13 +171,13 @@ unsigned short regularVertexData[256][12] = {
{ 0x5102, 0x3304, 0x2315, 0x8337, 0x4223, 0x1326, 0x8267, 0x1146 }, { 0x5102, 0x3304, 0x2315, 0x8337, 0x4223, 0x1326, 0x8267, 0x1146 },
{ 0x8267, 0x1146, 0x5102, 0x4113, 0x8337, 0x1146, 0x4113, 0x1146, 0x8337 }, { 0x8267, 0x1146, 0x5102, 0x4113, 0x8337, 0x1146, 0x4113, 0x1146, 0x8337 },
{ 0x6201, 0x4113, 0x8337, 0x8267, 0x1146, 0x3304, 0x6201, 0x4113, 0x8267, 0x1146, 0x8267, 0x1146 }, { 0x6201, 0x4113, 0x8337, 0x8267, 0x1146, 0x3304, 0x6201, 0x4113, 0x8267, 0x1146, 0x8267, 0x1146 },
{ 0x6201, 0x2315, 0x8337, 0x8267, 0x1146, 0x5102 }, { 0x6201, 0x2315, 0x8337, 0x8267, 0x1146, 0x5102, 0x6201, 0x2315, 0x1146, 0x2315, 0x8267, 0x1146 },
{ 0x1146, 0x3304, 0x2315, 0x8337, 0x8267, 0x3304, 0x8337, 0x3304, 0x8267 }, { 0x1146, 0x3304, 0x2315, 0x8337, 0x8267, 0x3304, 0x8337, 0x3304, 0x8267 },
//80 1 4 7 13 //80 1 4 7 13
{ 0x3304, 0x1326, 0x8267, 0x2245, 0x3304, 0x8267 }, { 0x3304, 0x1326, 0x8267, 0x2245, 0x3304, 0x8267 },
{ 0x1326, 0x8267, 0x2245, 0x6201, 0x5102, 0x8267, 0x6201, 0x8267, 0x5102 }, { 0x1326, 0x8267, 0x2245, 0x6201, 0x5102, 0x8267, 0x6201, 0x8267, 0x5102 },
{ 0x3304, 0x1326, 0x8267, 0x2245, 0x6201, 0x2315, 0x4113 }, { 0x3304, 0x1326, 0x8267, 0x2245, 0x6201, 0x2315, 0x4113 },
{ 0x1326, 0x8267, 0x2245, 0x2315, 0x4113, 0x5102 }, { 0x1326, 0x8267, 0x2245, 0x2315, 0x4113, 0x5102, 0x1326, 0x8267, 0x4113, 0x8267, 0x2315, 0x4113 },
{ 0x5102, 0x4223, 0x8267, 0x2245, 0x3304, 0x4223, 0x2245, 0x4223, 0x3304 }, { 0x5102, 0x4223, 0x8267, 0x2245, 0x3304, 0x4223, 0x2245, 0x4223, 0x3304 },
{ 0x6201, 0x4223, 0x8267, 0x2245, 0x6201, 0x8267 }, { 0x6201, 0x4223, 0x8267, 0x2245, 0x6201, 0x8267 },
{ 0x5102, 0x4223, 0x8267, 0x2245, 0x3304, 0x6201, 0x2315, 0x4113 }, { 0x5102, 0x4223, 0x8267, 0x2245, 0x3304, 0x6201, 0x2315, 0x4113 },
@ -213,7 +212,7 @@ unsigned short regularVertexData[256][12] = {
{ 0x8267, 0x8157, 0x2315, 0x6201, 0x5102, 0x1326 }, { 0x8267, 0x8157, 0x2315, 0x6201, 0x5102, 0x1326 },
{ 0x8267, 0x1326, 0x3304, 0x6201, 0x4113, 0x8157, 0x8267, 0x1326, 0x6201, 0x4113, 0x6201, 0x4113 }, { 0x8267, 0x1326, 0x3304, 0x6201, 0x4113, 0x8157, 0x8267, 0x1326, 0x6201, 0x4113, 0x6201, 0x4113 },
{ 0x8267, 0x8157, 0x4113, 0x5102, 0x1326, 0x8157, 0x5102, 0x8157, 0x1326 }, { 0x8267, 0x8157, 0x4113, 0x5102, 0x1326, 0x8157, 0x5102, 0x8157, 0x1326 },
{ 0x5102, 0x4223, 0x8267, 0x8157, 0x2315, 0x3304 }, { 0x5102, 0x4223, 0x8267, 0x8157, 0x2315, 0x3304, 0x5102, 0x4223, 0x2315, 0x4223, 0x8157, 0x2315 },
{ 0x2315, 0x6201, 0x4223, 0x8267, 0x8157, 0x6201, 0x8267, 0x6201, 0x8157 }, { 0x2315, 0x6201, 0x4223, 0x8267, 0x8157, 0x6201, 0x8267, 0x6201, 0x8157 },
{ 0x3304, 0x5102, 0x4223, 0x8267, 0x8157, 0x4113, 0x6201 }, { 0x3304, 0x5102, 0x4223, 0x8267, 0x8157, 0x4113, 0x6201 },
{ 0x4113, 0x4223, 0x8267, 0x8157, 0x4113, 0x8267 }, { 0x4113, 0x4223, 0x8267, 0x8157, 0x4113, 0x8267 },
@ -237,7 +236,7 @@ unsigned short regularVertexData[256][12] = {
{ 0x4113, 0x8157, 0x8267, 0x4223, 0x4113, 0x8267 }, { 0x4113, 0x8157, 0x8267, 0x4223, 0x4113, 0x8267 },
{ 0x4223, 0x4113, 0x8157, 0x8267, 0x6201, 0x5102, 0x3304 }, { 0x4223, 0x4113, 0x8157, 0x8267, 0x6201, 0x5102, 0x3304 },
{ 0x8157, 0x8267, 0x4223, 0x6201, 0x2315, 0x8267, 0x6201, 0x8267, 0x2315 }, { 0x8157, 0x8267, 0x4223, 0x6201, 0x2315, 0x8267, 0x6201, 0x8267, 0x2315 },
{ 0x3304, 0x2315, 0x8157, 0x8267, 0x4223, 0x5102 }, { 0x3304, 0x2315, 0x8157, 0x8267, 0x4223, 0x5102, 0x3304, 0x2315, 0x4223, 0x2315, 0x8267, 0x4223 },
{ 0x1326, 0x5102, 0x4113, 0x8157, 0x8267, 0x5102, 0x8157, 0x5102, 0x8267 }, { 0x1326, 0x5102, 0x4113, 0x8157, 0x8267, 0x5102, 0x8157, 0x5102, 0x8267 },
{ 0x8157, 0x4113, 0x6201, 0x3304, 0x1326, 0x8267 }, { 0x8157, 0x4113, 0x6201, 0x3304, 0x1326, 0x8267 },
{ 0x1326, 0x5102, 0x6201, 0x2315, 0x8157, 0x8267, 0x1326, 0x5102, 0x2315, 0x8157, 0x2315, 0x8157 }, { 0x1326, 0x5102, 0x6201, 0x2315, 0x8157, 0x8267, 0x1326, 0x5102, 0x2315, 0x8157, 0x2315, 0x8157 },
@ -272,13 +271,13 @@ unsigned short regularVertexData[256][12] = {
{ 0x2315, 0x2245, 0x8267, 0x4223, 0x4113, 0x6201, 0x5102, 0x3304 }, { 0x2315, 0x2245, 0x8267, 0x4223, 0x4113, 0x6201, 0x5102, 0x3304 },
{ 0x6201, 0x2245, 0x8267, 0x4223, 0x6201, 0x8267 }, { 0x6201, 0x2245, 0x8267, 0x4223, 0x6201, 0x8267 },
{ 0x3304, 0x2245, 0x8267, 0x4223, 0x5102, 0x2245, 0x4223, 0x2245, 0x5102 }, { 0x3304, 0x2245, 0x8267, 0x4223, 0x5102, 0x2245, 0x4223, 0x2245, 0x5102 },
{ 0x5102, 0x4113, 0x2315, 0x2245, 0x8267, 0x1326 }, { 0x5102, 0x4113, 0x2315, 0x2245, 0x8267, 0x1326, 0x5102, 0x4113, 0x8267, 0x4113, 0x2245, 0x8267 },
{ 0x4113, 0x2315, 0x2245, 0x8267, 0x1326, 0x3304, 0x6201 }, { 0x4113, 0x2315, 0x2245, 0x8267, 0x1326, 0x3304, 0x6201 },
{ 0x5102, 0x6201, 0x2245, 0x8267, 0x1326, 0x6201, 0x8267, 0x6201, 0x1326 }, { 0x5102, 0x6201, 0x2245, 0x8267, 0x1326, 0x6201, 0x8267, 0x6201, 0x1326 },
{ 0x3304, 0x2245, 0x8267, 0x1326, 0x3304, 0x8267 }, { 0x3304, 0x2245, 0x8267, 0x1326, 0x3304, 0x8267 },
//176 0 3 10 //176 0 3 10
{ 0x8267, 0x8337, 0x2315, 0x3304, 0x1146, 0x8337, 0x3304, 0x8337, 0x1146 }, { 0x8267, 0x8337, 0x2315, 0x3304, 0x1146, 0x8337, 0x3304, 0x8337, 0x1146 },
{ 0x5102, 0x1146, 0x8267, 0x8337, 0x2315, 0x6201 }, { 0x5102, 0x1146, 0x8267, 0x8337, 0x2315, 0x6201, 0x5102, 0x1146, 0x2315, 0x1146, 0x8337, 0x2315 },
{ 0x3304, 0x1146, 0x8267, 0x8337, 0x4113, 0x6201, 0x3304, 0x1146, 0x8337, 0x4113, 0x8337, 0x4113 }, { 0x3304, 0x1146, 0x8267, 0x8337, 0x4113, 0x6201, 0x3304, 0x1146, 0x8337, 0x4113, 0x8337, 0x4113 },
{ 0x8337, 0x4113, 0x5102, 0x1146, 0x8267, 0x4113, 0x1146, 0x4113, 0x8267 }, { 0x8337, 0x4113, 0x5102, 0x1146, 0x8267, 0x4113, 0x1146, 0x4113, 0x8267 },
{ 0x8267, 0x8337, 0x2315, 0x3304, 0x1146, 0x5102, 0x4223, 0x1326 }, { 0x8267, 0x8337, 0x2315, 0x3304, 0x1146, 0x5102, 0x4223, 0x1326 },
@ -299,7 +298,7 @@ unsigned short regularVertexData[256][12] = {
{ 0x8337, 0x8157, 0x1146, 0x1326, 0x6201, 0x2315, 0x4113 }, { 0x8337, 0x8157, 0x1146, 0x1326, 0x6201, 0x2315, 0x4113 },
{ 0x4113, 0x5102, 0x3304, 0x2315, 0x1326, 0x8337, 0x8157, 0x1146 }, { 0x4113, 0x5102, 0x3304, 0x2315, 0x1326, 0x8337, 0x8157, 0x1146 },
{ 0x8337, 0x8157, 0x1146, 0x5102, 0x4223, 0x8157, 0x5102, 0x8157, 0x4223 }, { 0x8337, 0x8157, 0x1146, 0x5102, 0x4223, 0x8157, 0x5102, 0x8157, 0x4223 },
{ 0x6201, 0x4223, 0x8337, 0x8157, 0x1146, 0x3304 }, { 0x6201, 0x4223, 0x8337, 0x8157, 0x1146, 0x3304, 0x6201, 0x4223, 0x1146, 0x4223, 0x8157, 0x1146 },
{ 0x8337, 0x8157, 0x1146, 0x5102, 0x4223, 0x6201, 0x2315, 0x4113 }, { 0x8337, 0x8157, 0x1146, 0x5102, 0x4223, 0x6201, 0x2315, 0x4113 },
{ 0x4223, 0x8337, 0x8157, 0x1146, 0x3304, 0x2315, 0x4113 }, { 0x4223, 0x8337, 0x8157, 0x1146, 0x3304, 0x2315, 0x4113 },
{ 0x4223, 0x4113, 0x8157, 0x1146, 0x1326, 0x4113, 0x1146, 0x4113, 0x1326 }, { 0x4223, 0x4113, 0x8157, 0x1146, 0x1326, 0x4113, 0x1146, 0x4113, 0x1326 },
@ -319,7 +318,7 @@ unsigned short regularVertexData[256][12] = {
{ 0x8157, 0x2245, 0x6201, 0x4223, 0x8337, 0x2245, 0x4223, 0x2245, 0x8337 }, { 0x8157, 0x2245, 0x6201, 0x4223, 0x8337, 0x2245, 0x4223, 0x2245, 0x8337 },
{ 0x2245, 0x3304, 0x5102, 0x4223, 0x8337, 0x8157, 0x4113, 0x6201, 0x2315 }, { 0x2245, 0x3304, 0x5102, 0x4223, 0x8337, 0x8157, 0x4113, 0x6201, 0x2315 },
{ 0x4223, 0x8337, 0x8157, 0x2245, 0x2315, 0x4113 }, { 0x4223, 0x8337, 0x8157, 0x2245, 0x2315, 0x4113 },
{ 0x4113, 0x8157, 0x2245, 0x3304, 0x1326, 0x4223 }, { 0x4113, 0x8157, 0x2245, 0x3304, 0x1326, 0x4223, 0x4113, 0x8157, 0x1326, 0x8157, 0x3304, 0x1326 },
{ 0x1326, 0x4223, 0x4113, 0x8157, 0x2245, 0x6201, 0x5102 }, { 0x1326, 0x4223, 0x4113, 0x8157, 0x2245, 0x6201, 0x5102 },
{ 0x8157, 0x2245, 0x3304, 0x1326, 0x4223, 0x6201, 0x2315 }, { 0x8157, 0x2245, 0x3304, 0x1326, 0x4223, 0x6201, 0x2315 },
{ 0x5102, 0x1326, 0x4223, 0x2315, 0x8157, 0x2245 }, { 0x5102, 0x1326, 0x4223, 0x2315, 0x8157, 0x2245 },
@ -330,7 +329,7 @@ unsigned short regularVertexData[256][12] = {
//224 0 10 12 //224 0 10 12
{ 0x1146, 0x1326, 0x8337, 0x2315, 0x2245, 0x1326, 0x2315, 0x1326, 0x2245 }, { 0x1146, 0x1326, 0x8337, 0x2315, 0x2245, 0x1326, 0x2315, 0x1326, 0x2245 },
{ 0x1146, 0x1326, 0x8337, 0x2315, 0x2245, 0x6201, 0x5102, 0x3304 }, { 0x1146, 0x1326, 0x8337, 0x2315, 0x2245, 0x6201, 0x5102, 0x3304 },
{ 0x6201, 0x2245, 0x1146, 0x1326, 0x8337, 0x4113 }, { 0x6201, 0x2245, 0x1146, 0x1326, 0x8337, 0x4113, 0x6201, 0x2245, 0x8337, 0x2245, 0x1326, 0x8337 },
{ 0x2245, 0x1146, 0x1326, 0x8337, 0x4113, 0x5102, 0x3304 }, { 0x2245, 0x1146, 0x1326, 0x8337, 0x4113, 0x5102, 0x3304 },
{ 0x5102, 0x1146, 0x2245, 0x2315, 0x8337, 0x4223 }, { 0x5102, 0x1146, 0x2245, 0x2315, 0x8337, 0x4223 },
{ 0x1146, 0x3304, 0x6201, 0x4223, 0x8337, 0x2315, 0x2245 }, { 0x1146, 0x3304, 0x6201, 0x4223, 0x8337, 0x2315, 0x2245 },