1 files changed, 104 insertions, 5 deletions

diff --git a/src/datavisualization/data/customrenderitem_p.h b/src/datavisualization/data/customrenderitem_p.h
index 4fb94276..ad868fac 100644
--- a/src/datavisualization/data/customrenderitem_p.h
+++ b/src/datavisualization/data/customrenderitem_p.h
@@ -31,6 +31,9 @@
 
 #include "abstractrenderitem_p.h"
 #include "objecthelper_p.h"
+#include <QtGui/QRgb>
+#include <QtGui/QImage>
+#include <QtGui/QColor>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -48,11 +51,17 @@ public:
     void setMesh(const QString &meshFile);
     inline ObjectHelper *mesh() const { return m_object; }
     inline void setScaling(const QVector3D &scaling) { m_scaling = scaling; }
-    inline QVector3D scaling() const { return m_scaling; }
+    inline const QVector3D &scaling() const { return m_scaling; }
+    inline void setOrigScaling(const QVector3D &scaling) { m_origScaling = scaling; }
+    inline const QVector3D &origScaling() const { return m_origScaling; }
     inline void setPosition(const QVector3D &position) { m_position = position; }
-    inline QVector3D position() const { return m_position; }
-    inline void setPositionAbsolute(bool absolute) { m_absolute = absolute; }
-    inline bool isPositionAbsolute() const { return m_absolute; }
+    inline const QVector3D &position() const { return m_position; }
+    inline void setOrigPosition(const QVector3D &position) { m_origPosition = position; }
+    inline const QVector3D &origPosition() const { return m_origPosition; }
+    inline void setPositionAbsolute(bool absolute) { m_positionAbsolute = absolute; }
+    inline bool isPositionAbsolute() const { return m_positionAbsolute; }
+    inline void setScalingAbsolute(bool absolute) { m_scalingAbsolute = absolute; }
+    inline bool isScalingAbsolute() const { return m_scalingAbsolute; }
     inline void setBlendNeeded(bool blend) { m_needBlend = blend; }
     inline bool isBlendNeeded() const { return m_needBlend; }
     inline void setVisible(bool visible) { m_visible = visible; }
@@ -68,14 +77,78 @@ public:
     inline void setFacingCamera(bool facing) { m_isFacingCamera = facing; }
     inline bool isFacingCamera() const { return m_isFacingCamera; }
     inline void setRenderer(Abstract3DRenderer *renderer) { m_renderer = renderer; }
