WIP: Fix up geometry for marching squares cells

This commit is contained in:
Eryn Wells 2018-10-26 07:19:59 -07:00
parent 7ab620cee8
commit fb71d50b84

View file

@ -210,84 +210,84 @@ struct Variants {
static let geometry: [Float] = [
// 0: no triangles
// 1: lower left corner, 1 triangle
-1.0, -1.0, 0.0,
0.0, -1.0, 0.0,
-1.0, 0.0, 0.0,
0.0, 1.0,
0.5, 1.0,
0.0, 0.5,
// 2: lower right corner, 1 triangle
1.0, -1.0, 0.0,
1.0, 0.0, 0.0,
0.0, -1.0, 0.0,
1.0, 1.0,
0.5, 1.0,
1.0, 0.5,
// 3: bottom half, 2 triangles
-1.0, 0.0, 0.0,
-1.0, -1.0, 0.0,
1.0, 0.0, 0.0,
1.0, -1.0, 0.0,
0.0, 0.5,
0.0, 0.0,
1.0, 0.5,
1.0, 0.0,
// 4: top right corner, 1 triangle
1.0, 1.0, 0.0,
0.0, 1.0, 0.0,
1.0, 0.0, 0.0,
1.0, 1.0,
0.5, 1.0,
1.0, 0.5,
// 5: top right and bottom left, 4 triangles
-1.0, 0.0, 0.0,
0.0, 1.0, 0.0,
-1.0, -1.0, 0.0,
1.0, 1.0, 0.0,
0.0, -1.0, 0.0,
1.0, 0.0, 0.0,
0.0, 0.5,
0.5, 1.0,
0.0, 0.0,
1.0, 1.0,
0.5, 0.0,
1.0, 0.5,
// 6: right half, 2 triangles
1.0, -1.0, 0.0,
1.0, 1.0, 0.0,
0.0, -1.0, 0.0,
0.0, 1.0, 0.0,
1.0, 0.0,
1.0, 1.0,
0.5, 0.0,
0.5, 1.0,
// 7: bottom right corner 7/8ths, 3 triangles
-1.0, 0.0, 0.0,
0.0, 1.0, 0.0,
-1.0, -1.0, 0.0,
1.0, 1.0, 0.0,
1.0, -1.0, 0.0,
0.0, 0.5,
0.5, 1.0,
0.0, 0.0,
1.0, 1.0,
1.0, 0.0,
// 8: top left corner, 1 triangle
-1.0, 1.0, 0.0,
0.0, 1.0, 0.0,
-1.0, 0.0, 0.0,
0.0, 1.0,
0.5, 1.0,
0.0, 0.5,
// 9: left half, 2 triangles
-1.0, 1.0, 0.0,
0.0, 1.0, 0.0,
-1.0, -1.0, 0.0,
0.0, -1.0, 0.0,
0.0, 1.0,
0.5, 1.0,
0.0, 0.0,
0.5, 0.0,
// 10: top left and bottom right, 4 triangles
-1.0, 0.0, 0.0,
0.0, -1.0, 0.0,
-1.0, 1.0, 0.0,
1.0, -1.0, 0.0,
0.0, 1.0, 0.0,
1.0, 0.0, 0.0,
0.0, 0.5,
0.5, 0.0,
0.0, 1.0,
1.0, 0.0,
0.5, 1.0,
1.0, 0.5,
// 11: bottom left corner 7/8th, 3 triangles
1.0, 0.0, 0.0,
0.0, 1.0, 0.0,
1.0, -1.0, 0.0,
-1.0, 1.0, 0.0,
-1.0, -1.0, 0.0,
1.0, 0.5,
0.5, 1.0,
1.0, 0.0,
0.0, 1.0,
0.0, 0.0,
// 12: top half, 2 triangles
-1.0, 1.0, 0.0,
1.0, 1.0, 0.0,
-1.0, 0.0, 0.0,
1.0, 0.0, 0.0,
0.0, 1.0,
1.0, 1.0,
0.0, 0.5,
1.0, 0.5,
// 13: top left corner 7/8ths, 3 triangles
0.0, -1.0, 0.0,
1.0, 0.0, 0.0,
-1.0, -1.0, 0.0,
1.0, 1.0, 0.0,
-1.0, 1.0, 0.0,
0.5, 0.0,
1.0, 0.5,
0.0, 0.0,
1.0, 1.0,
0.0, 1.0,
// 14: top right corner 7/8th, 3 triangles
-1.0, 0.0, 0.0,
0.0, -1.0, 0.0,
-1.0, 1.0, 0.0,
1.0, -1.0, 0.0,
1.0, 1.0, 0.0,
0.0, 0.5,
0.5, 0.0,
0.0, 1.0,
1.0, 0.0,
1.0, 1.0,
// 15: full, 2 triangles
-1.0, -1.0, 0.0,
1.0, -1.0, 0.0,
-1.0, 1.0, 0.0,
1.0, 1.0, 0.0,
0.0, 0.0,
1.0, 0.0,
0.0, 1.0,
1.0, 1.0,
]
static func numberOfTriangles(for variation: UInt) -> UInt {