Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Debuggging

Browse source
This commit is contained in:
samcake 2015-10-01 21:13:22 -07:00
parent 4478ca79ca
commit b8ea83099a
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/fbx/src/FBXReader_Mesh.cpp
View file

@ -480,6 +480,7 @@ void FBXReader::buildModelMesh(ExtractedMesh& extracted, const QString& url) {
} }
model::Mesh::Part triPart(indexNum, part.triangleIndices.size(), 0, model::Mesh::TRIANGLES); model::Mesh::Part triPart(indexNum, part.triangleIndices.size(), 0, model::Mesh::TRIANGLES);
if (triPart._numIndices) { if (triPart._numIndices) {
parts.push_back(triPart);
ib->setSubData(offset, part.triangleIndices.size() * sizeof(int), ib->setSubData(offset, part.triangleIndices.size() * sizeof(int),
(gpu::Byte*) part.triangleIndices.constData()); (gpu::Byte*) part.triangleIndices.constData());
offset += part.triangleIndices.size() * sizeof(int); offset += part.triangleIndices.size() * sizeof(int);

16
libraries/render-utils/src/Model.cpp
View file

@ -1527,7 +1527,7 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape
} }
// Assign index buffer: // 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); // batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0);
int vertexCount = mesh.vertices.size(); int vertexCount = mesh.vertices.size();
if (vertexCount == 0) { if (vertexCount == 0) {
@ -1561,6 +1561,10 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape
batch.setModelTransform(_transforms[0]); batch.setModelTransform(_transforms[0]);
if (mesh.blendshapes.isEmpty()) { 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())); batch.setInputFormat((drawMesh->getVertexFormat()));
auto inputStream = drawMesh->makeBufferStream(); auto inputStream = drawMesh->makeBufferStream();
@ -1569,16 +1573,18 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, int shape
// batch.setInputFormat(networkMesh._vertexFormat); // batch.setInputFormat(networkMesh._vertexFormat);
// batch.setInputStream(0, *networkMesh._vertexStream); // batch.setInputStream(0, *networkMesh._vertexStream);
} else { } else {
/* batch.setInputFormat((drawMesh->getVertexFormat())); return;
batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0);
batch.setInputFormat((drawMesh->getVertexFormat()));
auto inputStream = drawMesh->makeBufferStream(); auto inputStream = drawMesh->makeBufferStream();
batch.setInputStream(0, inputStream); batch.setInputStream(0, inputStream);
*/
batch.setInputFormat(networkMesh._vertexFormat); /* batch.setInputFormat(networkMesh._vertexFormat);
batch.setInputBuffer(0, _blendedVertexBuffers[meshIndex], 0, sizeof(glm::vec3)); batch.setInputBuffer(0, _blendedVertexBuffers[meshIndex], 0, sizeof(glm::vec3));
batch.setInputBuffer(1, _blendedVertexBuffers[meshIndex], vertexCount * sizeof(glm::vec3), 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()) { if (mesh.colors.isEmpty()) {