From 7d688ec8c798d317826dfb82a3470be758d4e7af Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 1 Jul 2013 18:11:42 +0200 Subject: [PATCH] Fixed some IndexBuffer generation Former-commit-id: cb65a63ee0d8193004b264323941a7d1f214a3c4 --- src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp | 2 +- src/Nazara/Utility/Mesh.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp b/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp index 0cbe2a06b..f259d28b0 100644 --- a/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp +++ b/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp @@ -200,7 +200,7 @@ bool NzMD5MeshParser::Parse(NzMesh* mesh) // Index buffer bool largeIndices = (vertexCount > std::numeric_limits::max()); - std::unique_ptr indexBuffer(new NzIndexBuffer(indexCount, largeIndices, m_parameters.storage)); + std::unique_ptr indexBuffer(new NzIndexBuffer(largeIndices, indexCount, m_parameters.storage)); NzIndexMapper indexMapper(indexBuffer.get(), nzBufferAccess_DiscardAndWrite); unsigned int index = 0; diff --git a/src/Nazara/Utility/Mesh.cpp b/src/Nazara/Utility/Mesh.cpp index 54c114e14..174595362 100644 --- a/src/Nazara/Utility/Mesh.cpp +++ b/src/Nazara/Utility/Mesh.cpp @@ -180,7 +180,7 @@ NzSubMesh* NzMesh::BuildSubMesh(const NzPrimitive& primitive, const NzMeshParams unsigned int vertexCount; NzComputeBoxIndexVertexCount(primitive.box.subdivision, &indexCount, &vertexCount); - indexBuffer.reset(new NzIndexBuffer(indexCount, vertexCount > std::numeric_limits::max(), params.storage, nzBufferUsage_Static)); + indexBuffer.reset(new NzIndexBuffer(vertexCount > std::numeric_limits::max(), indexCount, params.storage, nzBufferUsage_Static)); indexBuffer->SetPersistent(false); vertexBuffer.reset(new NzVertexBuffer(declaration, vertexCount, params.storage, nzBufferUsage_Static)); @@ -199,7 +199,7 @@ NzSubMesh* NzMesh::BuildSubMesh(const NzPrimitive& primitive, const NzMeshParams unsigned int vertexCount; NzComputePlaneIndexVertexCount(primitive.plane.subdivision, &indexCount, &vertexCount); - indexBuffer.reset(new NzIndexBuffer(indexCount, vertexCount > std::numeric_limits::max(), params.storage, nzBufferUsage_Static)); + indexBuffer.reset(new NzIndexBuffer(vertexCount > std::numeric_limits::max(), indexCount, params.storage, nzBufferUsage_Static)); indexBuffer->SetPersistent(false); vertexBuffer.reset(new NzVertexBuffer(declaration, vertexCount, params.storage, nzBufferUsage_Static)); @@ -222,7 +222,7 @@ NzSubMesh* NzMesh::BuildSubMesh(const NzPrimitive& primitive, const NzMeshParams unsigned int vertexCount; NzComputeCubicSphereIndexVertexCount(primitive.sphere.cubic.subdivision, &indexCount, &vertexCount); - indexBuffer.reset(new NzIndexBuffer(indexCount, vertexCount > std::numeric_limits::max(), params.storage, nzBufferUsage_Static)); + indexBuffer.reset(new NzIndexBuffer(vertexCount > std::numeric_limits::max(), indexCount, params.storage, nzBufferUsage_Static)); indexBuffer->SetPersistent(false); vertexBuffer.reset(new NzVertexBuffer(declaration, vertexCount, params.storage, nzBufferUsage_Static)); @@ -241,7 +241,7 @@ NzSubMesh* NzMesh::BuildSubMesh(const NzPrimitive& primitive, const NzMeshParams unsigned int vertexCount; NzComputeIcoSphereIndexVertexCount(primitive.sphere.ico.recursionLevel, &indexCount, &vertexCount); - indexBuffer.reset(new NzIndexBuffer(indexCount, vertexCount > std::numeric_limits::max(), params.storage, nzBufferUsage_Static)); + indexBuffer.reset(new NzIndexBuffer(vertexCount > std::numeric_limits::max(), indexCount, params.storage, nzBufferUsage_Static)); indexBuffer->SetPersistent(false); vertexBuffer.reset(new NzVertexBuffer(declaration, vertexCount, params.storage, nzBufferUsage_Static)); @@ -260,7 +260,7 @@ NzSubMesh* NzMesh::BuildSubMesh(const NzPrimitive& primitive, const NzMeshParams unsigned int vertexCount; NzComputeUvSphereIndexVertexCount(primitive.sphere.uv.sliceCount, primitive.sphere.uv.stackCount, &indexCount, &vertexCount); - indexBuffer.reset(new NzIndexBuffer(indexCount, vertexCount > std::numeric_limits::max(), params.storage, nzBufferUsage_Static)); + indexBuffer.reset(new NzIndexBuffer(vertexCount > std::numeric_limits::max(), indexCount, params.storage, nzBufferUsage_Static)); indexBuffer->SetPersistent(false); vertexBuffer.reset(new NzVertexBuffer(declaration, vertexCount, params.storage, nzBufferUsage_Static));