Mercurial > ldforge2 / file diff

--- a/src/gl/common.h	Wed Mar 11 17:19:38 2020 +0200
+++ b/src/gl/common.h	Wed Mar 11 19:05:34 2020 +0200
@@ -73,8 +73,7 @@
 		Triangle,
 		Quadrilateral,
 		ConditionalEdge
-	};
-	Type type;
+	} type;
 	glm::vec3 vertices[4];
 	ldraw::Color color;
 	ldraw::id_t id;
@@ -113,6 +112,16 @@
 
 namespace gl
 {
+	constexpr Polygon::Type POLYGON_TYPES[] =
+	{
+		Polygon::Type::EdgeLine,
+		Polygon::Type::Triangle,
+		Polygon::Type::Quadrilateral,
+		Polygon::Type::ConditionalEdge
+	};
+
+	constexpr int NUM_POLYGON_TYPES = countof(POLYGON_TYPES);
+
 	inline Polygon edgeLine(const glm::vec3& v_1, const glm::vec3& v_2, ldraw::Color color, ldraw::id_t id)
 	{
 		return {Polygon::EdgeLine, {v_1, v_2}, color, id};
@@ -159,9 +168,6 @@
 		ConditionalLines
 	};
 
-	constexpr ArrayClass ARRAY_CLASSES[] = {ArrayClass::Lines, ArrayClass::Triangles, ArrayClass::Quads, ArrayClass::ConditionalLines};
-	constexpr int NUM_ARRAY_CLASSES = countof(ARRAY_CLASSES);
-
 	enum class RenderStyle
 	{
 		Normal,