Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 13:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix updateVertices to correctly copy all data

Browse source
This commit is contained in:
ZappoMan 2015-01-19 15:43:20 -08:00
parent ef82aac7a5
commit 27268a6489
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -607,7 +607,7 @@ void GeometryCache::renderGrid(int x, int y, int width, int height, int rows, in
} }
void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, const glm::vec4& color) { void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, const glm::vec4& color) {
qDebug() << "GeometryCache::updateVertices(vec2.... id=" << id <<")..."; //qDebug() << "GeometryCache::updateVertices(vec2.... id=" << id <<")...";
BatchItemDetails& details = _registeredVertices[id]; BatchItemDetails& details = _registeredVertices[id];
if (details.isCreated) { if (details.isCreated) {
@ -652,18 +652,14 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, con
int* colorData = new int[details.vertices]; int* colorData = new int[details.vertices];
int* colorDataAt = colorData; int* colorDataAt = colorData;
//qDebug() << " details.vertices:" << details.vertices;
//qDebug() << " points.size:" << points.size();
foreach (const glm::vec2& point, points) { foreach (const glm::vec2& point, points) {
//qDebug() << " point:" << point;
*(vertex++) = point.x; *(vertex++) = point.x;
*(vertex++) = point.y; *(vertex++) = point.y;
*(colorDataAt++) = compactColor; *(colorDataAt++) = compactColor;
} }
details.verticesBuffer->append(FLOATS_PER_VERTEX * details.vertices, (gpu::Buffer::Byte*) vertexData); details.verticesBuffer->append(sizeof(GLfloat) * FLOATS_PER_VERTEX * details.vertices, (gpu::Buffer::Byte*) vertexData);
details.colorBuffer->append(sizeof(int) * details.vertices, (gpu::Buffer::Byte*) colorData); details.colorBuffer->append(sizeof(int) * details.vertices, (gpu::Buffer::Byte*) colorData);
delete[] vertexData; delete[] vertexData;
delete[] colorData; delete[] colorData;
@ -727,7 +723,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec3>& points, con
*(colorDataAt++) = compactColor; *(colorDataAt++) = compactColor;
} }
details.verticesBuffer->append(FLOATS_PER_VERTEX * details.vertices, (gpu::Buffer::Byte*) vertexData); details.verticesBuffer->append(sizeof(GLfloat) * FLOATS_PER_VERTEX * details.vertices, (gpu::Buffer::Byte*) vertexData);
details.colorBuffer->append(sizeof(int) * details.vertices, (gpu::Buffer::Byte*) colorData); details.colorBuffer->append(sizeof(int) * details.vertices, (gpu::Buffer::Byte*) colorData);
delete[] vertexData; delete[] vertexData;
delete[] colorData; delete[] colorData;
@ -738,7 +734,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec3>& points, con
} }
void GeometryCache::renderVertices(gpu::Primitive primitiveType, int id) { void GeometryCache::renderVertices(gpu::Primitive primitiveType, int id) {
qDebug() << "GeometryCache::renderVertices(id=" << id <<")..."; //qDebug() << "GeometryCache::renderVertices(id=" << id <<")...";
BatchItemDetails& details = _registeredVertices[id]; BatchItemDetails& details = _registeredVertices[id];
if (details.isCreated) { if (details.isCreated) {