From ea2faa91b7f9a5b1c629909747fb113f442cabac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 22 Jan 2013 16:38:29 +0100 Subject: [PATCH] Explicit offset also in Mesh::addVertexBuffer(). The offset is present in all other functions, adding it just for consistency (although it is redundant here). --- src/DebugTools/Implementation/AbstractBoxRenderer.cpp | 4 ++-- src/Mesh.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DebugTools/Implementation/AbstractBoxRenderer.cpp b/src/DebugTools/Implementation/AbstractBoxRenderer.cpp index 2d74d216e..988f2de64 100644 --- a/src/DebugTools/Implementation/AbstractBoxRenderer.cpp +++ b/src/DebugTools/Implementation/AbstractBoxRenderer.cpp @@ -45,7 +45,7 @@ AbstractBoxRenderer<2>::AbstractBoxRenderer() { mesh->setPrimitive(square.primitive()) ->setVertexCount(square.positions(0)->size()) - ->addVertexBuffer(buffer, Shaders::FlatShader2D::Position()); + ->addVertexBuffer(buffer, 0, Shaders::FlatShader2D::Position()); ResourceManager::instance()->set(this->mesh.key(), mesh, ResourceDataState::Final, ResourcePolicy::Manual); } @@ -75,7 +75,7 @@ AbstractBoxRenderer<3>::AbstractBoxRenderer() { mesh->setPrimitive(cube.primitive()) ->setVertexCount(cube.positions(0)->size()) - ->addVertexBuffer(vertexBuffer, Shaders::FlatShader3D::Position()); + ->addVertexBuffer(vertexBuffer, 0, Shaders::FlatShader3D::Position()); ResourceManager::instance()->set(this->mesh.key(), mesh, ResourceDataState::Final, ResourcePolicy::Manual); } diff --git a/src/Mesh.h b/src/Mesh.h index f33b95cbf..ca5f37bd2 100644 --- a/src/Mesh.h +++ b/src/Mesh.h @@ -560,7 +560,7 @@ class MAGNUM_EXPORT Mesh { * * Attribute list is combination of * @ref AbstractShaderProgram::Attribute "attribute definitions" - * (specified in implementation of given shader) and offsets between + * (specified in implementation of given shader) and gaps between * attribute arrays. * * See @ref Mesh-configuration "class documentation" for simple usage @@ -574,7 +574,7 @@ class MAGNUM_EXPORT Mesh { * Mesh* mesh; * Buffer* buffer; * mesh->addVertexBuffer(buffer, - * 35, // skip other data + * 35, // offset of the data * Shaders::PhongShader::Position(), // position array * sizeof(Vector2)*mesh->vertexCount(), // skip texture coordinate array * Shaders::PhongShader::Normal()); // normal array @@ -603,10 +603,10 @@ class MAGNUM_EXPORT Mesh { * @fn_gl_extension{VertexArrayVertexAttribOffset,EXT,direct_state_access} * if @extension{APPLE,vertex_array_object} is available */ - template inline Mesh* addVertexBuffer(Buffer* buffer, const T&... attributes) { + template inline Mesh* addVertexBuffer(Buffer* buffer, GLintptr offset, const T&... attributes) { CORRADE_ASSERT(_vertexCount != 0, "Mesh: vertex count must be set before binding attributes", this); - addVertexBufferInternal(buffer, 0, attributes...); + addVertexBufferInternal(buffer, offset, attributes...); return this; }