Showing the changes to libraries/render-utils/src/Model.cpp (1 of 2 files). Show all
Unified · Split
| @@ -1527,7 +1527,7 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape · 1526 unmodified lines | |||
| 1527 | } | 1527 | } |
| 1528 | 1528 | ||
| 1529 | // Assign index buffer: | 1529 | // Assign index buffer: |
| 1530 | batch.setIndexBuffer(gpu::UINT32, (drawMesh->getIndexBuffer()._buffer), 0); | 1530 | // batch.setIndexBuffer(gpu::UINT32, (drawMesh->getIndexBuffer()._buffer), 0); |
| 1531 | // batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0); | 1531 | // batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0); |
| 1532 | int vertexCount = mesh.vertices.size(); | 1532 | int vertexCount = mesh.vertices.size(); |
| 1533 | if (vertexCount == 0) { | 1533 | if (vertexCount == 0) { |
| @@ -1561,6 +1561,10 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape · 27 unmodified lines | |||
| 1561 | batch.setModelTransform(_transforms[0]); | 1561 | batch.setModelTransform(_transforms[0]); |
| 1562 | 1562 | ||
| 1563 | if (mesh.blendshapes.isEmpty()) { | 1563 | if (mesh.blendshapes.isEmpty()) { |
| 1564 | // Assign index buffer: | ||
| 1565 | batch.setIndexBuffer(gpu::UINT32, (drawMesh->getIndexBuffer()._buffer), 0); | ||
| 1566 | // batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0); | ||
| 1567 | |||
| 1564 | batch.setInputFormat((drawMesh->getVertexFormat())); | 1568 | batch.setInputFormat((drawMesh->getVertexFormat())); |
| 1565 | auto inputStream = drawMesh->makeBufferStream(); | 1569 | auto inputStream = drawMesh->makeBufferStream(); |
| 1566 | 1570 | ||
| @@ -1569,16 +1573,18 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape · 2 unmodified lines | |||
| 1569 | // batch.setInputFormat(networkMesh._vertexFormat); | 1573 | // batch.setInputFormat(networkMesh._vertexFormat); |
| 1570 | // batch.setInputStream(0, *networkMesh._vertexStream); | 1574 | // batch.setInputStream(0, *networkMesh._vertexStream); |
| 1571 | } else { | 1575 | } else { |
| 1572 | /* batch.setInputFormat((drawMesh->getVertexFormat())); | 1576 | return; |
| 1577 | batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0); | ||
| 1578 | batch.setInputFormat((drawMesh->getVertexFormat())); | ||
| 1573 | auto inputStream = drawMesh->makeBufferStream(); | 1579 | auto inputStream = drawMesh->makeBufferStream(); |
| 1574 | 1580 | ||
| 1575 | batch.setInputStream(0, inputStream); | 1581 | batch.setInputStream(0, inputStream); |
| 1576 | */ | 1582 | |
| 1577 | batch.setInputFormat(networkMesh._vertexFormat); | 1583 | /* batch.setInputFormat(networkMesh._vertexFormat); |
| 1578 | 1584 | ||
| 1579 | batch.setInputBuffer(0, _blendedVertexBuffers[meshIndex], 0, sizeof(glm::vec3)); | 1585 | batch.setInputBuffer(0, _blendedVertexBuffers[meshIndex], 0, sizeof(glm::vec3)); |
| 1580 | batch.setInputBuffer(1, _blendedVertexBuffers[meshIndex], vertexCount * sizeof(glm::vec3), sizeof(glm::vec3)); | 1586 | batch.setInputBuffer(1, _blendedVertexBuffers[meshIndex], vertexCount * sizeof(glm::vec3), sizeof(glm::vec3)); |
| 1581 | batch.setInputStream(2, *networkMesh._vertexStream); | 1587 | batch.setInputStream(2, *networkMesh._vertexStream);*/ |
| 1582 | } | 1588 | } |
| 1583 | 1589 | ||
| 1584 | if (mesh.colors.isEmpty()) { | 1590 | if (mesh.colors.isEmpty()) { |