Limit volume to axis ranges

The volume object that would go partially outside axis ranges
is scale and repositioned so that it only renders the portion
that is inside the axis ranges.

Change-Id: I792494e437998ba6276f58fab645767276c1476d
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

3 files changed, 86 insertions, 5 deletions

diff --git a/examples/datavisualization/volumetric/main.cpp b/examples/datavisualization/volumetric/main.cpp
index 0acffe10..98330396 100644
--- a/examples/datavisualization/volumetric/main.cpp
+++ b/examples/datavisualization/volumetric/main.cpp
@@ -104,6 +104,26 @@ int main(int argc, char **argv)
     textureDetailVBox->addWidget(highDetailRB);
     textureDetailGroupBox->setLayout(textureDetailVBox);
 
+    QGroupBox *areaGroupBox = new QGroupBox(QStringLiteral("Show area"));
+
+    QRadioButton *areaAllRB = new QRadioButton(widget);
+    areaAllRB->setText(QStringLiteral("Whole region"));
+    areaAllRB->setChecked(true);
+
+    QRadioButton *areaMineRB = new QRadioButton(widget);
+    areaMineRB->setText(QStringLiteral("The mine"));
+    areaMineRB->setChecked(false);
+
+    QRadioButton *areaMountainRB = new QRadioButton(widget);
+    areaMountainRB->setText(QStringLiteral("The mountain"));
+    areaMountainRB->setChecked(false);
+
+    QVBoxLayout *areaVBox = new QVBoxLayout;
+    areaVBox->addWidget(areaAllRB);
+    areaVBox->addWidget(areaMineRB);
+    areaVBox->addWidget(areaMountainRB);
+    areaGroupBox->setLayout(areaVBox);
+
     QCheckBox *colorTableCheckBox = new QCheckBox(widget);
     colorTableCheckBox->setText(QStringLiteral("Alternate color table"));
     colorTableCheckBox->setChecked(false);
@@ -143,6 +163,11 @@ int main(int argc, char **argv)
     useHighDefShaderCheckBox->setText(QStringLiteral("Use HD shader"));
     useHighDefShaderCheckBox->setChecked(true);
 
+    QLabel *performanceNoteLabel =
+            new QLabel(QStringLiteral(
+                           "Note: A high end graphics card is\nrecommended with the HD shader\nwhen the volume contains a lot of\ntransparent areas."));
+    performanceNoteLabel->setFrameShape(QFrame::Box);
+
     vLayout->addWidget(sliceXCheckBox);
     vLayout->addWidget(sliceXSlider);
     vLayout->addWidget(sliceImageXLabel);
@@ -155,12 +180,14 @@ int main(int argc, char **argv)
     vLayout2->addWidget(fpsCheckBox);
     vLayout2->addWidget(fpsLabel);
     vLayout2->addWidget(textureDetailGroupBox);
+    vLayout2->addWidget(areaGroupBox);
     vLayout2->addWidget(colorTableCheckBox);
     vLayout2->addWidget(alphaMultiplierLabel);
     vLayout2->addWidget(alphaMultiplierSlider);
     vLayout2->addWidget(preserveOpacityCheckBox);
     vLayout2->addWidget(transparentGroundCheckBox);
-    vLayout2->addWidget(useHighDefShaderCheckBox, 1, Qt::AlignTop);
+    vLayout2->addWidget(useHighDefShaderCheckBox);
+    vLayout2->addWidget(performanceNoteLabel, 1, Qt::AlignTop);
 
     VolumetricModifier *modifier = new VolumetricModifier(graph);
     modifier->setFpsLabel(fpsLabel);
@@ -201,6 +228,12 @@ int main(int argc, char **argv)
                      &VolumetricModifier::setUseHighDefShader);
     QObject::connect(alphaMultiplierSlider, &QSlider::valueChanged, modifier,
                      &VolumetricModifier::adjustAlphaMultiplier);
+    QObject::connect(areaAllRB, &QRadioButton::toggled, modifier,
+                     &VolumetricModifier::toggleAreaAll);
+    QObject::connect(areaMineRB, &QRadioButton::toggled, modifier,
+                     &VolumetricModifier::toggleAreaMine);
+    QObject::connect(areaMountainRB, &QRadioButton::toggled, modifier,
+                     &VolumetricModifier::toggleAreaMountain);
 
     widget->show();
     return app.exec();
diff --git a/examples/datavisualization/volumetric/volumetric.cpp b/examples/datavisualization/volumetric/volumetric.cpp
index eb8f2188..54e930d2 100644
--- a/examples/datavisualization/volumetric/volumetric.cpp
+++ b/examples/datavisualization/volumetric/volumetric.cpp
@@ -80,6 +80,8 @@ VolumetricModifier::VolumetricModifier(Q3DScatter *scatter)
     m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
     m_graph->setOrthoProjection(true);
 