+    inline void setLabelItem(bool isLabel) { m_labelItem = isLabel; }
+    inline bool isLabel() const { return m_labelItem; }
+
+    // Volume specific
+    inline void setTextureWidth(int width) { m_textureWidth = width; setSliceIndexX(m_sliceIndexX); }
+    inline int textureWidth() const { return m_textureWidth; }
+    inline void setTextureHeight(int height) { m_textureHeight = height; setSliceIndexY(m_sliceIndexY); }
+    inline int textureHeight() const { return m_textureHeight; }
+    inline void setTextureDepth(int depth) { m_textureDepth = depth; setSliceIndexZ(m_sliceIndexZ); }
+    inline int textureDepth() const { return m_textureDepth; }
+    inline int textureSize() const { return m_textureWidth * m_textureHeight * m_textureDepth; }
+    inline void setColorTable(const QVector<QVector4D> &colors) { m_colorTable = colors; }
+    void setColorTable(const QVector<QRgb> &colors);
+    inline const QVector<QVector4D> &colorTable() const { return m_colorTable; }
+    inline void setVolume(bool volume) { m_isVolume = volume; }
+    inline bool isVolume() const { return m_isVolume; }
+    inline void setTextureFormat(QImage::Format format) { m_textureFormat = format; }
+    inline QImage::Format textureFormat() const { return m_textureFormat; }
+    inline void setSliceIndexX(int index)
+    {
+        m_sliceIndexX = index;
+        m_sliceFractions.setX((float(index) + 0.5f) / float(m_textureWidth) * 2.0 - 1.0);
+    }
+    inline void setSliceIndexY(int index)
+    {
+        m_sliceIndexY = index;
+        m_sliceFractions.setY((float(index) + 0.5f) / float(m_textureHeight) * 2.0 - 1.0);
+    }
+    inline void setSliceIndexZ(int index)
+    {
+        m_sliceIndexZ = index;
+        m_sliceFractions.setZ((float(index) + 0.5f) / float(m_textureDepth) * 2.0 - 1.0);
+    }
+    inline const QVector3D &sliceFractions() const { return m_sliceFractions; }
+    inline int sliceIndexX() const { return m_sliceIndexX; }
+    inline int sliceIndexY() const { return m_sliceIndexY; }
+    inline int sliceIndexZ() const { return m_sliceIndexZ; }
+    inline void setAlphaMultiplier(float mult) { m_alphaMultiplier = mult; }
+    inline float alphaMultiplier() const { return m_alphaMultiplier; }
+    inline void setPreserveOpacity(bool enable) { m_preserveOpacity = enable; }
+    inline bool preserveOpacity() const { return m_preserveOpacity; }
+    inline void setUseHighDefShader(bool enable) { m_useHighDefShader = enable; }
+    inline bool useHighDefShader() const {return m_useHighDefShader; }
+    void setMinBounds(const QVector3D &bounds);
+    inline const QVector3D &minBounds() const { return m_minBounds; }
+    void setMaxBounds(const QVector3D &bounds);
+    inline const QVector3D &maxBounds() const { return m_maxBounds; }
+    inline const QVector3D &minBoundsNormal() const { return m_minBoundsNormal; }
+    inline const QVector3D &maxBoundsNormal() const { return m_maxBoundsNormal; }
+    inline void setDrawSlices(bool enable) { m_drawSlices = enable; }
+    inline bool drawSlices() const {return m_drawSlices; }
+    inline void setDrawSliceFrames(bool enable) { m_drawSliceFrames = enable; }
+    inline bool drawSliceFrames() const {return m_drawSliceFrames; }
+    void setSliceFrameColor(const QColor &color);
+    inline const QVector4D &sliceFrameColor() const { return m_sliceFrameColor; }
+    inline void setSliceFrameWidths(const QVector3D &widths) { m_sliceFrameWidths = widths * 2.0f; }
+    inline const QVector3D &sliceFrameWidths() const { return m_sliceFrameWidths; }
+    inline void setSliceFrameGaps(const QVector3D &gaps) { m_sliceFrameGaps = gaps * 2.0f; }
+    inline const QVector3D &sliceFrameGaps() const { return m_sliceFrameGaps; }
+    inline void setSliceFrameThicknesses(const QVector3D &thicknesses) { m_sliceFrameThicknesses = thicknesses; }
+    inline const QVector3D &sliceFrameThicknesses() const { return m_sliceFrameThicknesses; }
 
 private:
     Q_DISABLE_COPY(CustomRenderItem)
 
     GLuint m_texture;
     QVector3D m_scaling;
+    QVector3D m_origScaling;
     QVector3D m_position;
-    bool m_absolute;
+    QVector3D m_origPosition;
+    bool m_positionAbsolute;
+    bool m_scalingAbsolute;
     ObjectHelper *m_object; // shared reference
     bool m_needBlend;
     bool m_visible;
@@ -85,6 +158,32 @@ private:
     bool m_isFacingCamera;
     QCustom3DItem *m_item;
     Abstract3DRenderer *m_renderer;
+    bool m_labelItem;
+
+    // Volume specific
+    int m_textureWidth;
+    int m_textureHeight;
+    int m_textureDepth;
+    QVector<QVector4D> m_colorTable;
+    bool m_isVolume;
+    QImage::Format m_textureFormat;
+    int m_sliceIndexX;
+    int m_sliceIndexY;
+    int m_sliceIndexZ;
+    QVector3D m_sliceFractions;
+    float m_alphaMultiplier;
+    bool m_preserveOpacity;
+    bool m_useHighDefShader;
+    QVector3D m_minBounds;
+    QVector3D m_maxBounds;
+    QVector3D m_minBoundsNormal;
+    QVector3D m_maxBoundsNormal;
+    bool m_drawSlices;
+    bool m_drawSliceFrames;
+    QVector4D m_sliceFrameColor;
+    QVector3D m_sliceFrameWidths;
+    QVector3D m_sliceFrameGaps;
+    QVector3D m_sliceFrameThicknesses;
 };
 typedef QHash<QCustom3DItem *, CustomRenderItem *> CustomRenderItemArray;