diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-06-04 16:56:17 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-08 11:40:25 +0200 |
| commit | 1535da8a5923b5829b945cc9fd1dee4cdfbcfe5e (patch) | |
| tree | e0d7ecfae3b56f1d995a4c1c39bb46bc03d5b529 /src/quick/scenegraph/coreapi/qsgnode.h | |
| parent | 7775287e40689c6301ddb838b4bcd030b617677c (diff) | |
Improve on scenegraph documentation.
Change-Id: Ib584a45454f6fd2a3c0bfb32a76b19839e4a2a09
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgnode.h')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode.h | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h index 7403b626e6..f0c7825531 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.h +++ b/src/quick/scenegraph/coreapi/qsgnode.h @@ -66,15 +66,14 @@ class Q_QUICK_EXPORT QSGNode public: enum NodeType { BasicNodeType, - RootNodeType, GeometryNodeType, TransformNodeType, ClipNodeType, OpacityNodeType, -#ifndef Q_QDOC - RenderNodeType, // internal +#ifndef qdoc + RootNodeType, + RenderNodeType #endif - UserNodeType = 1024 }; enum Flag { @@ -92,22 +91,23 @@ public: Q_DECLARE_FLAGS(Flags, Flag) enum DirtyStateBit { - DirtyUsePreprocess = UsePreprocess, - DirtyMatrix = 0x0100, - DirtyClipList = 0x0200, DirtyNodeAdded = 0x0400, DirtyNodeRemoved = 0x0800, DirtyGeometry = 0x1000, DirtyMaterial = 0x2000, DirtyOpacity = 0x4000, + +#ifndef qdoc DirtyForceUpdate = 0x8000, + DirtyUsePreprocess = UsePreprocess, + DirtyPropagationMask = DirtyMatrix - | DirtyClipList | DirtyNodeAdded | DirtyOpacity | DirtyForceUpdate +#endif }; Q_DECLARE_FLAGS(DirtyState, DirtyStateBit) @@ -172,20 +172,9 @@ private: void *m_reserved; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::DirtyState) -Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::Flags) - class Q_QUICK_EXPORT QSGBasicGeometryNode : public QSGNode { public: -// enum UsagePattern { -// Static, -// Dynamic, -// Stream -// }; -// void setUsagePattern(UsagePattern pattern); -// UsagePattern usagePattern() const { return m_pattern; } - ~QSGBasicGeometryNode(); void setGeometry(QSGGeometry *geometry); @@ -207,8 +196,6 @@ private: const QMatrix4x4 *m_matrix; const QSGClipNode *m_clip_list; - -// UsagePattern m_pattern; }; class QSGMaterial; @@ -343,6 +330,9 @@ Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGRootNode *n); #endif +Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::DirtyState) +Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::Flags) + QT_END_NAMESPACE QT_END_HEADER |