From b8ea83099afa841ce0140ba898167545fe496c1d Mon Sep 17 00:00:00 2001 From: samcake Date: Thu, 1 Oct 2015 21:13:22 -0700 Subject: [PATCH] Debuggging --- libraries/fbx/src/FBXReader_Mesh.cpp | 1 + libraries/render-utils/src/Model.cpp | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libraries/fbx/src/FBXReader_Mesh.cpp b/libraries/fbx/src/FBXReader_Mesh.cpp index f3bf3f433d..21b51245cb 100644 --- a/libraries/fbx/src/FBXReader_Mesh.cpp +++ b/libraries/fbx/src/FBXReader_Mesh.cpp @@ -480,6 +480,7 @@ void FBXReader::buildModelMesh(ExtractedMesh& extracted, const QString& url) { } model::Mesh::Part triPart(indexNum, part.triangleIndices.size(), 0, model::Mesh::TRIANGLES); if (triPart._numIndices) { + parts.push_back(triPart); ib->setSubData(offset, part.triangleIndices.size() * sizeof(int), (gpu::Byte*) part.triangleIndices.constData()); offset += part.triangleIndices.size() * sizeof(int); diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 3a4d83f68d..c7649d27ed 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -1527,7 +1527,7 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape } // Assign index buffer: - batch.setIndexBuffer(gpu::UINT32, (drawMesh->getIndexBuffer()._buffer), 0); + // batch.setIndexBuffer(gpu::UINT32, (drawMesh->getIndexBuffer()._buffer), 0); // batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0); int vertexCount = mesh.vertices.size(); if (vertexCount == 0) { @@ -1561,6 +1561,10 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape batch.setModelTransform(_transforms[0]); if (mesh.blendshapes.isEmpty()) { + // Assign index buffer: + batch.setIndexBuffer(gpu::UINT32, (drawMesh->getIndexBuffer()._buffer), 0); + // batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0); + batch.setInputFormat((drawMesh->getVertexFormat())); auto inputStream = drawMesh->makeBufferStream(); @@ -1569,16 +1573,18 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape // batch.setInputFormat(networkMesh._vertexFormat); // batch.setInputStream(0, *networkMesh._vertexStream); } else { - /* batch.setInputFormat((drawMesh->getVertexFormat())); + return; + batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0); + batch.setInputFormat((drawMesh->getVertexFormat())); auto inputStream = drawMesh->makeBufferStream(); batch.setInputStream(0, inputStream); - */ - batch.setInputFormat(networkMesh._vertexFormat); + + /* batch.setInputFormat(networkMesh._vertexFormat); batch.setInputBuffer(0, _blendedVertexBuffers[meshIndex], 0, sizeof(glm::vec3)); batch.setInputBuffer(1, _blendedVertexBuffers[meshIndex], vertexCount * sizeof(glm::vec3), sizeof(glm::vec3)); - batch.setInputStream(2, *networkMesh._vertexStream); + batch.setInputStream(2, *networkMesh._vertexStream);*/ } if (mesh.colors.isEmpty()) {