mirror of
https://github.com/overte-org/overte.git
synced 2025-04-19 14:44:39 +02:00
warning fixes
This commit is contained in:
Anthony J. Thibault
parent
b050d2c4c7
commit
f72a94e195
1 changed files with 63 additions and 62 deletions
|
|
@ -692,67 +692,68 @@ const glm::vec3 DOP14_NORMALS[DOP14_COUNT] = {
|
|||
-glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3)
|
||||
};
|
||||
|
||||
typedef std::tuple<int, int, int> Int3Tuple;
|
||||
const std::tuple<int, int, int> DOP14_PLANE_COMBINATIONS[] = {
|
||||
{0,2,4}, {0,2,5}, {0,2,6}, {0,2,7}, {0,2,8}, {0,2,9}, {0,2,10}, {0,2,11}, {0,2,12}, {0,2,13},
|
||||
{0,3,4}, {0,3,5}, {0,3,6}, {0,3,7}, {0,3,8}, {0,3,9}, {0,3,10}, {0,3,11}, {0,3,12}, {0,3,13},
|
||||
{0,4,6}, {0,4,7}, {0,4,8}, {0,4,9}, {0,4,10}, {0,4,11}, {0,4,12}, {0,4,13},
|
||||
{0,5,6}, {0,5,7}, {0,5,8}, {0,5,9}, {0,5,10}, {0,5,11}, {0,5,12}, {0,5,13},
|
||||
{0,6,8}, {0,6,9}, {0,6,10}, {0,6,11}, {0,6,12}, {0,6,13},
|
||||
{0,7,8}, {0,7,9}, {0,7,10}, {0,7,11}, {0,7,12}, {0,7,13},
|
||||
{0,8,10}, {0,8,11}, {0,8,12}, {0,8,13}, {0,9,10},
|
||||
{0,9,11}, {0,9,12}, {0,9,13},
|
||||
{0,10,12}, {0,10,13},
|
||||
{0,11,12}, {0,11,13},
|
||||
{1,2,4}, {1,2,5}, {1,2,6}, {1,2,7}, {1,2,8}, {1,2,9}, {1,2,10}, {1,2,11}, {1,2,12}, {1,2,13},
|
||||
{1,3,4}, {1,3,5}, {1,3,6}, {1,3,7}, {1,3,8}, {1,3,9}, {1,3,10}, {1,3,11}, {1,3,12}, {1,3,13},
|
||||
{1,4,6}, {1,4,7}, {1,4,8}, {1,4,9}, {1,4,10}, {1,4,11}, {1,4,12}, {1,4,13},
|
||||
{1,5,6}, {1,5,7}, {1,5,8}, {1,5,9}, {1,5,10}, {1,5,11}, {1,5,12}, {1,5,13},
|
||||
{1,6,8}, {1,6,9}, {1,6,10}, {1,6,11}, {1,6,12}, {1,6,13},
|
||||
{1,7,8}, {1,7,9}, {1,7,10}, {1,7,11}, {1,7,12}, {1,7,13},
|
||||
{1,8,10}, {1,8,11}, {1,8,12}, {1,8,13},
|
||||
{1,9,10}, {1,9,11}, {1,9,12}, {1,9,13},
|
||||
{1,10,12}, {1,10,13},
|
||||
{1,11,12}, {1,11,13},
|
||||
{2,4,6}, {2,4,7}, {2,4,8}, {2,4,9}, {2,4,10}, {2,4,11}, {2,4,12}, {2,4,13},
|
||||
{2,5,6}, {2,5,7}, {2,5,8}, {2,5,9}, {2,5,10}, {2,5,11}, {2,5,12}, {2,5,13},
|
||||
{2,6,8}, {2,6,9}, {2,6,10}, {2,6,11}, {2,6,12}, {2,6,13},
|
||||
{2,7,8}, {2,7,9}, {2,7,10}, {2,7,11}, {2,7,12}, {2,7,13},
|
||||
{2,8,10}, {2,8,11}, {2,8,12}, {2,8,13},
|
||||
{2,9,10}, {2,9,11}, {2,9,12}, {2,9,13},
|
||||
{2,10,12}, {2,10,13},
|
||||
{2,11,12}, {2,11,13},
|
||||
{3,4,6}, {3,4,7}, {3,4,8}, {3,4,9}, {3,4,10}, {3,4,11}, {3,4,12}, {3,4,13},
|
||||
{3,5,6}, {3,5,7}, {3,5,8}, {3,5,9}, {3,5,10}, {3,5,11}, {3,5,12}, {3,5,13},
|
||||
{3,6,8}, {3,6,9}, {3,6,10}, {3,6,11}, {3,6,12}, {3,6,13},
|
||||
{3,7,8}, {3,7,9}, {3,7,10}, {3,7,11}, {3,7,12}, {3,7,13},
|
||||
{3,8,10}, {3,8,11}, {3,8,12}, {3,8,13},
|
||||
{3,9,10}, {3,9,11}, {3,9,12}, {3,9,13},
|
||||
{3,10,12}, {3,10,13},
|
||||
{3,11,12}, {3,11,13},
|
||||
{4,6,8}, {4,6,9}, {4,6,10}, {4,6,11}, {4,6,12}, {4,6,13},
|
||||
{4,7,8}, {4,7,9}, {4,7,10}, {4,7,11}, {4,7,12}, {4,7,13},
|
||||
{4,8,10}, {4,8,11}, {4,8,12}, {4,8,13},
|
||||
{4,9,10}, {4,9,11}, {4,9,12}, {4,9,13},
|
||||
{4,10,12}, {4,10,13},
|
||||
{4,11,12}, {4,11,13},
|
||||
{5,6,8}, {5,6,9}, {5,6,10}, {5,6,11}, {5,6,12}, {5,6,13},
|
||||
{5,7,8}, {5,7,9}, {5,7,10}, {5,7,11}, {5,7,12}, {5,7,13},
|
||||
{5,8,10}, {5,8,11}, {5,8,12}, {5,8,13},
|
||||
{5,9,10}, {5,9,11}, {5,9,12}, {5,9,13},
|
||||
{5,10,12}, {5,10,13},
|
||||
{5,11,12}, {5,11,13},
|
||||
{6,8,10}, {6,8,11}, {6,8,12}, {6,8,13},
|
||||
{6,9,10}, {6,9,11}, {6,9,12}, {6,9,13},
|
||||
{6,10,12}, {6,10,13},
|
||||
{6,11,12}, {6,11,13},
|
||||
{7,8,10}, {7,8,11}, {7,8,12}, {7,8,13},
|
||||
{7,9,10}, {7,9,11}, {7,9,12}, {7,9,13},
|
||||
{7,10,12}, {7,10,13},
|
||||
{7,11,12}, {7,11,13},
|
||||
{8,10,12}, {8,10,13},
|
||||
{8,11,12}, {8,11,13},
|
||||
{9,10,12}, {9,10,13},
|
||||
{9,11,12}, {9,11,13}
|
||||
Int3Tuple(0, 2, 4), Int3Tuple(0, 2, 5), Int3Tuple(0, 2, 6), Int3Tuple(0, 2, 7), Int3Tuple(0, 2, 8), Int3Tuple(0, 2, 9), Int3Tuple(0, 2, 10), Int3Tuple(0, 2, 11), Int3Tuple(0, 2, 12), Int3Tuple(0, 2, 13),
|
||||
Int3Tuple(0, 3, 4), Int3Tuple(0, 3, 5), Int3Tuple(0, 3, 6), Int3Tuple(0, 3, 7), Int3Tuple(0, 3, 8), Int3Tuple(0, 3, 9), Int3Tuple(0, 3, 10), Int3Tuple(0, 3, 11), Int3Tuple(0, 3, 12), Int3Tuple(0, 3, 13),
|
||||
Int3Tuple(0, 4, 6), Int3Tuple(0, 4, 7), Int3Tuple(0, 4, 8), Int3Tuple(0, 4, 9), Int3Tuple(0, 4, 10), Int3Tuple(0, 4, 11), Int3Tuple(0, 4, 12), Int3Tuple(0, 4, 13),
|
||||
Int3Tuple(0, 5, 6), Int3Tuple(0, 5, 7), Int3Tuple(0, 5, 8), Int3Tuple(0, 5, 9), Int3Tuple(0, 5, 10), Int3Tuple(0, 5, 11), Int3Tuple(0, 5, 12), Int3Tuple(0, 5, 13),
|
||||
Int3Tuple(0, 6, 8), Int3Tuple(0, 6, 9), Int3Tuple(0, 6, 10), Int3Tuple(0, 6, 11), Int3Tuple(0, 6, 12), Int3Tuple(0, 6, 13),
|
||||
Int3Tuple(0, 7, 8), Int3Tuple(0, 7, 9), Int3Tuple(0, 7, 10), Int3Tuple(0, 7, 11), Int3Tuple(0, 7, 12), Int3Tuple(0, 7, 13),
|
||||
Int3Tuple(0, 8, 10), Int3Tuple(0, 8, 11), Int3Tuple(0, 8, 12), Int3Tuple(0, 8, 13), Int3Tuple(0, 9, 10),
|
||||
Int3Tuple(0, 9, 11), Int3Tuple(0, 9, 12), Int3Tuple(0, 9, 13),
|
||||
Int3Tuple(0, 10, 12), Int3Tuple(0, 10, 13),
|
||||
Int3Tuple(0, 11, 12), Int3Tuple(0, 11, 13),
|
||||
Int3Tuple(1, 2, 4), Int3Tuple(1, 2, 5), Int3Tuple(1, 2, 6), Int3Tuple(1, 2, 7), Int3Tuple(1, 2, 8), Int3Tuple(1, 2, 9), Int3Tuple(1, 2, 10), Int3Tuple(1, 2, 11), Int3Tuple(1, 2, 12), Int3Tuple(1, 2, 13),
|
||||
Int3Tuple(1, 3, 4), Int3Tuple(1, 3, 5), Int3Tuple(1, 3, 6), Int3Tuple(1, 3, 7), Int3Tuple(1, 3, 8), Int3Tuple(1, 3, 9), Int3Tuple(1, 3, 10), Int3Tuple(1, 3, 11), Int3Tuple(1, 3, 12), Int3Tuple(1, 3, 13),
|
||||
Int3Tuple(1, 4, 6), Int3Tuple(1, 4, 7), Int3Tuple(1, 4, 8), Int3Tuple(1, 4, 9), Int3Tuple(1, 4, 10), Int3Tuple(1, 4, 11), Int3Tuple(1, 4, 12), Int3Tuple(1, 4, 13),
|
||||
Int3Tuple(1, 5, 6), Int3Tuple(1, 5, 7), Int3Tuple(1, 5, 8), Int3Tuple(1, 5, 9), Int3Tuple(1, 5, 10), Int3Tuple(1, 5, 11), Int3Tuple(1, 5, 12), Int3Tuple(1, 5, 13),
|
||||
Int3Tuple(1, 6, 8), Int3Tuple(1, 6, 9), Int3Tuple(1, 6, 10), Int3Tuple(1, 6, 11), Int3Tuple(1, 6, 12), Int3Tuple(1, 6, 13),
|
||||
Int3Tuple(1, 7, 8), Int3Tuple(1, 7, 9), Int3Tuple(1, 7, 10), Int3Tuple(1, 7, 11), Int3Tuple(1, 7, 12), Int3Tuple(1, 7, 13),
|
||||
Int3Tuple(1, 8, 10), Int3Tuple(1, 8, 11), Int3Tuple(1, 8, 12), Int3Tuple(1, 8, 13),
|
||||
Int3Tuple(1, 9, 10), Int3Tuple(1, 9, 11), Int3Tuple(1, 9, 12), Int3Tuple(1, 9, 13),
|
||||
Int3Tuple(1, 10, 12), Int3Tuple(1, 10, 13),
|
||||
Int3Tuple(1, 11, 12), Int3Tuple(1, 11, 13),
|
||||
Int3Tuple(2, 4, 6), Int3Tuple(2, 4, 7), Int3Tuple(2, 4, 8), Int3Tuple(2, 4, 9), Int3Tuple(2, 4, 10), Int3Tuple(2, 4, 11), Int3Tuple(2, 4, 12), Int3Tuple(2, 4, 13),
|
||||
Int3Tuple(2, 5, 6), Int3Tuple(2, 5, 7), Int3Tuple(2, 5, 8), Int3Tuple(2, 5, 9), Int3Tuple(2, 5, 10), Int3Tuple(2, 5, 11), Int3Tuple(2, 5, 12), Int3Tuple(2, 5, 13),
|
||||
Int3Tuple(2, 6, 8), Int3Tuple(2, 6, 9), Int3Tuple(2, 6, 10), Int3Tuple(2, 6, 11), Int3Tuple(2, 6, 12), Int3Tuple(2, 6, 13),
|
||||
Int3Tuple(2, 7, 8), Int3Tuple(2, 7, 9), Int3Tuple(2, 7, 10), Int3Tuple(2, 7, 11), Int3Tuple(2, 7, 12), Int3Tuple(2, 7, 13),
|
||||
Int3Tuple(2, 8, 10), Int3Tuple(2, 8, 11), Int3Tuple(2, 8, 12), Int3Tuple(2, 8, 13),
|
||||
Int3Tuple(2, 9, 10), Int3Tuple(2, 9, 11), Int3Tuple(2, 9, 12), Int3Tuple(2, 9, 13),
|
||||
Int3Tuple(2, 10, 12), Int3Tuple(2, 10, 13),
|
||||
Int3Tuple(2, 11, 12), Int3Tuple(2, 11, 13),
|
||||
Int3Tuple(3, 4, 6), Int3Tuple(3, 4, 7), Int3Tuple(3, 4, 8), Int3Tuple(3, 4, 9), Int3Tuple(3, 4, 10), Int3Tuple(3, 4, 11), Int3Tuple(3, 4, 12), Int3Tuple(3, 4, 13),
|
||||
Int3Tuple(3, 5, 6), Int3Tuple(3, 5, 7), Int3Tuple(3, 5, 8), Int3Tuple(3, 5, 9), Int3Tuple(3, 5, 10), Int3Tuple(3, 5, 11), Int3Tuple(3, 5, 12), Int3Tuple(3, 5, 13),
|
||||
Int3Tuple(3, 6, 8), Int3Tuple(3, 6, 9), Int3Tuple(3, 6, 10), Int3Tuple(3, 6, 11), Int3Tuple(3, 6, 12), Int3Tuple(3, 6, 13),
|
||||
Int3Tuple(3, 7, 8), Int3Tuple(3, 7, 9), Int3Tuple(3, 7, 10), Int3Tuple(3, 7, 11), Int3Tuple(3, 7, 12), Int3Tuple(3, 7, 13),
|
||||
Int3Tuple(3, 8, 10), Int3Tuple(3, 8, 11), Int3Tuple(3, 8, 12), Int3Tuple(3, 8, 13),
|
||||
Int3Tuple(3, 9, 10), Int3Tuple(3, 9, 11), Int3Tuple(3, 9, 12), Int3Tuple(3, 9, 13),
|
||||
Int3Tuple(3, 10, 12), Int3Tuple(3, 10, 13),
|
||||
Int3Tuple(3, 11, 12), Int3Tuple(3, 11, 13),
|
||||
Int3Tuple(4, 6, 8), Int3Tuple(4, 6, 9), Int3Tuple(4, 6, 10), Int3Tuple(4, 6, 11), Int3Tuple(4, 6, 12), Int3Tuple(4, 6, 13),
|
||||
Int3Tuple(4, 7, 8), Int3Tuple(4, 7, 9), Int3Tuple(4, 7, 10), Int3Tuple(4, 7, 11), Int3Tuple(4, 7, 12), Int3Tuple(4, 7, 13),
|
||||
Int3Tuple(4, 8, 10), Int3Tuple(4, 8, 11), Int3Tuple(4, 8, 12), Int3Tuple(4, 8, 13),
|
||||
Int3Tuple(4, 9, 10), Int3Tuple(4, 9, 11), Int3Tuple(4, 9, 12), Int3Tuple(4, 9, 13),
|
||||
Int3Tuple(4, 10, 12), Int3Tuple(4, 10, 13),
|
||||
Int3Tuple(4, 11, 12), Int3Tuple(4, 11, 13),
|
||||
Int3Tuple(5, 6, 8), Int3Tuple(5, 6, 9), Int3Tuple(5, 6, 10), Int3Tuple(5, 6, 11), Int3Tuple(5, 6, 12), Int3Tuple(5, 6, 13),
|
||||
Int3Tuple(5, 7, 8), Int3Tuple(5, 7, 9), Int3Tuple(5, 7, 10), Int3Tuple(5, 7, 11), Int3Tuple(5, 7, 12), Int3Tuple(5, 7, 13),
|
||||
Int3Tuple(5, 8, 10), Int3Tuple(5, 8, 11), Int3Tuple(5, 8, 12), Int3Tuple(5, 8, 13),
|
||||
Int3Tuple(5, 9, 10), Int3Tuple(5, 9, 11), Int3Tuple(5, 9, 12), Int3Tuple(5, 9, 13),
|
||||
Int3Tuple(5, 10, 12), Int3Tuple(5, 10, 13),
|
||||
Int3Tuple(5, 11, 12), Int3Tuple(5, 11, 13),
|
||||
Int3Tuple(6, 8, 10), Int3Tuple(6, 8, 11), Int3Tuple(6, 8, 12), Int3Tuple(6, 8, 13),
|
||||
Int3Tuple(6, 9, 10), Int3Tuple(6, 9, 11), Int3Tuple(6, 9, 12), Int3Tuple(6, 9, 13),
|
||||
Int3Tuple(6, 10, 12), Int3Tuple(6, 10, 13),
|
||||
Int3Tuple(6, 11, 12), Int3Tuple(6, 11, 13),
|
||||
Int3Tuple(7, 8, 10), Int3Tuple(7, 8, 11), Int3Tuple(7, 8, 12), Int3Tuple(7, 8, 13),
|
||||
Int3Tuple(7, 9, 10), Int3Tuple(7, 9, 11), Int3Tuple(7, 9, 12), Int3Tuple(7, 9, 13),
|
||||
Int3Tuple(7, 10, 12), Int3Tuple(7, 10, 13),
|
||||
Int3Tuple(7, 11, 12), Int3Tuple(7, 11, 13),
|
||||
Int3Tuple(8, 10, 12), Int3Tuple(8, 10, 13),
|
||||
Int3Tuple(8, 11, 12), Int3Tuple(8, 11, 13),
|
||||
Int3Tuple(9, 10, 12), Int3Tuple(9, 10, 13),
|
||||
Int3Tuple(9, 11, 12), Int3Tuple(9, 11, 13)
|
||||
};
|
||||
|
||||
void generateBoundryLinesForDop14(const std::vector<float>& dots, const glm::vec3& center, std::vector<glm::vec3>& linesOut) {
|
||||
|
|
@ -786,8 +787,8 @@ void generateBoundryLinesForDop14(const std::vector<float>& dots, const glm::vec
|
|||
}
|
||||
|
||||
// build a set of lines between these vertices, that also lie on the surface of the k-dop.
|
||||
for (int i = 0; i < vertices.size(); i++) {
|
||||
for (int j = i; j < vertices.size(); j++) {
|
||||
for (size_t i = 0; i < vertices.size(); i++) {
|
||||
for (size_t j = i; j < vertices.size(); j++) {
|
||||
glm::vec3 midPoint = (vertices[i] + vertices[j]) * 0.5f;
|
||||
int onSurfaceCount = 0;
|
||||
const float SURFACE_MARGIN = 0.01f;
|
||||
|
|
|
|||
Loading…
Reference in a new issue