summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/datavisualization/engine/abstract3drenderer.cpp5
-rw-r--r--tests/qmlvolume/qml/qmlvolume/main.qml11
2 files changed, 11 insertions, 5 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index a5e1bc9b..ab086b5f 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -1171,8 +1171,9 @@ void Abstract3DRenderer::recalculateCustomItemScalingAndPos(CustomRenderItem *it
item->setScaling(item->origScaling());
item->setPosition(item->origPosition());
if (item->isVolume()) {
- item->setMinBounds(-1.0f * zeroVector);
- item->setMaxBounds(oneVector);
+ // Y and Z need to be flipped as shader flips those axes
+ item->setMinBounds(QVector3D(-1.0f, 1.0f, 1.0f));
+ item->setMaxBounds(QVector3D(1.0f, -1.0f, -1.0f));
}
}
QVector3D translation = convertPositionToTranslation(item->position(),
diff --git a/tests/qmlvolume/qml/qmlvolume/main.qml b/tests/qmlvolume/qml/qmlvolume/main.qml
index 7af94b21..aec5f075 100644
--- a/tests/qmlvolume/qml/qmlvolume/main.qml
+++ b/tests/qmlvolume/qml/qmlvolume/main.qml
@@ -39,7 +39,7 @@ Item {
width: dataView.width
height: dataView.height
orthoProjection: true
- measureFps: true
+ //measureFps: true
onCurrentFpsChanged: {
if (fps > 10)
@@ -125,10 +125,15 @@ Item {
text: "Slice"
onClicked: {
- if (volumeItem.sliceIndexZ == -1)
+ if (volumeItem.sliceIndexZ == -1) {
volumeItem.sliceIndexZ = 128
- else
+ volumeItem.drawSlices = true
+ volumeItem.drawSliceFrames = true
+ } else {
volumeItem.sliceIndexZ = -1
+ volumeItem.drawSlices = false
+ volumeItem.drawSliceFrames = false
+ }
}
}
NewButton {