qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QStencilOpSeparate renamed to QStencilOperationArguments 

As per API review

Change-Id: If0f4f5719508a41d786810c36051446b2c7a08db
Task-number: QTBUG-51436
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
This commit is contained in:
Robert Brock 2016-03-01 17:11:04 +00:00 committed by Paul Lemire
parent 6c0e1ca859
commit 55e2c86bbb
9 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
View File

@ -104,8 +104,8 @@ Viewport {
}
},
StencilOperation {
front.allTestsPassOperation: StencilOpSeparate.Decrement
back.allTestsPassOperation: StencilOpSeparate.Increment
front.allTestsPassOperation: StencilOperationArguments.Decrement
back.allTestsPassOperation: StencilOperationArguments.Increment
},
ColorMask { redMasked: false; greenMasked: false; blueMasked: false; alphaMasked: false }
]

4
src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
View File

@ -91,7 +91,7 @@
#include <Qt3DRender/qclipplane.h>
#include <Qt3DRender/qseamlesscubemap.h>
#include <Qt3DRender/qstenciloperation.h>
#include <Qt3DRender/qstencilopseparate.h>
#include <Qt3DRender/qstenciloperationarguments.h>
#include <Qt3DRender/qstencilmask.h>
#include <Qt3DRender/qattribute.h>
#include <Qt3DRender/qbuffer.h>
@ -306,7 +306,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
qmlRegisterType<Qt3DRender::QPolygonOffset>(uri, 2, 0, "PolygonOffset");
qmlRegisterType<Qt3DRender::QColorMask>(uri, 2, 0, "ColorMask");
qmlRegisterType<Qt3DRender::QClipPlane>(uri, 2, 0, "ClipPlane");
qmlRegisterUncreatableType<Qt3DRender::QStencilOpSeparate>(uri, 2, 0, "StencilOpSeparate", QStringLiteral("StencilOpSeparate cannot be instanciated on its own"));
qmlRegisterUncreatableType<Qt3DRender::QStencilOperationArguments>(uri, 2, 0, "StencilOperationArguments", QStringLiteral("StencilOperationArguments cannot be instanciated on its own"));
qmlRegisterType<Qt3DRender::QSeamlessCubemap>(uri, 2, 0, "SeamlessCubemap");
qmlRegisterType<Qt3DRender::QStencilOperation>(uri, 2, 0, "StencilOperation");
qmlRegisterType<Qt3DRender::QStencilMask>(uri, 2, 0, "StencilMask");

14
src/render/renderstates/qstenciloperation.cpp
View File

