From 1799322c672faf946e2bab3e9d25e213fbd9bc5e Mon Sep 17 00:00:00 2001 From: samcake Date: Sun, 4 Oct 2015 18:46:35 -0700 Subject: [PATCH] Fix typos introduce in previous commit about the Quad to triangle indexing and remove dead code in model.cpp --- libraries/fbx/src/FBXReader_Mesh.cpp | 2 +- libraries/render-utils/src/Model.cpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libraries/fbx/src/FBXReader_Mesh.cpp b/libraries/fbx/src/FBXReader_Mesh.cpp index 411f477a84..c88eaf4137 100644 --- a/libraries/fbx/src/FBXReader_Mesh.cpp +++ b/libraries/fbx/src/FBXReader_Mesh.cpp @@ -364,7 +364,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn part.quadTrianglesIndices.append(i0); part.quadTrianglesIndices.append(i1); - part.quadTrianglesIndices.append(i2); + part.quadTrianglesIndices.append(i3); part.quadTrianglesIndices.append(i1); part.quadTrianglesIndices.append(i2); diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 276ad7a17a..d2fbbc1e43 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -1546,9 +1546,6 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape return; // FIXME! } - // Assign index buffer: - // batch.setIndexBuffer(gpu::UINT32, (drawMesh->getIndexBuffer()._buffer), 0); - // batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0); int vertexCount = mesh.vertices.size(); if (vertexCount == 0) { // sanity check @@ -1610,8 +1607,6 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape return; } - const FBXMeshPart& part = mesh.parts.at(partIndex); - #ifdef WANT_DEBUG if (material == nullptr) {