diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/render/geometry/qbuffer.h | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/render/geometry/qbuffer.h')
-rw-r--r-- | src/render/geometry/qbuffer.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index 8b47de918..7cb5acb0a 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -59,6 +59,7 @@ class QT3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QNode Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged) Q_PROPERTY(UsageType usage READ usage WRITE setUsage NOTIFY usageChanged) Q_PROPERTY(bool syncData READ isSyncData WRITE setSyncData NOTIFY syncDataChanged) + Q_PROPERTY(AccessType accessType READ accessType WRITE setAccessType NOTIFY accessTypeChanged REVISION 9) public: enum BufferType @@ -87,12 +88,20 @@ public: }; Q_ENUM(UsageType) // LCOV_EXCL_LINE + enum AccessType { + Write = 0x1, + Read = 0x2, + ReadWrite = Write|Read + }; + Q_ENUM(AccessType) // LCOV_EXCL_LINE + explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = nullptr); ~QBuffer(); UsageType usage() const; BufferType type() const; bool isSyncData() const; + AccessType accessType() const; void setData(const QByteArray &bytes); QByteArray data() const; @@ -106,6 +115,7 @@ public Q_SLOTS: void setType(BufferType type); void setUsage(UsageType usage); void setSyncData(bool syncData); + void setAccessType(AccessType access); protected: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; @@ -115,6 +125,8 @@ Q_SIGNALS: void typeChanged(BufferType type); void usageChanged(UsageType usage); void syncDataChanged(bool syncData); + void accessTypeChanged(AccessType access); + void dataAvailable(); private: Q_DECLARE_PRIVATE(QBuffer) |