From bbb61a77d96b0cdea0833cdcdceec66387fb2f0c Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 21 May 2015 14:47:23 -0700 Subject: [PATCH] dodge stride bug in mesh code --- .../src/RenderablePolyVoxEntityItem.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp index 9decd37cb2..252a76e946 100644 --- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp @@ -151,14 +151,15 @@ void RenderablePolyVoxEntityItem::render(RenderArgs* args) { gpu::Batch batch; - // XXX why do I need these? - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_NORMAL_ARRAY); - auto mesh = _modelGeometry.getMesh(); batch.setInputFormat(mesh->getVertexFormat()); - batch.setIndexBuffer(gpu::UINT32, mesh->getIndexBuffer()._buffer, 0); - batch.setInputStream(0, mesh->makeBufferStream()); + + batch.setInputBuffer(gpu::Stream::POSITION, mesh->getVertexBuffer()); + batch.setInputBuffer(gpu::Stream::NORMAL, mesh->getVertexBuffer()._buffer, sizeof(float) * 3, mesh->getVertexBuffer()._stride); + + //batch.setInputStream(0, mesh->makeBufferStream()); + + batch.setIndexBuffer(gpu::UINT32, mesh->getIndexBuffer()._buffer, 0); batch.drawIndexed(gpu::TRIANGLES, mesh->getNumIndices(), 0); gpu::GLBackend::renderBatch(batch);