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

use shared buffer_helpers::clone

Browse source
This commit is contained in:
humbletim 2018-02-22 08:41:15 -05:00
parent b0f444e179
commit 4d43e54346
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/render-utils/src/GeometryCache.cpp
View file

@ -32,6 +32,7 @@
#include "gpu/StandardShaderLib.h" #include "gpu/StandardShaderLib.h"
#include "graphics/TextureMap.h" #include "graphics/TextureMap.h"
#include "graphics/BufferViewHelpers.h"
#include "render/Args.h" #include "render/Args.h"
#include "standardTransformPNTC_vert.h" #include "standardTransformPNTC_vert.h"
@ -2409,26 +2410,15 @@ graphics::MeshPointer GeometryCache::meshFromShape(Shape geometryShape, glm::vec
qDebug() << "GeometryCache::getMeshProxyListFromShape" << shapeData << stringFromShape(geometryShape); qDebug() << "GeometryCache::getMeshProxyListFromShape" << shapeData << stringFromShape(geometryShape);
auto cloneBufferView = [](const gpu::BufferView& in) -> gpu::BufferView { auto positionsBufferView = buffer_helpers::clone(shapeData->_positionView);
auto buffer = std::make_shared<gpu::Buffer>(*in._buffer); // copy auto normalsBufferView = buffer_helpers::clone(shapeData->_normalView);
// FIXME: gpu::BufferView seems to have a bug where constructing a new instance from an existing one auto indexBufferView = buffer_helpers::clone(shapeData->_indicesView);
// results in over-multiplied buffer/view sizes -- hence constructing manually here from each input prop
auto out = gpu::BufferView(buffer, in._offset, in._size, in._stride, in._element);
Q_ASSERT(out.getNumElements() == in.getNumElements());
Q_ASSERT(out._size == in._size);
Q_ASSERT(out._buffer->getSize() == in._buffer->getSize());
return out;
};
auto positionsBufferView = cloneBufferView(shapeData->_positionView);
auto normalsBufferView = cloneBufferView(shapeData->_normalView);
auto indexBufferView = cloneBufferView(shapeData->_indicesView);
gpu::BufferView::Size numVertices = positionsBufferView.getNumElements(); gpu::BufferView::Size numVertices = positionsBufferView.getNumElements();
Q_ASSERT(numVertices == normalsBufferView.getNumElements()); Q_ASSERT(numVertices == normalsBufferView.getNumElements());
// apply input color across all vertices // apply input color across all vertices
auto colorsBufferView = cloneBufferView(shapeData->_normalView); auto colorsBufferView = buffer_helpers::clone(shapeData->_normalView);
for (gpu::BufferView::Size i = 0; i < numVertices; i++) { for (gpu::BufferView::Size i = 0; i < numVertices; i++) {
colorsBufferView.edit<glm::vec3>((gpu::BufferView::Index)i) = color; colorsBufferView.edit<glm::vec3>((gpu::BufferView::Index)i) = color;
} }