diff options
| author | Sergey Dubitskiy <sergey.dubitskiy@nokia.com> | 2012-01-17 10:38:12 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 02:09:38 +0100 |
| commit | a9eeaff74f67912d46b5cbae4539f4c4c0e2a3c4 (patch) | |
| tree | 04045a148f80332f7ed1c5ff5fa519bb414e11b3 /src | |
| parent | 2b7bc9203f7432faac0ef0e180a060b6b5808c83 (diff) | |
QTBUG-23454. Added reference grid. Added zoomin/zoomout controls.
Change-Id: Ifdaad630cee1f9445325d7fb61012c76d44a38b0
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/shapes/line.cpp | 7 | ||||
| -rw-r--r-- | src/threed/viewing/qglcamera.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/imports/shapes/line.cpp b/src/imports/shapes/line.cpp index ef7c9071..f93a2b00 100644 --- a/src/imports/shapes/line.cpp +++ b/src/imports/shapes/line.cpp @@ -84,6 +84,7 @@ Line::Line(QObject *parent) : QDeclarativeItem3D(parent) ,m_width(3.0) + ,m_geometry(0) ,m_changeFlag(false) { //meh @@ -142,13 +143,11 @@ void Line::drawItem(QGLPainter *painter) if (m_changeFlag || !m_geometry) { if (m_geometry) delete m_geometry; - QGLBuilder builder; - QGeometryData lineCollection; - builder.newSection(); - lineCollection.appendVertexArray(m_vertexArray); + QGLBuilder builder; + builder.newSection(); builder.addTriangles(lineCollection); builder.currentNode()->setDrawingMode(QGL::LineStrip); builder.currentNode()->setDrawingWidth(m_width); diff --git a/src/threed/viewing/qglcamera.h b/src/threed/viewing/qglcamera.h index 87f7cf11..d943d283 100644 --- a/src/threed/viewing/qglcamera.h +++ b/src/threed/viewing/qglcamera.h @@ -67,7 +67,7 @@ class Q_QT3D_EXPORT QGLCamera : public QObject Q_PROPERTY(qreal fieldOfView READ fieldOfView WRITE setFieldOfView NOTIFY projectionChanged) Q_PROPERTY(qreal nearPlane READ nearPlane WRITE setNearPlane NOTIFY projectionChanged) Q_PROPERTY(qreal farPlane READ farPlane WRITE setFarPlane NOTIFY projectionChanged) - Q_PROPERTY(QSizeF viewSize READ viewSize WRITE setViewSize NOTIFY projectionChanged SCRIPTABLE false) + Q_PROPERTY(QSizeF viewSize READ viewSize WRITE setViewSize NOTIFY projectionChanged) Q_PROPERTY(QSizeF minViewSize READ minViewSize WRITE setMinViewSize NOTIFY projectionChanged SCRIPTABLE false) Q_PROPERTY(int screenRotation READ screenRotation WRITE setScreenRotation NOTIFY projectionChanged SCRIPTABLE false) Q_PROPERTY(QVector3D eye READ eye WRITE setEye NOTIFY viewChanged) |