@ -38,7 +38,7 @@
****************************************************************************/
#include "qstenciloperation.h"
#include "qstencilopseparate.h"
#include "qstenciloperationarguments.h"
#include <Qt3DRender/private/qrenderstate_p.h>
QT_BEGIN_NAMESPACE
@ -50,12 +50,12 @@ class QStencilOperationPrivate : public QRenderStatePrivate
public:
QStencilOperationPrivate()
: QRenderStatePrivate(QRenderState::StencilOp)
, m_front(new QStencilOpSeparate(QStencilOpSeparate::Front, q_ptr))
, m_back(new QStencilOpSeparate(QStencilOpSeparate::Back, q_ptr))
, m_front(new QStencilOperationArguments(QStencilOperationArguments::Front, q_ptr))
, m_back(new QStencilOperationArguments(QStencilOperationArguments::Back, q_ptr))
{}
QStencilOpSeparate *m_front;
QStencilOpSeparate *m_back;
QStencilOperationArguments *m_front;
QStencilOperationArguments *m_back;
};
@ -69,13 +69,13 @@ QStencilOperation::~QStencilOperation()
QNode::cleanup();
}
QStencilOpSeparate *QStencilOperation::front() const
QStencilOperationArguments *QStencilOperation::front() const
{
Q_D(const QStencilOperation);
return d->m_front;
}
QStencilOpSeparate *QStencilOperation::back() const
QStencilOperationArguments *QStencilOperation::back() const
{
Q_D(const QStencilOperation);
return d->m_back;

10
src/render/renderstates/qstenciloperation.h
View File

@ -47,20 +47,20 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
class QStencilOperationPrivate;
class QStencilOpSeparate;
class QStencilOperationArguments;
class QT3DRENDERSHARED_EXPORT QStencilOperation : public QRenderState
{
Q_OBJECT
Q_PROPERTY(Qt3DRender::QStencilOpSeparate *front READ front CONSTANT)
Q_PROPERTY(Qt3DRender::QStencilOpSeparate *back READ back CONSTANT)
Q_PROPERTY(Qt3DRender::QStencilOperationArguments *front READ front CONSTANT)
Q_PROPERTY(Qt3DRender::QStencilOperationArguments *back READ back CONSTANT)
public:
explicit QStencilOperation(Qt3DCore::QNode *parent = 0);
~QStencilOperation();
QStencilOpSeparate *front() const;
QStencilOpSeparate *back() const;
QStencilOperationArguments *front() const;
QStencilOperationArguments *back() const;
protected:
void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL;

54
src/render/renderstates/qstencilopseparate.cpp → src/render/renderstates/qstenciloperationarguments.cpp
View File

@ -37,89 +37,89 @@
**
****************************************************************************/
#include "qstencilopseparate.h"
#include "qstenciloperationarguments.h"
#include <private/qobject_p.h>
QT_BEGIN_NAMESPACE
namespace Qt3DRender {
class QStencilOpSeparatePrivate : public QObjectPrivate
class QStencilOperationArgumentsPrivate : public QObjectPrivate
{
public:
QStencilOpSeparatePrivate(QStencilOpSeparate::FaceMode mode)
QStencilOperationArgumentsPrivate(QStencilOperationArguments::FaceMode mode)
: QObjectPrivate()
, m_face(mode)
, m_stencilTestFailureOperation(QStencilOpSeparate::Keep)
, m_depthTestFailureOperation(QStencilOpSeparate::Keep)
, m_allTestsPassOperation(QStencilOpSeparate::Keep)
, m_stencilTestFailureOperation(QStencilOperationArguments::Keep)
, m_depthTestFailureOperation(QStencilOperationArguments::Keep)
, m_allTestsPassOperation(QStencilOperationArguments::Keep)
{
}
QStencilOpSeparate::FaceMode m_face;
QStencilOpSeparate::Operation m_stencilTestFailureOperation;
QStencilOpSeparate::Operation m_depthTestFailureOperation;
QStencilOpSeparate::Operation m_allTestsPassOperation;
QStencilOperationArguments::FaceMode m_face;
QStencilOperationArguments::Operation m_stencilTestFailureOperation;
QStencilOperationArguments::Operation m_depthTestFailureOperation;
QStencilOperationArguments::Operation m_allTestsPassOperation;
};
QStencilOpSeparate::QStencilOpSeparate(FaceMode mode, QObject *parent)
: QObject(*new QStencilOpSeparatePrivate(mode), parent)
QStencilOperationArguments::QStencilOperationArguments(FaceMode mode, QObject *parent)
: QObject(*new QStencilOperationArgumentsPrivate(mode), parent)
{
}
QStencilOpSeparate::~QStencilOpSeparate()
QStencilOperationArguments::~QStencilOperationArguments()
{
}
QStencilOpSeparate::FaceMode QStencilOpSeparate::faceMode() const
QStencilOperationArguments::FaceMode QStencilOperationArguments::faceMode() const
{
Q_D(const QStencilOpSeparate);
Q_D(const QStencilOperationArguments);
return d->m_face;
}
void QStencilOpSeparate::setStencilTestFailureOperation(QStencilOpSeparate::Operation operation)
void QStencilOperationArguments::setStencilTestFailureOperation(QStencilOperationArguments::Operation operation)
{
Q_D(QStencilOpSeparate);
Q_D(QStencilOperationArguments);
if (d->m_stencilTestFailureOperation != operation) {
d->m_stencilTestFailureOperation = operation;
Q_EMIT stencilTestFailureOperationChanged(operation);
}
}
QStencilOpSeparate::Operation QStencilOpSeparate::stencilTestFailureOperation() const
QStencilOperationArguments::Operation QStencilOperationArguments::stencilTestFailureOperation() const
{
Q_D(const QStencilOpSeparate);
Q_D(const QStencilOperationArguments);
return d->m_stencilTestFailureOperation;
}
void QStencilOpSeparate::setDepthTestFailureOperation(QStencilOpSeparate::Operation operation)
void QStencilOperationArguments::setDepthTestFailureOperation(QStencilOperationArguments::Operation operation)
{
Q_D(QStencilOpSeparate);
Q_D(QStencilOperationArguments);
if (d->m_depthTestFailureOperation != operation) {
d->m_depthTestFailureOperation = operation;
Q_EMIT depthTestFailureOperationChanged(operation);
}
}
QStencilOpSeparate::Operation QStencilOpSeparate::depthTestFailureOperation() const
QStencilOperationArguments::Operation QStencilOperationArguments::depthTestFailureOperation() const
{
Q_D(const QStencilOpSeparate);
Q_D(const QStencilOperationArguments);
return d->m_depthTestFailureOperation;
}
void QStencilOpSeparate::setAllTestsPassOperation(QStencilOpSeparate::Operation operation)
void QStencilOperationArguments::setAllTestsPassOperation(QStencilOperationArguments::Operation operation)
{
Q_D(QStencilOpSeparate);
Q_D(QStencilOperationArguments);
if (d->m_allTestsPassOperation != operation) {
d->m_allTestsPassOperation = operation;
Q_EMIT allTestsPassOperationChanged(operation);
}
}
QStencilOpSeparate::Operation QStencilOpSeparate::allTestsPassOperation() const
QStencilOperationArguments::Operation QStencilOperationArguments::allTestsPassOperation() const
{
Q_D(const QStencilOpSeparate);
Q_D(const QStencilOperationArguments);
return d->m_allTestsPassOperation;
}

16
src/render/renderstates/qstencilopseparate.h → src/render/renderstates/qstenciloperationarguments.h
View File

@ -37,8 +37,8 @@
**
****************************************************************************/
#ifndef QT3DRENDER_QSTENCILOPSEPARATE_H
#define QT3DRENDER_QSTENCILOPSEPARATE_H
#ifndef QT3DRENDER_QSTENCILOPERATIONARGUMENTS_H
#define QT3DRENDER_QSTENCILOPERATIONARGUMENTS_H
#include <QObject>
#include <Qt3DRender/qt3drender_global.h>
@ -48,9 +48,9 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
class QStencilOperationPrivate;
class QStencilOpSeparatePrivate;
class QStencilOperationArgumentsPrivate;
class QT3DRENDERSHARED_EXPORT QStencilOpSeparate : public QObject
class QT3DRENDERSHARED_EXPORT QStencilOperationArguments : public QObject
{
Q_OBJECT
Q_PROPERTY(FaceMode faceMode READ faceMode NOTIFY faceModeChanged)
@ -80,7 +80,7 @@ public:
};
Q_ENUM(Operation)
~QStencilOpSeparate();
~QStencilOperationArguments();
FaceMode faceMode() const;
@ -100,8 +100,8 @@ Q_SIGNALS:
void faceModeChanged(FaceMode faceMode);
private:
explicit QStencilOpSeparate(FaceMode mode, QObject *parent = 0);
Q_DECLARE_PRIVATE(QStencilOpSeparate)
explicit QStencilOperationArguments(FaceMode mode, QObject *parent = 0);
Q_DECLARE_PRIVATE(QStencilOperationArguments)
friend class QStencilOperationPrivate;
};
@ -110,4 +110,4 @@ private:
QT_END_NAMESPACE
#endif // QT3DRENDER_QSTENCILOPSEPARATE_H
#endif // QT3DRENDER_QSTENCILOPERATIONARGUMENTS_H

12
src/render/renderstates/renderstates.pri
View File

@ -5,6 +5,7 @@ HEADERS += \
$$PWD/qalphacoverage.h \
$$PWD/qalphatest.h \
$$PWD/qblendequation.h \
$$PWD/qblendequationarguments.h \
$$PWD/qclipplane.h \
$$PWD/qcolormask.h \
$$PWD/qcullface.h \
@ -18,21 +19,21 @@ HEADERS += \
$$PWD/qscissortest.h \
$$PWD/qstencilmask.h \
$$PWD/qstenciloperation.h \
$$PWD/qstencilopseparate.h \
$$PWD/qstenciloperationarguments.h \
$$PWD/qstenciltest.h \
$$PWD/qstenciltestarguments.h \
$$PWD/renderstates_p.h \
$$PWD/renderstateset_p.h \
$$PWD/qpointsize.h \
$$PWD/renderstatecollection_p.h \
$$PWD/qseamlesscubemap.h \
$$PWD/qblendequationarguments.h
$$PWD/qseamlesscubemap.h
SOURCES += \
$$PWD/qalphacoverage.cpp \
$$PWD/qalphatest.cpp \
$$PWD/qblendequation.cpp \
$$PWD/qblendequationarguments.cpp \
$$PWD/qclipplane.cpp \
$$PWD/qcolormask.cpp \
$$PWD/qcullface.cpp \
@ -45,12 +46,11 @@ SOURCES += \
$$PWD/qscissortest.cpp \
$$PWD/qstencilmask.cpp \
$$PWD/qstenciloperation.cpp \
$$PWD/qstencilopseparate.cpp \
$$PWD/qstenciloperationarguments.cpp \
$$PWD/qstenciltest.cpp \
$$PWD/qstenciltestarguments.cpp \
$$PWD/renderstates.cpp \
$$PWD/renderstateset.cpp \
$$PWD/qpointsize.cpp \
$$PWD/renderstatecollection.cpp \
$$PWD/qseamlesscubemap.cpp \
$$PWD/qblendequationarguments.cpp
$$PWD/qseamlesscubemap.cpp

6
src/render/renderstates/renderstateset.cpp
View File

@ -66,7 +66,7 @@
#include <Qt3DRender/qclipplane.h>
#include <Qt3DRender/qseamlesscubemap.h>
#include <Qt3DRender/qstenciloperation.h>
#include <Qt3DRender/qstencilopseparate.h>
#include <Qt3DRender/qstenciloperationarguments.h>
#include <Qt3DRender/qstencilmask.h>
QT_BEGIN_NAMESPACE
@ -346,8 +346,8 @@ RenderStateImpl* RenderStateImpl::getOrCreateState(QRenderState *renderState)
}
case QRenderState::StencilOp: {
QStencilOperation *stencilOp = static_cast<QStencilOperation *>(renderState);
const QStencilOpSeparate *front = stencilOp->front();
const QStencilOpSeparate *back = stencilOp->back();
const QStencilOperationArguments *front = stencilOp->front();
const QStencilOperationArguments *back = stencilOp->back();
return getOrCreateRenderStateImpl<StencilOp>(front->stencilTestFailureOperation(), front->depthTestFailureOperation(), front->allTestsPassOperation(),
back->stencilTestFailureOperation(), back->depthTestFailureOperation(), back->allTestsPassOperation());
}

2
tests/auto/render/renderpass/tst_renderpass.cpp
View File

@ -52,7 +52,7 @@
#include <Qt3DRender/QStencilTestArguments>
#include <Qt3DRender/QStencilMask>
#include <Qt3DRender/QStencilOperation>
#include <Qt3DRender/QStencilOpSeparate>
#include <Qt3DRender/QStencilOperationArguments>
#include <Qt3DRender/QClipPlane>
#include <Qt3DRender/private/renderstates_p.h>