diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-04-30 13:50:57 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-02 07:34:26 +0300 |
| commit | 984dc3069fc399178a234b3e740374f76af7ad04 (patch) | |
| tree | 4788300d6a69f0ed10444d70d0c9d269f199a96d /src/datavis3d/global/qdatavis3namespace.h | |
| parent | 82ebf1009002b3f73adf6c40fa221d618f7aace1 (diff) | |
Q3DMaps visualization type added
Very early draft.
Also added early draft of an example using it.
Change-Id: Ib6470607056748e979090ea0d9e751998ec1b3c9
Change-Id: Ib6470607056748e979090ea0d9e751998ec1b3c9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3d/global/qdatavis3namespace.h')
| -rw-r--r-- | src/datavis3d/global/qdatavis3namespace.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/datavis3d/global/qdatavis3namespace.h b/src/datavis3d/global/qdatavis3namespace.h index ebd5a3eb..2177b175 100644 --- a/src/datavis3d/global/qdatavis3namespace.h +++ b/src/datavis3d/global/qdatavis3namespace.h @@ -43,18 +43,24 @@ #define QVIS3DNAMESPACE_H #include "qdatavis3dglobal.h" +#include <QOpenGLFunctions> +#include <QVector3D> QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE // Constants used in several files -const float m_pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679f; +const GLfloat m_pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679f; +const GLfloat zComp = 10.0f; // Compensation for z position; move all objects to positive z, as shader can't handle negative values correctly +const QVector3D defaultLightPos = QVector3D(0.0f, 3.0f, zComp); +const GLfloat defaultRatio = 1.0f / 1.6f; // default aspect ratio 16:10 // Enums used in several files enum BarStyle { Bars = 0, Pyramids, Cones, - Cylinders + Cylinders, + Spheres }; enum CameraPreset { |