summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-10-01 10:14:50 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-10-01 10:31:45 +0300
commitff512434c8272989ff08c027cccd1460f8808756 (patch)
treea6afefa25193f6f589cc4c052158c4e184346c46 /tests
parent50ea77c890b3fd9b07a5d8ce57a44f4176e810da (diff)
Fix kinect demo scatter artifacts - also speeds up scatter
+minor optimization to scatter renderer Change-Id: Iee3f52642a43ec9348edec6bde9d247c5d171e04 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/kinectsurface/surfacedata.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp
index 45aa68c9..999ccfce 100644
--- a/tests/kinectsurface/surfacedata.cpp
+++ b/tests/kinectsurface/surfacedata.cpp
@@ -258,12 +258,12 @@ void SurfaceData::setData(const QImage &image)
int widthBits = imageWidth * 4;
if (m_mode == Scatter) {
- QScatterDataArray *dataArray = m_scatterDataArray;
- QScatterDataItem *ptrToDataArray = &dataArray->first();
+ QScatterDataItem *ptrToDataArray = &m_scatterDataArray->first();
int limitsX = imageWidth / 2;
int limitsZ = imageHeight / 2;
qreal height = 0;
+ int count = 0;
for (int i = -limitsZ; i < limitsZ; i++, bitCount -= widthBits) {
for (int j = -limitsX; j < limitsX; j++) {
@@ -271,10 +271,12 @@ void SurfaceData::setData(const QImage &image)
if (height > -128) {
ptrToDataArray->setPosition(QVector3D(qreal(j), height, qreal(i)));
ptrToDataArray++;
+ count++;
}
}
}
+ QScatterDataArray *dataArray = new QScatterDataArray(m_scatterDataArray->mid(0, count));
static_cast<QScatterDataProxy *>(m_scatter->activeDataProxy())->resetArray(dataArray);
} else {
QBarDataArray *dataArray = m_barDataArray;