From c38ad0a0fe71f03a7388a68d51292d8503455f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 19 Apr 2018 15:03:59 +0200 Subject: [PATCH] Reorder mesh primitive enum to match the values better. --- src/Magnum/Mesh.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index e793eb03c..c3e10e905 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -50,42 +50,45 @@ enum class MeshPrimitive: GLenum { Points = GL_POINTS, /** - * First two vertices define first line segment, each following - * vertex defines another segment. + * Each pair of vertices defines a single line, lines aren't + * connected together. */ - LineStrip = GL_LINE_STRIP, + Lines = GL_LINES, /** Line strip, last and first vertex are connected together. */ LineLoop = GL_LINE_LOOP, /** - * Each pair of vertices defines a single line, lines aren't - * connected together. + * First two vertices define first line segment, each following + * vertex defines another segment. */ - Lines = GL_LINES, + LineStrip = GL_LINE_STRIP, #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) /** - * Line strip with adjacency information. + * Lines with adjacency information. * @requires_gl32 Extension @extension{ARB,geometry_shader4} * @requires_gles30 Not defined in OpenGL ES 2.0. * @requires_gles32 Extension @extension{ANDROID,extension_pack_es31a} / * @extension{EXT,geometry_shader} * @requires_gles Geometry shaders are not available in WebGL. */ - LineStripAdjacency = GL_LINE_STRIP_ADJACENCY, + LinesAdjacency = GL_LINES_ADJACENCY, /** - * Lines with adjacency information. + * Line strip with adjacency information. * @requires_gl32 Extension @extension{ARB,geometry_shader4} * @requires_gles30 Not defined in OpenGL ES 2.0. * @requires_gles32 Extension @extension{ANDROID,extension_pack_es31a} / * @extension{EXT,geometry_shader} * @requires_gles Geometry shaders are not available in WebGL. */ - LinesAdjacency = GL_LINES_ADJACENCY, + LineStripAdjacency = GL_LINE_STRIP_ADJACENCY, #endif + /** Each three vertices define one triangle. */ + Triangles = GL_TRIANGLES, + /** * First three vertices define first triangle, each following * vertex defines another triangle. @@ -98,29 +101,26 @@ enum class MeshPrimitive: GLenum { */ TriangleFan = GL_TRIANGLE_FAN, - /** Each three vertices define one triangle. */ - Triangles = GL_TRIANGLES, - #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) /** - * Triangle strip with adjacency information. + * Triangles with adjacency information. * @requires_gl32 Extension @extension{ARB,geometry_shader4} * @requires_gles30 Not defined in OpenGL ES 2.0. * @requires_gles32 Extension @extension{ANDROID,extension_pack_es31a} / * @extension{EXT,geometry_shader} * @requires_gles Geometry shaders are not available in WebGL. */ - TriangleStripAdjacency = GL_TRIANGLE_STRIP_ADJACENCY, + TrianglesAdjacency = GL_TRIANGLES_ADJACENCY, /** - * Triangles with adjacency information. + * Triangle strip with adjacency information. * @requires_gl32 Extension @extension{ARB,geometry_shader4} * @requires_gles30 Not defined in OpenGL ES 2.0. * @requires_gles32 Extension @extension{ANDROID,extension_pack_es31a} / * @extension{EXT,geometry_shader} * @requires_gles Geometry shaders are not available in WebGL. */ - TrianglesAdjacency = GL_TRIANGLES_ADJACENCY, + TriangleStripAdjacency = GL_TRIANGLE_STRIP_ADJACENCY, /** * Patches.