Mercurial > ldforge2 / file diff

--- a/src/gl/common.h	Fri Mar 06 23:45:44 2020 +0200
+++ b/src/gl/common.h	Mon Mar 09 14:21:54 2020 +0200
@@ -77,7 +77,7 @@
 	Type type;
 	glm::vec3 vertices[4];
 	ldraw::Color color;
-	ldraw::Id id;
+	ldraw::id_t id;
 
 	/**
 	 * @return amount of vertices used for geometry
@@ -113,7 +113,7 @@
 
 namespace gl
 {
-	inline Polygon edgeLine(const glm::vec3& v_1, const glm::vec3& v_2, ldraw::Color color, ldraw::Id id)
+	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};
 	}
@@ -123,7 +123,7 @@
 		const glm::vec3& v_2,
 		const glm::vec3& v_3,
 		ldraw::Color color,
-		ldraw::Id id)
+		ldraw::id_t id)
 	{
 		return {Polygon::Triangle, {v_1, v_2, v_3}, color, id};
 	}
@@ -134,7 +134,7 @@
 		const glm::vec3& v_3,
 		const glm::vec3& v_4,
 		ldraw::Color color,
-		ldraw::Id id)
+		ldraw::id_t id)
 	{
 		return {Polygon::Quadrilateral, {v_1, v_2, v_3, v_4}, color, id};
 	}
@@ -145,7 +145,7 @@
 		const glm::vec3& control_1,
 		const glm::vec3& control_2,
 		ldraw::Color color,
-		ldraw::Id id)
+		ldraw::id_t id)
 	{
 		return {Polygon::ConditionalEdge, {v_1, v_2, control_1, control_2}, color, id};
 	}