+    toggleAreaAll(true);
+
 #if !defined(QT_OPENGL_ES_2)
     m_lowDetailData = new QVector<uchar>(lowDetailSize * lowDetailSize * lowDetailSize / 2);
     m_mediumDetailData = new QVector<uchar>(mediumDetailSize * mediumDetailSize * mediumDetailSize / 2);
@@ -95,9 +97,16 @@ VolumetricModifier::VolumetricModifier(Q3DScatter *scatter)
     excavateMineShaft(lowDetailSize, 0, m_mineShaftArray.size(), m_lowDetailData);
 
     m_volumeItem = new QCustom3DVolume;
-    m_volumeItem->setScaling(QVector3D(m_graph->axisX()->max() - m_graph->axisX()->min(),
-                                       m_graph->axisY()->max() - m_graph->axisY()->min(),
-                                       m_graph->axisZ()->max() - m_graph->axisZ()->min()));
+    // Adjust water level to zero with a minor tweak to y-coordinate position and scaling
+    m_volumeItem->setScaling(
+                QVector3D(m_graph->axisX()->max() - m_graph->axisX()->min(),
+                          (m_graph->axisY()->max() - m_graph->axisY()->min()) * 0.91f,
+                          m_graph->axisZ()->max() - m_graph->axisZ()->min()));
+    m_volumeItem->setPosition(
+                QVector3D((m_graph->axisX()->max() + m_graph->axisX()->min()) / 2.0f,
+                          -0.045f * (m_graph->axisY()->max() - m_graph->axisY()->min()) +
+                          (m_graph->axisY()->max() + m_graph->axisY()->min()) / 2.0f,
+                          (m_graph->axisZ()->max() + m_graph->axisZ()->min()) / 2.0f));
     m_volumeItem->setScalingAbsolute(false);
     m_volumeItem->setTextureWidth(lowDetailSize);
     m_volumeItem->setTextureHeight(lowDetailSize / 2);
@@ -437,6 +446,42 @@ void VolumetricModifier::adjustAlphaMultiplier(int value)
     adjustSliceZ(m_sliceSliderZ->value());
 }
 
+void VolumetricModifier::toggleAreaAll(bool enabled)
+{
+    if (enabled) {
+        m_graph->axisX()->setRange(0.0f, 1000.0f);
+        m_graph->axisY()->setRange(-600.0f, 600.0f);
+        m_graph->axisZ()->setRange(0.0f, 1000.0f);
+        m_graph->axisX()->setSegmentCount(5);
+        m_graph->axisY()->setSegmentCount(6);
+        m_graph->axisZ()->setSegmentCount(5);
+    }
+}
+
+void VolumetricModifier::toggleAreaMine(bool enabled)
+{
+    if (enabled) {
+        m_graph->axisX()->setRange(350.0f, 850.0f);
+        m_graph->axisY()->setRange(-500.0f, 100.0f);
+        m_graph->axisZ()->setRange(350.0f, 900.0f);
+        m_graph->axisX()->setSegmentCount(10);
+        m_graph->axisY()->setSegmentCount(6);
+        m_graph->axisZ()->setSegmentCount(11);
+    }
+}
+
+void VolumetricModifier::toggleAreaMountain(bool enabled)
+{
+    if (enabled) {
+        m_graph->axisX()->setRange(300.0f, 600.0f);
+        m_graph->axisY()->setRange(-100.0f, 400.0f);
+        m_graph->axisZ()->setRange(300.0f, 600.0f);
+        m_graph->axisX()->setSegmentCount(9);
+        m_graph->axisY()->setSegmentCount(5);
+        m_graph->axisZ()->setSegmentCount(9);
+    }
+}
+
 void VolumetricModifier::initHeightMap(QString fileName, QVector<uchar> &layerData)
 {
     QImage heightImage(fileName);
@@ -485,7 +530,7 @@ int VolumetricModifier::createVolume(int textureSize, int startIndex, int count,
                     // Ground layer below water
                     colorIndex = int((float(waterHeights.at(k) - height) / heightToColorDiv)
                                      * float(layerColorThickness)) + underWaterGroundColorsMin;
-                } else if (height <= waterHeights.at(k)) {
+                } else if (height < waterHeights.at(k)) {
                     // Water layer where water goes over ground
                     colorIndex = int((float(height - magmaHeights.at(k)) / heightToColorDiv)
                                      * float(layerColorThickness)) + waterColorsMin;
diff --git a/examples/datavisualization/volumetric/volumetric.h b/examples/datavisualization/volumetric/volumetric.h
index 27b053e2..180686fb 100644
--- a/examples/datavisualization/volumetric/volumetric.h
+++ b/examples/datavisualization/volumetric/volumetric.h
@@ -63,6 +63,9 @@ public slots:
     void setTransparentGround(bool enabled);
     void setUseHighDefShader(bool enabled);
     void adjustAlphaMultiplier(int value);
+    void toggleAreaAll(bool enabled);
+    void toggleAreaMine(bool enabled);
+    void toggleAreaMountain(bool enabled);
 
 private: