summaryrefslogtreecommitdiffstats
path: root/examples/datavisualization
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-08-18 14:05:47 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-08-19 08:12:06 +0300
commitcf95478ea842cd42a8888b0b74de3d0d0d0233ea (patch)
tree689e38c48cf39ab3907ef46015f8bf26c4040d16 /examples/datavisualization
parent169a4d638c6c1b6634ffcfd19c4fe3cb94cf27d5 (diff)
Make volume shading sample once per texture layer.
Change-Id: Ia3a13e2cb8d7dcf744a55dcb827f5cb436a043c4 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples/datavisualization')
-rw-r--r--examples/datavisualization/volumetric/volumetric.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/datavisualization/volumetric/volumetric.cpp b/examples/datavisualization/volumetric/volumetric.cpp
index a9233cab..8e61ecf2 100644
--- a/examples/datavisualization/volumetric/volumetric.cpp
+++ b/examples/datavisualization/volumetric/volumetric.cpp
@@ -102,8 +102,8 @@ void VolumetricModifier::adjustSliceZ(int value)
void VolumetricModifier::handleZoomLevelChange()
{
// Zooming inside volumetric object causes ugly clipping issues, so restrict zoom level a bit
- if (m_graph->scene()->activeCamera()->zoomLevel() > 220)
- m_graph->scene()->activeCamera()->setZoomLevel(220);
+ if (m_graph->scene()->activeCamera()->zoomLevel() > 200)
+ m_graph->scene()->activeCamera()->setZoomLevel(200);
}
void VolumetricModifier::handleFpsChange(qreal fps)
@@ -161,7 +161,7 @@ void VolumetricModifier::createVolume()
// Take a slice out of the ellipsoid
if (i >= textureSize / 2 || j >= textureSize / 4 || k >= textureSize / 2) {
QVector3D distVec = QVector3D(float(k), float(j * 2), float(i)) - midPoint;
- float adjLen = qMin(255.0f, (distVec.length() * float(textureSize / 128)));
+ float adjLen = qMin(255.0f, (distVec.length() * 512.0f / float(textureSize)));
if (adjLen < 230)
colorIndex = 255 - int(adjLen);
else