From ae411d84b9eac08c217bdda3aa5fbc6f39d03d85 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 22 Aug 2014 13:19:18 +0300 Subject: Tweak volume shaders. Also fix custom object default texture. Change-Id: Iba9ff6afb807d9f7a4e1f58b0e5fb4bca4c9c431 Reviewed-by: Mika Salmela --- tests/volumetrictest/volumetrictest.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tests/volumetrictest/volumetrictest.h') diff --git a/tests/volumetrictest/volumetrictest.h b/tests/volumetrictest/volumetrictest.h index 677a1231..40d88192 100644 --- a/tests/volumetrictest/volumetrictest.h +++ b/tests/volumetrictest/volumetrictest.h @@ -21,6 +21,7 @@ #include #include +#include class QLabel; @@ -42,16 +43,18 @@ public slots: void adjustSliceX(int value); void adjustSliceY(int value); void adjustSliceZ(int value); - void handleZoomLevelChange(); - void handleFpsChange(qreal fps); + void handleFpsChange(); private: void createVolume(); void createAnotherVolume(); + void createYetAnotherVolume(); Q3DScatter *m_graph; QCustom3DVolume *m_volumeItem; QCustom3DVolume *m_volumeItem2; + QCustom3DVolume *m_volumeItem3; + QCustom3DItem *m_plainItem; int m_sliceIndexX; int m_sliceIndexY; int m_sliceIndexZ; -- cgit v1.2.3