From 5cf24280827ddace5b014cde4b4809753b01e48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 21 Oct 2012 18:23:24 +0200 Subject: [PATCH] Merged two mesh constructors into one. --- src/Mesh.h | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/Mesh.h b/src/Mesh.h index 2e8aee8d0..87f69c521 100644 --- a/src/Mesh.h +++ b/src/Mesh.h @@ -326,29 +326,14 @@ class MAGNUM_EXPORT Mesh { TriangleFan = GL_TRIANGLE_FAN }; - /** - * @brief Implicit constructor - * @param primitive Primitive type - * - * Allows creating the object without knowing anything about mesh - * data. Note that you have to call setVertexCount() manually for mesh - * to draw properly. - * @see @fn_gl{GenVertexArrays} - */ - inline Mesh(Primitive primitive = Primitive::Triangles): _primitive(primitive), _vertexCount(0), finalized(false) { - #ifndef MAGNUM_TARGET_GLES - glGenVertexArrays(1, &vao); - #endif - } - /** * @brief Constructor * @param primitive Primitive type * @param vertexCount Vertex count * - * @see @fn_gl{GenVertexArrays} + * @see @fn_gl{GenVertexArrays}, setPrimitive(), setVertexCount() */ - inline Mesh(Primitive primitive, GLsizei vertexCount): _primitive(primitive), _vertexCount(vertexCount), finalized(false) { + inline Mesh(Primitive primitive = Primitive::Triangles, GLsizei vertexCount = 0): _primitive(primitive), _vertexCount(vertexCount), finalized(false) { #ifndef MAGNUM_TARGET_GLES glGenVertexArrays(1, &vao); #endif