diff options
Diffstat (limited to 'src')
69 files changed, 357 insertions, 357 deletions
diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml index b43340a3f..6e5a843b0 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml @@ -72,7 +72,7 @@ Material { ] effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" @@ -93,7 +93,7 @@ Material { techniques: [ // OpenGL 3.1 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.CoreProfile @@ -105,7 +105,7 @@ Material { // OpenGL 2.1 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.NoProfile @@ -117,7 +117,7 @@ Material { // OpenGL ES 2 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml index c942aa0ba..e5ec0562a 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml @@ -86,7 +86,7 @@ Material { effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" @@ -107,7 +107,7 @@ Material { techniques: [ // OpenGL 3.1 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.CoreProfile @@ -119,7 +119,7 @@ Material { // OpenGL 2.1 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.NoProfile @@ -131,7 +131,7 @@ Material { // OpenGL ES 2 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml index fada8b240..646e787e6 100644 --- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml +++ b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml @@ -48,7 +48,7 @@ TechniqueFilter { property alias window: surfaceSelector.window // Select the forward rendering Technique of any used Effect - matchAll: [ Annotation { name: "renderingStyle"; value: "forward" } ] + matchAll: [ FilterKey { name: "renderingStyle"; value: "forward" } ] RenderSurfaceSelector { id: surfaceSelector diff --git a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml index eef76c7ee..51c656ae0 100644 --- a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml @@ -64,7 +64,7 @@ Material { effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" @@ -83,7 +83,7 @@ Material { techniques: [ // GL 3 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.CoreProfile @@ -97,7 +97,7 @@ Material { // GL 2 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.NoProfile @@ -111,7 +111,7 @@ Material { // ES 2 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml index 9fe945a91..6dfbf98c1 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml @@ -87,7 +87,7 @@ Material { ] effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" @@ -111,7 +111,7 @@ Material { techniques: [ // OpenGL 3.1 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.CoreProfile @@ -123,7 +123,7 @@ Material { // OpenGL 2.1 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.NoProfile @@ -135,7 +135,7 @@ Material { // OpenGL ES 2 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml index ad3610b3a..eeb1d33d4 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml @@ -88,7 +88,7 @@ Material { effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" @@ -109,7 +109,7 @@ Material { techniques: [ // OpenGL 3.1 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.CoreProfile @@ -121,7 +121,7 @@ Material { // OpenGL 2.1 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.NoProfile @@ -133,7 +133,7 @@ Material { // OpenGL ES 2 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml index 895f83796..d2c0efda0 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml @@ -101,7 +101,7 @@ Material { effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" @@ -122,7 +122,7 @@ Material { techniques: [ // OpenGL 3.1 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.CoreProfile @@ -134,7 +134,7 @@ Material { // OpenGL 2.1 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.NoProfile @@ -146,7 +146,7 @@ Material { // OpenGL ES 2 Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml index 0a3d925ec..9e286f459 100644 --- a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml @@ -57,7 +57,7 @@ Material { effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" @@ -66,7 +66,7 @@ Material { techniques: [ // GL 3 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.CoreProfile @@ -80,7 +80,7 @@ Material { // GL 2 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.NoProfile @@ -94,7 +94,7 @@ Material { // ES 2 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml index 750570727..adccd7c04 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml @@ -63,7 +63,7 @@ Material { effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" @@ -80,7 +80,7 @@ Material { techniques: [ // GL 3 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.CoreProfile @@ -102,7 +102,7 @@ Material { // GL 2 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.NoProfile @@ -124,7 +124,7 @@ Material { // ES 2 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml index bb5ac216e..e60bcefc8 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml @@ -62,7 +62,7 @@ Material { effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" @@ -78,7 +78,7 @@ Material { techniques: [ // GL 3 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.CoreProfile @@ -92,7 +92,7 @@ Material { // GL 2 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.NoProfile @@ -106,7 +106,7 @@ Material { // ES 2 Technique Technique { - annotations: [ forward ] + filterKeys: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml index 4d5b77f2b..b03e843e7 100644 --- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml +++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml @@ -90,7 +90,7 @@ Entity { parameters: Parameter { name: "skyboxTexture"; value: skyboxTexture} effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" diff --git a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml index e10d2d57e..d5f99445b 100644 --- a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml @@ -59,7 +59,7 @@ Material { effect: Effect { - Annotation { + FilterKey { id: forward name: "renderingStyle" value: "forward" diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 3eaefa5a0..bb2e8e947 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -54,7 +54,7 @@ #include <Qt3DRender/qcameraselector.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qparameter.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qcuboidmesh.h> #include <Qt3DRender/qconemesh.h> #include <Qt3DRender/qcylindermesh.h> @@ -189,7 +189,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) Qt3DRender::Quick::registerExtendedType<Qt3DRender::QSceneLoader, Qt3DRender::Render::Quick::Quick3DScene>("QSceneLoader", "Qt3D.Render/SceneLoader", uri, 2, 0, "SceneLoader"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QEffect, Qt3DRender::Render::Quick::Quick3DEffect>("QEffect", "Qt3D.Render/Effect", uri, 2, 0, "Effect"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTechnique, Qt3DRender::Render::Quick::Quick3DTechnique>("QTechnique", "Qt3D.Render/Technique", uri, 2, 0, "Technique"); - qmlRegisterType<Qt3DRender::QAnnotation>(uri, 2, 0, "Annotation"); + qmlRegisterType<Qt3DRender::QFilterKey>(uri, 2, 0, "FilterKey"); qmlRegisterType<Qt3DRender::QGraphicsApiFilter>(uri, 2, 0, "GraphicsApiFilter"); qmlRegisterUncreatableType<Qt3DRender::QParameter>(uri, 2, 0, "QParameter", "Quick3D should instantiate Quick3DParameter only"); qmlRegisterType<Qt3DRender::Render::Quick::Quick3DParameter>(uri, 2, 0, "Parameter"); diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp index 5433c1bd2..048648467 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp +++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp @@ -51,13 +51,13 @@ Quick3DRenderPass::Quick3DRenderPass(QObject *parent) { } -QQmlListProperty<QAnnotation> Quick3DRenderPass::annotationList() +QQmlListProperty<QFilterKey> Quick3DRenderPass::filterKeyList() { - return QQmlListProperty<QAnnotation>(this, 0, - &Quick3DRenderPass::appendAnnotation, - &Quick3DRenderPass::annotationsCount, - &Quick3DRenderPass::annotationAt, - &Quick3DRenderPass::clearAnnotations); + return QQmlListProperty<QFilterKey>(this, 0, + &Quick3DRenderPass::appendFilterKey, + &Quick3DRenderPass::filterKeysCount, + &Quick3DRenderPass::filterKeyAt, + &Quick3DRenderPass::clearFilterKey); } QQmlListProperty<QRenderState> Quick3DRenderPass::renderStateList() @@ -78,29 +78,29 @@ QQmlListProperty<QParameter> Quick3DRenderPass::parameterList() &Quick3DRenderPass::clearParameterList); } -void Quick3DRenderPass::appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *annotation) +void Quick3DRenderPass::appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilterKey *filterKey) { Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object); - rPass->parentRenderPass()->addAnnotation(annotation); + rPass->parentRenderPass()->addFilterKey(filterKey); } -QAnnotation *Quick3DRenderPass::annotationAt(QQmlListProperty<QAnnotation> *list, int index) +QFilterKey *Quick3DRenderPass::filterKeyAt(QQmlListProperty<QFilterKey> *list, int index) { Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object); - return rPass->parentRenderPass()->annotations().at(index); + return rPass->parentRenderPass()->filterKeys().at(index); } -int Quick3DRenderPass::annotationsCount(QQmlListProperty<QAnnotation> *list) +int Quick3DRenderPass::filterKeysCount(QQmlListProperty<QFilterKey> *list) { Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object); - return rPass->parentRenderPass()->annotations().count(); + return rPass->parentRenderPass()->filterKeys().count(); } -void Quick3DRenderPass::clearAnnotations(QQmlListProperty<QAnnotation> *list) +void Quick3DRenderPass::clearFilterKey(QQmlListProperty<QFilterKey> *list) { Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object); - Q_FOREACH (QAnnotation *c, rPass->parentRenderPass()->annotations()) - rPass->parentRenderPass()->removeAnnotation(c); + Q_FOREACH (QFilterKey *c, rPass->parentRenderPass()->filterKeys()) + rPass->parentRenderPass()->removeFilterKey(c); } void Quick3DRenderPass::appendRenderState(QQmlListProperty<QRenderState> *list, QRenderState *state) diff --git a/src/quick3d/quick3drender/items/quick3drenderpass_p.h b/src/quick3d/quick3drender/items/quick3drenderpass_p.h index a7e7f6cd4..6ac940e23 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpass_p.h +++ b/src/quick3d/quick3drender/items/quick3drenderpass_p.h @@ -65,23 +65,23 @@ namespace Quick { class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPass : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList) + Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> filterKeys READ filterKeyList) Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderState> renderStates READ renderStateList) Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList) public: explicit Quick3DRenderPass(QObject *parent = 0); - QQmlListProperty<QAnnotation> annotationList(); + QQmlListProperty<QFilterKey> filterKeyList(); QQmlListProperty<QRenderState> renderStateList(); QQmlListProperty<QParameter> parameterList(); inline QRenderPass *parentRenderPass() const { return qobject_cast<QRenderPass *>(parent()); } private: - static void appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion); - static QAnnotation *annotationAt(QQmlListProperty<QAnnotation> *list, int index); - static int annotationsCount(QQmlListProperty<QAnnotation> *list); - static void clearAnnotations(QQmlListProperty<QAnnotation> *list); + static void appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilterKey *filterKey); + static QFilterKey *filterKeyAt(QQmlListProperty<QFilterKey> *list, int index); + static int filterKeysCount(QQmlListProperty<QFilterKey> *list); + static void clearFilterKey(QQmlListProperty<QFilterKey> *list); static void appendRenderState(QQmlListProperty<QRenderState> *list, QRenderState *state); static QRenderState *renderStateAt(QQmlListProperty<QRenderState> *list, int index); diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp index 30b3b9a45..73baa23c8 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp +++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp @@ -50,9 +50,9 @@ Quick3DRenderPassFilter::Quick3DRenderPassFilter(QObject *parent) { } -QQmlListProperty<QAnnotation> Quick3DRenderPassFilter::includeList() +QQmlListProperty<QFilterKey> Quick3DRenderPassFilter::includeList() { - return QQmlListProperty<QAnnotation>(this, 0, + return QQmlListProperty<QFilterKey>(this, 0, &Quick3DRenderPassFilter::appendInclude, &Quick3DRenderPassFilter::includesCount, &Quick3DRenderPassFilter::includeAt, @@ -69,7 +69,7 @@ QQmlListProperty<QParameter> Quick3DRenderPassFilter::parameterList() } -void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QAnnotation> *list, QAnnotation *annotation) +void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QFilterKey> *list, QFilterKey *annotation) { Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object); if (filter) { @@ -78,7 +78,7 @@ void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QAnnotation> *list, } } -QAnnotation *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QAnnotation> *list, int index) +QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QFilterKey> *list, int index) { Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object); if (filter) @@ -86,7 +86,7 @@ QAnnotation *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QAnnotation> *l return 0; } -int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QAnnotation> *list) +int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QFilterKey> *list) { Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object); if (filter) @@ -94,11 +94,11 @@ int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QAnnotation> *list) return 0; } -void Quick3DRenderPassFilter::clearIncludes(QQmlListProperty<QAnnotation> *list) +void Quick3DRenderPassFilter::clearIncludes(QQmlListProperty<QFilterKey> *list) { Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object); if (filter) { - Q_FOREACH (QAnnotation *criterion, filter->parentRenderPassFilter()->includes()) + Q_FOREACH (QFilterKey *criterion, filter->parentRenderPassFilter()->includes()) filter->parentRenderPassFilter()->removeInclude(criterion); } } diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h index 04fb8cef9..d1b350c0c 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h +++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h @@ -53,7 +53,7 @@ #include <Qt3DQuick/private/quick3dnode_p.h> #include <Qt3DRender/qrenderpassfilter.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <QQmlListProperty> @@ -66,22 +66,22 @@ namespace Quick { class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPassFilter : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> includes READ includeList) + Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> includes READ includeList) Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList) public: explicit Quick3DRenderPassFilter(QObject *parent = 0); - QQmlListProperty<QAnnotation> includeList(); + QQmlListProperty<QFilterKey> includeList(); QQmlListProperty<QParameter> parameterList(); inline QRenderPassFilter *parentRenderPassFilter() const { return qobject_cast<Qt3DRender::QRenderPassFilter*>(parent()); } private: - static void appendInclude(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion); - static QAnnotation *includeAt(QQmlListProperty<QAnnotation> *list, int index); - static int includesCount(QQmlListProperty<QAnnotation> *list); - static void clearIncludes(QQmlListProperty<QAnnotation> *list); + static void appendInclude(QQmlListProperty<QFilterKey> *list, QFilterKey *criterion); + static QFilterKey *includeAt(QQmlListProperty<QFilterKey> *list, int index); + static int includesCount(QQmlListProperty<QFilterKey> *list); + static void clearIncludes(QQmlListProperty<QFilterKey> *list); static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param); static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index); diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp index 6c817d631..06b9114bd 100644 --- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp @@ -126,26 +126,26 @@ void Quick3DTechnique::clearRenderPasses(QQmlListProperty<QRenderPass> *list) } } -QQmlListProperty<QAnnotation> Quick3DTechnique::annotationList() +QQmlListProperty<QFilterKey> Quick3DTechnique::filterKeyList() { - return QQmlListProperty<QAnnotation>(this, 0, - &Quick3DTechnique::appendAnnotation, - &Quick3DTechnique::annotationCount, - &Quick3DTechnique::annotationAt, - &Quick3DTechnique::clearAnnotationList); + return QQmlListProperty<QFilterKey>(this, 0, + &Quick3DTechnique::appendFilterKey, + &Quick3DTechnique::filterKeyCount, + &Quick3DTechnique::filterKeyAt, + &Quick3DTechnique::clearFilterKeyList); } -void Quick3DTechnique::appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *annotation) +void Quick3DTechnique::appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilterKey *filterKey) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); if (technique) { - if (!annotation->parent()) - annotation->setParent(technique->parentTechnique()); - technique->parentTechnique()->addAnnotation(annotation); + if (!filterKey->parent()) + filterKey->setParent(technique->parentTechnique()); + technique->parentTechnique()->addFilterKey(filterKey); } } -QAnnotation *Quick3DTechnique::annotationAt(QQmlListProperty<QAnnotation> *list, int index) +QFilterKey *Quick3DTechnique::filterKeyAt(QQmlListProperty<QFilterKey> *list, int index) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); if (technique) @@ -153,7 +153,7 @@ QAnnotation *Quick3DTechnique::annotationAt(QQmlListProperty<QAnnotation> *list, return 0; } -int Quick3DTechnique::annotationCount(QQmlListProperty<QAnnotation> *list) +int Quick3DTechnique::filterKeyCount(QQmlListProperty<QFilterKey> *list) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); if (technique) @@ -161,12 +161,12 @@ int Quick3DTechnique::annotationCount(QQmlListProperty<QAnnotation> *list) return 0; } -void Quick3DTechnique::clearAnnotationList(QQmlListProperty<QAnnotation> *list) +void Quick3DTechnique::clearFilterKeyList(QQmlListProperty<QFilterKey> *list) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); if (technique) { - Q_FOREACH (QAnnotation *a, technique->parentTechnique()->filterKeys()) - technique->parentTechnique()->removeAnnotation(a); + Q_FOREACH (QFilterKey *a, technique->parentTechnique()->filterKeys()) + technique->parentTechnique()->removeFilterKey(a); } } diff --git a/src/quick3d/quick3drender/items/quick3dtechnique_p.h b/src/quick3d/quick3drender/items/quick3dtechnique_p.h index 4be8d57df..203befcb7 100644 --- a/src/quick3d/quick3drender/items/quick3dtechnique_p.h +++ b/src/quick3d/quick3drender/items/quick3dtechnique_p.h @@ -64,13 +64,13 @@ namespace Quick { class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechnique : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList) + Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> filterKeys READ filterKeyList) Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderPass> renderPasses READ renderPassList) Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList) public: explicit Quick3DTechnique(QObject *parent = 0); - QQmlListProperty<QAnnotation> annotationList(); + QQmlListProperty<QFilterKey> filterKeyList(); QQmlListProperty<QRenderPass> renderPassList(); QQmlListProperty<QParameter> parameterList(); @@ -84,10 +84,10 @@ private: static int parametersCount(QQmlListProperty<QParameter> *list); static void clearParameterList(QQmlListProperty<QParameter> *list); - static void appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *Annotation); - static QAnnotation *annotationAt(QQmlListProperty<QAnnotation> *list, int index); - static int annotationCount(QQmlListProperty<QAnnotation> *list); - static void clearAnnotationList(QQmlListProperty<QAnnotation> *list); + static void appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilterKey *filterKey); + static QFilterKey *filterKeyAt(QQmlListProperty<QFilterKey> *list, int index); + static int filterKeyCount(QQmlListProperty<QFilterKey> *list); + static void clearFilterKeyList(QQmlListProperty<QFilterKey> *list); static void appendRenderPass(QQmlListProperty<QRenderPass> *list, QRenderPass* renderPass); static QRenderPass *renderPassAt(QQmlListProperty<QRenderPass> *list, int index); diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp index 65dec82a0..00bde52ce 100644 --- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp @@ -50,9 +50,9 @@ Quick3DTechniqueFilter::Quick3DTechniqueFilter(QObject *parent) { } -QQmlListProperty<QAnnotation> Quick3DTechniqueFilter::matchList() +QQmlListProperty<QFilterKey> Quick3DTechniqueFilter::matchList() { - return QQmlListProperty<QAnnotation>(this, 0, + return QQmlListProperty<QFilterKey>(this, 0, &Quick3DTechniqueFilter::appendRequire, &Quick3DTechniqueFilter::requiresCount, &Quick3DTechniqueFilter::requireAt, @@ -68,7 +68,7 @@ QQmlListProperty<QParameter> Quick3DTechniqueFilter::parameterList() &Quick3DTechniqueFilter::clearParameterList); } -void Quick3DTechniqueFilter::appendRequire(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion) +void Quick3DTechniqueFilter::appendRequire(QQmlListProperty<QFilterKey> *list, QFilterKey *criterion) { Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object); if (filter) { @@ -77,7 +77,7 @@ void Quick3DTechniqueFilter::appendRequire(QQmlListProperty<QAnnotation> *list, } } -QAnnotation *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QAnnotation> *list, int index) +QFilterKey *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QFilterKey> *list, int index) { Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object); if (filter) @@ -85,7 +85,7 @@ QAnnotation *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QAnnotation> *li return 0; } -int Quick3DTechniqueFilter::requiresCount(QQmlListProperty<QAnnotation> *list) +int Quick3DTechniqueFilter::requiresCount(QQmlListProperty<QFilterKey> *list) { Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object); if (filter) @@ -93,11 +93,11 @@ int Quick3DTechniqueFilter::requiresCount(QQmlListProperty<QAnnotation> *list) return 0; } -void Quick3DTechniqueFilter::clearRequires(QQmlListProperty<QAnnotation> *list) +void Quick3DTechniqueFilter::clearRequires(QQmlListProperty<QFilterKey> *list) { Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object); if (filter) { - Q_FOREACH (QAnnotation *criterion, filter->parentTechniqueFilter()->criteria()) + Q_FOREACH (QFilterKey *criterion, filter->parentTechniqueFilter()->criteria()) filter->parentTechniqueFilter()->removeMatch(criterion); } } diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h index a58835d81..27d637e23 100644 --- a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h @@ -53,7 +53,7 @@ #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DRender/qtechniquefilter.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DQuick/private/quick3dnode_p.h> #include <QQmlListProperty> @@ -66,22 +66,22 @@ namespace Quick { class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechniqueFilter : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> matchAll READ matchList) + Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> matchAll READ matchList) Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList) public: explicit Quick3DTechniqueFilter(QObject *parent = 0); - QQmlListProperty<QAnnotation> matchList(); + QQmlListProperty<QFilterKey> matchList(); QQmlListProperty<QParameter> parameterList(); inline QTechniqueFilter *parentTechniqueFilter() const { return qobject_cast<QTechniqueFilter*>(parent()); } private: - static void appendRequire(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion); - static QAnnotation *requireAt(QQmlListProperty<QAnnotation> *list, int index); - static int requiresCount(QQmlListProperty<QAnnotation> *list); - static void clearRequires(QQmlListProperty<QAnnotation> *list); + static void appendRequire(QQmlListProperty<QFilterKey> *list, QFilterKey *criterion); + static QFilterKey *requireAt(QQmlListProperty<QFilterKey> *list, int index); + static int requiresCount(QQmlListProperty<QFilterKey> *list); + static void clearRequires(QQmlListProperty<QFilterKey> *list); static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param); static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index); diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp index 790070408..cfca526e5 100644 --- a/src/render/defaults/qdiffusemapmaterial.cpp +++ b/src/render/defaults/qdiffusemapmaterial.cpp @@ -39,7 +39,7 @@ #include "qdiffusemapmaterial.h" #include "qdiffusemapmaterial_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> @@ -73,7 +73,7 @@ QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate() , m_diffuseMapES2RenderPass(new QRenderPass()) , m_diffuseMapGL3Shader(new QShaderProgram()) , m_diffuseMapGL2ES2Shader(new QShaderProgram()) - , m_annotation(new QAnnotation) + , m_filterKey(new QFilterKey) { m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); @@ -116,13 +116,13 @@ void QDiffuseMapMaterialPrivate::init() m_diffuseMapES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); Q_Q(QDiffuseMapMaterial); - m_annotation->setParent(q); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(q); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_diffuseMapGL3Technique->addAnnotation(m_annotation); - m_diffuseMapGL2Technique->addAnnotation(m_annotation); - m_diffuseMapES2Technique->addAnnotation(m_annotation); + m_diffuseMapGL3Technique->addFilterKey(m_filterKey); + m_diffuseMapGL2Technique->addFilterKey(m_filterKey); + m_diffuseMapES2Technique->addFilterKey(m_filterKey); m_diffuseMapGL3RenderPass->setShaderProgram(m_diffuseMapGL3Shader); m_diffuseMapGL2RenderPass->setShaderProgram(m_diffuseMapGL2ES2Shader); diff --git a/src/render/defaults/qdiffusemapmaterial_p.h b/src/render/defaults/qdiffusemapmaterial_p.h index b1ea64ebd..e09dc3657 100644 --- a/src/render/defaults/qdiffusemapmaterial_p.h +++ b/src/render/defaults/qdiffusemapmaterial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QEffect; class QAbstractTextureProvider; class QTechnique; @@ -95,7 +95,7 @@ class QDiffuseMapMaterialPrivate : public QMaterialPrivate QRenderPass *m_diffuseMapES2RenderPass; QShaderProgram *m_diffuseMapGL3Shader; QShaderProgram *m_diffuseMapGL2ES2Shader; - QAnnotation *m_annotation; + QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QDiffuseMapMaterial) }; diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index 75d6c8de2..b1bc840c1 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -39,7 +39,7 @@ #include "qdiffusespecularmapmaterial.h" #include "qdiffusespecularmapmaterial_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> @@ -74,7 +74,7 @@ QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate() , m_diffuseSpecularMapES2RenderPass(new QRenderPass()) , m_diffuseSpecularMapGL3Shader(new QShaderProgram()) , m_diffuseSpecularMapGL2ES2Shader(new QShaderProgram()) - , m_annotation(new QAnnotation) + , m_filterKey(new QFilterKey) { m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); @@ -123,13 +123,13 @@ void QDiffuseSpecularMapMaterialPrivate::init() m_diffuseSpecularMapES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); Q_Q(QDiffuseSpecularMapMaterial); - m_annotation->setParent(q); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(q); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_diffuseSpecularMapGL3Technique->addAnnotation(m_annotation); - m_diffuseSpecularMapGL2Technique->addAnnotation(m_annotation); - m_diffuseSpecularMapES2Technique->addAnnotation(m_annotation); + m_diffuseSpecularMapGL3Technique->addFilterKey(m_filterKey); + m_diffuseSpecularMapGL2Technique->addFilterKey(m_filterKey); + m_diffuseSpecularMapES2Technique->addFilterKey(m_filterKey); m_diffuseSpecularMapGL3RenderPass->setShaderProgram(m_diffuseSpecularMapGL3Shader); m_diffuseSpecularMapGL2RenderPass->setShaderProgram(m_diffuseSpecularMapGL2ES2Shader); diff --git a/src/render/defaults/qdiffusespecularmapmaterial_p.h b/src/render/defaults/qdiffusespecularmapmaterial_p.h index 03f0e3a4b..8a5e617f2 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial_p.h +++ b/src/render/defaults/qdiffusespecularmapmaterial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QEffect; class QAbstractTextureProvider; class QTechnique; @@ -97,7 +97,7 @@ public: QRenderPass *m_diffuseSpecularMapES2RenderPass; QShaderProgram *m_diffuseSpecularMapGL3Shader; QShaderProgram *m_diffuseSpecularMapGL2ES2Shader; - QAnnotation *m_annotation; + QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QDiffuseSpecularMapMaterial) }; diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp index 68cca71b7..96e2478e0 100644 --- a/src/render/defaults/qforwardrenderer.cpp +++ b/src/render/defaults/qforwardrenderer.cpp @@ -43,7 +43,7 @@ #include <Qt3DRender/qviewport.h> #include <Qt3DRender/qcameraselector.h> #include <Qt3DRender/qclearbuffer.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qfrustumculling.h> #include <Qt3DRender/qrendersurfaceselector.h> @@ -75,7 +75,7 @@ void QForwardRendererPrivate::init() m_viewport->setClearColor(Qt::white); m_clearBuffer->setBuffers(QClearBuffer::ColorDepthBuffer); - QAnnotation *forwardRenderingStyle = new QAnnotation(q); + QFilterKey *forwardRenderingStyle = new QFilterKey(q); forwardRenderingStyle->setName(QStringLiteral("renderingStyle")); forwardRenderingStyle->setValue(QStringLiteral("forward")); q->addMatch(forwardRenderingStyle); diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp index b60f6b502..bc7953f9d 100644 --- a/src/render/defaults/qgoochmaterial.cpp +++ b/src/render/defaults/qgoochmaterial.cpp @@ -39,7 +39,7 @@ #include "qgoochmaterial.h" #include "qgoochmaterial_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qgraphicsapifilter.h> #include <Qt3DRender/qparameter.h> @@ -70,7 +70,7 @@ QGoochMaterialPrivate::QGoochMaterialPrivate() , m_es2RenderPass(new QRenderPass) , m_gl3Shader(new QShaderProgram) , m_gl2ES2Shader(new QShaderProgram) - , m_annotation(new QAnnotation) + , m_filterKey(new QFilterKey) { } @@ -113,13 +113,13 @@ void QGoochMaterialPrivate::init() m_es2Technique->graphicsApiFilter()->setMinorVersion(0); m_es2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); - m_annotation->setParent(q); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(q); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_gl3Technique->addAnnotation(m_annotation); - m_gl2Technique->addAnnotation(m_annotation); - m_es2Technique->addAnnotation(m_annotation); + m_gl3Technique->addFilterKey(m_filterKey); + m_gl2Technique->addFilterKey(m_filterKey); + m_es2Technique->addFilterKey(m_filterKey); m_gl3RenderPass->setShaderProgram(m_gl3Shader); m_gl2RenderPass->setShaderProgram(m_gl2ES2Shader); diff --git a/src/render/defaults/qgoochmaterial_p.h b/src/render/defaults/qgoochmaterial_p.h index 244bd5f3e..3dfca1d50 100644 --- a/src/render/defaults/qgoochmaterial_p.h +++ b/src/render/defaults/qgoochmaterial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QEffect; class QRenderPass; class QShaderProgram; @@ -94,7 +94,7 @@ public: QRenderPass *m_es2RenderPass; QShaderProgram *m_gl3Shader; QShaderProgram *m_gl2ES2Shader; - QAnnotation *m_annotation; + QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QGoochMaterial) }; diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp index 9b443ff7c..8a741e702 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp @@ -89,13 +89,13 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init() m_normalDiffuseES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); Q_Q(QNormalDiffuseMapMaterial); - m_annotation->setParent(q); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(q); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_normalDiffuseGL3Technique->addAnnotation(m_annotation); - m_normalDiffuseGL2Technique->addAnnotation(m_annotation); - m_normalDiffuseES2Technique->addAnnotation(m_annotation); + m_normalDiffuseGL3Technique->addFilterKey(m_filterKey); + m_normalDiffuseGL2Technique->addFilterKey(m_filterKey); + m_normalDiffuseES2Technique->addFilterKey(m_filterKey); m_depthTest->setDepthFunction(QDepthTest::Less); diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp index aba34d7b4..3ce95e844 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp @@ -39,7 +39,7 @@ #include "qnormaldiffusemapmaterial.h" #include "qnormaldiffusemapmaterial_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qtechnique.h> @@ -75,7 +75,7 @@ QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate() , m_normalDiffuseES2RenderPass(new QRenderPass()) , m_normalDiffuseGL3Shader(new QShaderProgram()) , m_normalDiffuseGL2ES2Shader(new QShaderProgram()) - , m_annotation(new QAnnotation) + , m_filterKey(new QFilterKey) { m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); @@ -125,13 +125,13 @@ void QNormalDiffuseMapMaterialPrivate::init() m_normalDiffuseES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); Q_Q(QNormalDiffuseMapMaterial); - m_annotation->setParent(q); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(q); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_normalDiffuseGL3Technique->addAnnotation(m_annotation); - m_normalDiffuseGL2Technique->addAnnotation(m_annotation); - m_normalDiffuseES2Technique->addAnnotation(m_annotation); + m_normalDiffuseGL3Technique->addFilterKey(m_filterKey); + m_normalDiffuseGL2Technique->addFilterKey(m_filterKey); + m_normalDiffuseES2Technique->addFilterKey(m_filterKey); m_normalDiffuseGL3RenderPass->setShaderProgram(m_normalDiffuseGL3Shader); m_normalDiffuseGL2RenderPass->setShaderProgram(m_normalDiffuseGL2ES2Shader); diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/render/defaults/qnormaldiffusemapmaterial_p.h index 2d4f00b0b..7bd1d74ad 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial_p.h +++ b/src/render/defaults/qnormaldiffusemapmaterial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QEffect; class QAbstractTextureProvider; class QTechnique; @@ -99,7 +99,7 @@ public: QRenderPass *m_normalDiffuseES2RenderPass; QShaderProgram *m_normalDiffuseGL3Shader; QShaderProgram *m_normalDiffuseGL2ES2Shader; - QAnnotation *m_annotation; + QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QNormalDiffuseMapMaterial) }; diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp index 46ee296d6..6802e58fd 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -39,7 +39,7 @@ #include "qnormaldiffusespecularmapmaterial.h" #include "qnormaldiffusespecularmapmaterial_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> @@ -76,7 +76,7 @@ QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPriva , m_normalDiffuseSpecularES2RenderPass(new QRenderPass()) , m_normalDiffuseSpecularGL3Shader(new QShaderProgram()) , m_normalDiffuseSpecularGL2ES2Shader(new QShaderProgram()) - , m_annotation(new QAnnotation) + , m_filterKey(new QFilterKey) { m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); @@ -132,13 +132,13 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init() m_normalDiffuseSpecularES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); Q_Q(QNormalDiffuseSpecularMapMaterial); - m_annotation->setParent(q); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(q); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_normalDiffuseSpecularGL3Technique->addAnnotation(m_annotation); - m_normalDiffuseSpecularGL2Technique->addAnnotation(m_annotation); - m_normalDiffuseSpecularES2Technique->addAnnotation(m_annotation); + m_normalDiffuseSpecularGL3Technique->addFilterKey(m_filterKey); + m_normalDiffuseSpecularGL2Technique->addFilterKey(m_filterKey); + m_normalDiffuseSpecularES2Technique->addFilterKey(m_filterKey); m_normalDiffuseSpecularGL3RenderPass->setShaderProgram(m_normalDiffuseSpecularGL3Shader); m_normalDiffuseSpecularGL2RenderPass->setShaderProgram(m_normalDiffuseSpecularGL2ES2Shader); diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h index 79d6bbbc8..c13b491a0 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QEffect; class QAbstractTextureProvider; class QTechnique; @@ -100,7 +100,7 @@ public: QRenderPass *m_normalDiffuseSpecularES2RenderPass; QShaderProgram *m_normalDiffuseSpecularGL3Shader; QShaderProgram *m_normalDiffuseSpecularGL2ES2Shader; - QAnnotation *m_annotation; + QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QNormalDiffuseSpecularMapMaterial) }; diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp index edc90d233..6b8db44d9 100644 --- a/src/render/defaults/qpervertexcolormaterial.cpp +++ b/src/render/defaults/qpervertexcolormaterial.cpp @@ -39,7 +39,7 @@ #include "qpervertexcolormaterial.h" #include "qpervertexcolormaterial_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtechnique.h> @@ -66,7 +66,7 @@ QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate() , m_vertexES2RenderPass(new QRenderPass()) , m_vertexGL3Shader(new QShaderProgram()) , m_vertexGL2ES2Shader(new QShaderProgram()) - , m_annotation(new QAnnotation) + , m_filterKey(new QFilterKey) { } @@ -133,13 +133,13 @@ void QPerVertexColorMaterialPrivate::init() m_vertexES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); Q_Q(QPerVertexColorMaterial); - m_annotation->setParent(q); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(q); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_vertexGL3Technique->addAnnotation(m_annotation); - m_vertexGL2Technique->addAnnotation(m_annotation); - m_vertexES2Technique->addAnnotation(m_annotation); + m_vertexGL3Technique->addFilterKey(m_filterKey); + m_vertexGL2Technique->addFilterKey(m_filterKey); + m_vertexES2Technique->addFilterKey(m_filterKey); m_vertexGL3RenderPass->setShaderProgram(m_vertexGL3Shader); m_vertexGL2RenderPass->setShaderProgram(m_vertexGL2ES2Shader); diff --git a/src/render/defaults/qpervertexcolormaterial_p.h b/src/render/defaults/qpervertexcolormaterial_p.h index cfa751004..aa2a68ea9 100644 --- a/src/render/defaults/qpervertexcolormaterial_p.h +++ b/src/render/defaults/qpervertexcolormaterial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QEffect; class QTechnique; class QParameter; @@ -83,7 +83,7 @@ public: QRenderPass *m_vertexES2RenderPass; QShaderProgram *m_vertexGL3Shader; QShaderProgram *m_vertexGL2ES2Shader; - QAnnotation *m_annotation; + QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QPerVertexColorMaterial) }; diff --git a/src/render/defaults/qphongalphamaterial.cpp b/src/render/defaults/qphongalphamaterial.cpp index b92e78ca5..b48a7e7c6 100644 --- a/src/render/defaults/qphongalphamaterial.cpp +++ b/src/render/defaults/qphongalphamaterial.cpp @@ -39,7 +39,7 @@ #include "qphongalphamaterial.h" #include "qphongalphamaterial_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtechnique.h> @@ -77,7 +77,7 @@ QPhongAlphaMaterialPrivate::QPhongAlphaMaterialPrivate() , m_depthMask(new QDepthMask()) , m_blendState(new QBlendEquationArguments()) , m_blendEquation(new QBlendEquation()) - , m_annotation(new QAnnotation) + , m_filterKey(new QFilterKey) { } @@ -116,13 +116,13 @@ void QPhongAlphaMaterialPrivate::init() m_phongAlphaES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); Q_Q(QPhongAlphaMaterial); - m_annotation->setParent(q); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(q); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_phongAlphaGL3Technique->addAnnotation(m_annotation); - m_phongAlphaGL2Technique->addAnnotation(m_annotation); - m_phongAlphaES2Technique->addAnnotation(m_annotation); + m_phongAlphaGL3Technique->addFilterKey(m_filterKey); + m_phongAlphaGL2Technique->addFilterKey(m_filterKey); + m_phongAlphaES2Technique->addFilterKey(m_filterKey); m_depthMask->setMask(false); diff --git a/src/render/defaults/qphongalphamaterial_p.h b/src/render/defaults/qphongalphamaterial_p.h index bf4eaadee..dc3cc729d 100644 --- a/src/render/defaults/qphongalphamaterial_p.h +++ b/src/render/defaults/qphongalphamaterial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QEffect; class QTechnique; class QParameter; @@ -100,7 +100,7 @@ public: QDepthMask *m_depthMask; QBlendEquationArguments *m_blendState; QBlendEquation *m_blendEquation; - QAnnotation *m_annotation; + QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QPhongAlphaMaterial) }; diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp index 652954d95..28dcd390a 100644 --- a/src/render/defaults/qphongmaterial.cpp +++ b/src/render/defaults/qphongmaterial.cpp @@ -39,7 +39,7 @@ #include "qphongmaterial.h" #include "qphongmaterial_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtechnique.h> @@ -70,7 +70,7 @@ QPhongMaterialPrivate::QPhongMaterialPrivate() , m_phongES2RenderPass(new QRenderPass()) , m_phongGL3Shader(new QShaderProgram()) , m_phongGL2ES2Shader(new QShaderProgram()) - , m_annotation(new QAnnotation) + , m_filterKey(new QFilterKey) { } @@ -115,13 +115,13 @@ void QPhongMaterialPrivate::init() m_phongES2Technique->addRenderPass(m_phongES2RenderPass); Q_Q(QPhongMaterial); - m_annotation->setParent(q); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(q); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_phongGL3Technique->addAnnotation(m_annotation); - m_phongGL2Technique->addAnnotation(m_annotation); - m_phongES2Technique->addAnnotation(m_annotation); + m_phongGL3Technique->addFilterKey(m_filterKey); + m_phongGL2Technique->addFilterKey(m_filterKey); + m_phongES2Technique->addFilterKey(m_filterKey); m_phongEffect->addTechnique(m_phongGL3Technique); m_phongEffect->addTechnique(m_phongGL2Technique); diff --git a/src/render/defaults/qphongmaterial_p.h b/src/render/defaults/qphongmaterial_p.h index c7a622584..2e8b35100 100644 --- a/src/render/defaults/qphongmaterial_p.h +++ b/src/render/defaults/qphongmaterial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QEffect; class QTechnique; class QParameter; @@ -92,7 +92,7 @@ public: QRenderPass *m_phongES2RenderPass; QShaderProgram *m_phongGL3Shader; QShaderProgram *m_phongGL2ES2Shader; - QAnnotation *m_annotation; + QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QPhongMaterial) }; diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp index c4397fa53..b208df6b4 100644 --- a/src/render/defaults/qskyboxentity.cpp +++ b/src/render/defaults/qskyboxentity.cpp @@ -41,7 +41,7 @@ #include "qskyboxentity_p.h" #include <Qt3DCore/qtransform.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qmaterial.h> @@ -70,7 +70,7 @@ QSkyboxEntityPrivate::QSkyboxEntityPrivate() , m_gl2Technique(new QTechnique()) , m_es2Technique(new QTechnique()) , m_gl3Technique(new QTechnique()) - , m_annotation(new QAnnotation) + , m_filterKey(new QFilterKey) , m_gl2RenderPass(new QRenderPass()) , m_es2RenderPass(new QRenderPass()) , m_gl3RenderPass(new QRenderPass()) @@ -112,13 +112,13 @@ void QSkyboxEntityPrivate::init() m_es2Technique->graphicsApiFilter()->setMajorVersion(0); m_es2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); - m_annotation->setParent(m_effect); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(m_effect); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_gl3Technique->addAnnotation(m_annotation); - m_gl2Technique->addAnnotation(m_annotation); - m_es2Technique->addAnnotation(m_annotation); + m_gl3Technique->addFilterKey(m_filterKey); + m_gl2Technique->addFilterKey(m_filterKey); + m_es2Technique->addFilterKey(m_filterKey); m_gl3RenderPass->setShaderProgram(m_gl3Shader); m_gl2RenderPass->setShaderProgram(m_gl2es2Shader); diff --git a/src/render/defaults/qskyboxentity_p.h b/src/render/defaults/qskyboxentity_p.h index 7e6e97f0b..f020ac824 100644 --- a/src/render/defaults/qskyboxentity_p.h +++ b/src/render/defaults/qskyboxentity_p.h @@ -62,7 +62,7 @@ class QTransform; namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QTextureCubeMap; class QShaderProgram; class QSkyboxEntity; @@ -91,7 +91,7 @@ class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate QTechnique *m_gl2Technique; QTechnique *m_es2Technique; QTechnique *m_gl3Technique; - QAnnotation *m_annotation; + QFilterKey *m_filterKey; QRenderPass *m_gl2RenderPass; QRenderPass *m_es2RenderPass; QRenderPass *m_gl3RenderPass; diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index 45b293057..15d2e1167 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -41,7 +41,7 @@ #include "qrenderpassfilter_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qparameter.h> QT_BEGIN_NAMESPACE @@ -66,52 +66,52 @@ QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent { } -QList<QAnnotation *> QRenderPassFilter::includes() const +QList<QFilterKey *> QRenderPassFilter::includes() const { Q_D(const QRenderPassFilter); return d->m_includeList; } -void QRenderPassFilter::addInclude(QAnnotation *annotation) +void QRenderPassFilter::addInclude(QFilterKey *keyFilter) { Q_D(QRenderPassFilter); - if (!d->m_includeList.contains(annotation)) { - d->m_includeList.append(annotation); + if (!d->m_includeList.contains(keyFilter)) { + d->m_includeList.append(keyFilter); // We need to add it as a child of the current node if it has been declared inline // Or not previously added as a child of the current node so that // 1) The backend gets notified about it's creation // 2) When the current node is destroyed, it gets destroyed as well - if (!annotation->parent()) - annotation->setParent(this); + if (!keyFilter->parent()) + keyFilter->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); propertyChange->setPropertyName("include"); - propertyChange->setValue(QVariant::fromValue(annotation->id())); + propertyChange->setValue(QVariant::fromValue(keyFilter->id())); d->notifyObservers(propertyChange); } } } -void QRenderPassFilter::removeInclude(QAnnotation *annotation) +void QRenderPassFilter::removeInclude(QFilterKey *filterKey) { Q_D(QRenderPassFilter); if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); propertyChange->setPropertyName("include"); - propertyChange->setValue(QVariant::fromValue(annotation->id())); + propertyChange->setValue(QVariant::fromValue(filterKey->id())); d->notifyObservers(propertyChange); } - d->m_includeList.removeOne(annotation); + d->m_includeList.removeOne(filterKey); } void QRenderPassFilter::copy(const QNode *ref) { QFrameGraphNode::copy(ref); const QRenderPassFilter *other = static_cast<const QRenderPassFilter*>(ref); - for (QAnnotation *c : other->d_func()->m_includeList) - addInclude(qobject_cast<QAnnotation *>(QNode::clone(c))); + Q_FOREACH (QFilterKey *c, other->d_func()->m_includeList) + addInclude(qobject_cast<QFilterKey *>(QNode::clone(c))); for (QParameter *p : other->d_func()->m_parameters) addParameter(qobject_cast<QParameter *>(QNode::clone(p))); } diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index da25821c7..9cac293d4 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { class QRenderPassFilterPrivate; -class QAnnotation; +class QFilterKey; class QParameter; class QT3DRENDERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode @@ -61,9 +61,9 @@ public: explicit QRenderPassFilter(Qt3DCore::QNode *parent = 0); ~QRenderPassFilter(); - QList<QAnnotation *> includes() const; - void addInclude(QAnnotation *criterion); - void removeInclude(QAnnotation *criterion); + QList<QFilterKey*> includes() const; + void addInclude(QFilterKey*keyFilter); + void removeInclude(QFilterKey*criterion); void addParameter(QParameter *p); void removeParameter(QParameter *p); diff --git a/src/render/framegraph/qrenderpassfilter_p.h b/src/render/framegraph/qrenderpassfilter_p.h index 017d4d601..22cc2fd55 100644 --- a/src/render/framegraph/qrenderpassfilter_p.h +++ b/src/render/framegraph/qrenderpassfilter_p.h @@ -68,7 +68,7 @@ public: Q_DECLARE_PUBLIC(QRenderPassFilter) QString m_renderPassName; - QList<QAnnotation *> m_includeList; + QList<QFilterKey *> m_includeList; QList<QParameter *> m_parameters; }; diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index a7d4f32f9..5e538ba91 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -40,7 +40,7 @@ #include "qtechniquefilter.h" #include "qtechniquefilter_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qparameter.h> #include <Qt3DCore/qscenepropertychange.h> @@ -60,8 +60,8 @@ void QTechniqueFilter::copy(const QNode *ref) QFrameGraphNode::copy(ref); const QTechniqueFilter *other = static_cast<const QTechniqueFilter*>(ref); - for (QAnnotation *crit : other->d_func()->m_matchList) - addMatch(qobject_cast<QAnnotation *>(QNode::clone(crit))); + Q_FOREACH (QFilterKey *crit, other->d_func()->m_matchList) + addMatch(qobject_cast<QFilterKey *>(QNode::clone(crit))); for (QParameter *p : other->d_func()->m_parameters) addParameter(qobject_cast<QParameter *>(QNode::clone(p))); } @@ -82,13 +82,13 @@ QTechniqueFilter::QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent) { } -QList<QAnnotation *> QTechniqueFilter::criteria() const +QList<QFilterKey *> QTechniqueFilter::criteria() const { Q_D(const QTechniqueFilter); return d->m_matchList; } -void QTechniqueFilter::addMatch(QAnnotation *criterion) +void QTechniqueFilter::addMatch(QFilterKey *criterion) { Q_D(QTechniqueFilter); if (!d->m_matchList.contains(criterion)) { @@ -110,7 +110,7 @@ void QTechniqueFilter::addMatch(QAnnotation *criterion) } } -void QTechniqueFilter::removeMatch(QAnnotation *criterion) +void QTechniqueFilter::removeMatch(QFilterKey *criterion) { Q_D(QTechniqueFilter); if (d->m_changeArbiter != Q_NULLPTR) { diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h index 808289a62..c965f2362 100644 --- a/src/render/framegraph/qtechniquefilter.h +++ b/src/render/framegraph/qtechniquefilter.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { class QTechniqueFilterPrivate; -class QAnnotation; +class QFilterKey; class QParameter; class QT3DRENDERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode @@ -58,9 +58,9 @@ public: explicit QTechniqueFilter(Qt3DCore::QNode *parent = 0); ~QTechniqueFilter(); - QList<QAnnotation *> criteria() const; - void addMatch(QAnnotation *criterion); - void removeMatch(QAnnotation *criterion); + QList<QFilterKey*> criteria() const; + void addMatch(QFilterKey*criterion); + void removeMatch(QFilterKey*criterion); void addParameter(QParameter *p); void removeParameter(QParameter *p); diff --git a/src/render/framegraph/qtechniquefilter_p.h b/src/render/framegraph/qtechniquefilter_p.h index 89874b72b..42bdbc63e 100644 --- a/src/render/framegraph/qtechniquefilter_p.h +++ b/src/render/framegraph/qtechniquefilter_p.h @@ -65,7 +65,7 @@ public : QTechniqueFilterPrivate(); Q_DECLARE_PUBLIC(QTechniqueFilter) - QList<QAnnotation *> m_matchList; + QList<QFilterKey *> m_matchList; QList<QParameter *> m_parameters; }; diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp index 451f824d3..e125c79da 100644 --- a/src/render/framegraph/renderpassfilternode.cpp +++ b/src/render/framegraph/renderpassfilternode.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "renderpassfilternode_p.h" -#include "qannotation.h" +#include "qfilterkey.h" #include "qrenderpassfilter.h" #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DRender/qparameter.h> @@ -62,7 +62,7 @@ void RenderPassFilter::updateFromPeer(Qt3DCore::QNode *peer) m_parameterPack.clear(); setEnabled(filter->isEnabled()); const auto criteria = filter->includes(); - for (QAnnotation *criterion : criteria) + for (QFilterKey *criterion : criteria) appendFilter(criterion->id()); const auto parameters = filter->parameters(); for (QParameter *p : parameters) diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h index 19c53424f..d1c4e8234 100644 --- a/src/render/framegraph/renderpassfilternode_p.h +++ b/src/render/framegraph/renderpassfilternode_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QRenderPassFilter; template <typename T, uint INDEXBITS> diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp index 6a8d8590c..0d1761ee2 100644 --- a/src/render/framegraph/techniquefilternode.cpp +++ b/src/render/framegraph/techniquefilternode.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "techniquefilternode_p.h" -#include "qannotation.h" +#include "qfilterkey.h" #include "qtechniquefilter.h" #include <Qt3DRender/private/managers_p.h> #include <Qt3DCore/qscenepropertychange.h> @@ -62,7 +62,7 @@ void TechniqueFilter::updateFromPeer(Qt3DCore::QNode *peer) m_filters.clear(); m_parameterPack.clear(); const auto criteria = filter->criteria(); - for (QAnnotation *criterion : criteria) + for (QFilterKey *criterion : criteria) appendFilter(criterion->id()); const auto parameters = filter->parameters(); for (QParameter *p : parameters) diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h index cc16cae91..227a8e429 100644 --- a/src/render/framegraph/techniquefilternode_p.h +++ b/src/render/framegraph/techniquefilternode_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QTechniqueFilter; template <typename T, uint INDEXBITS> diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 21388fe66..7ec2d45d8 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -192,7 +192,7 @@ void QRenderAspectPrivate::registerBackendTypes() q->registerBackendType<QAbstractTextureProvider>(QBackendNodeMapperPtr(new Render::TextureFunctor(m_renderer, m_nodeManagers->textureManager(), m_nodeManagers->textureImageManager(), m_nodeManagers->textureDataManager()))); q->registerBackendType<QShaderProgram>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::Shader, Render::ShaderManager>(m_renderer, m_nodeManagers->shaderManager()))); q->registerBackendType<QEffect>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::Effect, Render::EffectManager>(m_renderer, m_nodeManagers->effectManager()))); - q->registerBackendType<QAnnotation>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::Annotation, Render::CriterionManager>(m_renderer, m_nodeManagers->criterionManager()))); + q->registerBackendType<QFilterKey>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::Annotation, Render::CriterionManager>(m_renderer, m_nodeManagers->criterionManager()))); q->registerBackendType<Qt3DRender::QCameraLens>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::CameraLens, Render::CameraManager>(m_renderer, m_nodeManagers->cameraManager()))); q->registerBackendType<QLayer>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::Layer, Render::LayerManager>(m_renderer, m_nodeManagers->layerManager()))); q->registerBackendType<QRenderPass>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::RenderPass, Render::RenderPassManager>(m_renderer, m_nodeManagers->renderPassManager()))); diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp index b02813e85..0ef7f41cc 100644 --- a/src/render/jobs/renderviewjobutils.cpp +++ b/src/render/jobs/renderviewjobutils.cpp @@ -276,7 +276,7 @@ Technique *findTechniqueForEffect(Renderer *renderer, // There is a technique filter so we need to check for a technique with suitable criteria. // Check for early bail out if the technique doesn't have sufficient number of criteria and // can therefore never satisfy the filter - if (technique->annotations().size() < techniqueFilter->filters().size()) + if (technique->filterKeys().size() < techniqueFilter->filters().size()) continue; // Iterate through the filter criteria and for each one search for a criteria on the @@ -285,7 +285,7 @@ Technique *findTechniqueForEffect(Renderer *renderer, foundMatch = false; Annotation *filterAnnotation = manager->criterionManager()->lookupResource(filterAnnotationId); - Q_FOREACH (QNodeId techniqueAnnotationId, technique->annotations()) { + Q_FOREACH (QNodeId techniqueAnnotationId, technique->filterKeys()) { Annotation *techniqueAnnotation = manager->criterionManager()->lookupResource(techniqueAnnotationId); if ((foundMatch = (*techniqueAnnotation == *filterAnnotation))) break; @@ -324,14 +324,14 @@ RenderRenderPassList findRenderPassesForTechnique(NodeManagers *manager, bool foundMatch = (!passFilter || passFilter->filters().size() == 0); // A pass filter is present so we need to check for matching criteria - if (!foundMatch && renderPass->annotations().size() >= passFilter->filters().size()) { + if (!foundMatch && renderPass->filterKeys().size() >= passFilter->filters().size()) { // Iterate through the filter criteria and look for render passes with criteria that satisfy them Q_FOREACH (QNodeId filterAnnotationId, passFilter->filters()) { foundMatch = false; Annotation *filterAnnotation = manager->criterionManager()->lookupResource(filterAnnotationId); - Q_FOREACH (QNodeId passAnnotationId, renderPass->annotations()) { + Q_FOREACH (QNodeId passAnnotationId, renderPass->filterKeys()) { Annotation *passAnnotation = manager->criterionManager()->lookupResource(passAnnotationId); if ((foundMatch = (*passAnnotation == *filterAnnotation))) break; diff --git a/src/render/materialsystem/annotation.cpp b/src/render/materialsystem/annotation.cpp index 60796e94d..1e5a9e76b 100644 --- a/src/render/materialsystem/annotation.cpp +++ b/src/render/materialsystem/annotation.cpp @@ -63,7 +63,7 @@ void Annotation::cleanup() void Annotation::updateFromPeer(Qt3DCore::QNode *peer) { - QAnnotation *criterion = static_cast<QAnnotation *>(peer); + QFilterKey *criterion = static_cast<QFilterKey *>(peer); m_value = criterion->value(); m_name = criterion->name(); diff --git a/src/render/materialsystem/annotation_p.h b/src/render/materialsystem/annotation_p.h index 79c473372..7679785cf 100644 --- a/src/render/materialsystem/annotation_p.h +++ b/src/render/materialsystem/annotation_p.h @@ -52,13 +52,13 @@ // #include <Qt3DRender/private/backendnode_p.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; namespace Render { diff --git a/src/render/materialsystem/materialsystem.pri b/src/render/materialsystem/materialsystem.pri index 06b2caaae..6c169228f 100644 --- a/src/render/materialsystem/materialsystem.pri +++ b/src/render/materialsystem/materialsystem.pri @@ -5,8 +5,8 @@ HEADERS += \ $$PWD/effect_p.h \ $$PWD/material_p.h \ $$PWD/parameter_p.h \ - $$PWD/qannotation.h \ - $$PWD/qannotation_p.h \ + $$PWD/qfilterkey.h \ + $$PWD/qfilterkey_p.h \ $$PWD/qeffect.h \ $$PWD/qeffect_p.h \ $$PWD/qmaterial.h \ @@ -32,7 +32,7 @@ SOURCES += \ $$PWD/effect.cpp \ $$PWD/material.cpp \ $$PWD/parameter.cpp \ - $$PWD/qannotation.cpp \ + $$PWD/qfilterkey.cpp \ $$PWD/qeffect.cpp \ $$PWD/qmaterial.cpp \ $$PWD/qparameter.cpp \ diff --git a/src/render/materialsystem/qannotation.cpp b/src/render/materialsystem/qfilterkey.cpp index e3ffd148b..93f48b493 100644 --- a/src/render/materialsystem/qannotation.cpp +++ b/src/render/materialsystem/qfilterkey.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "qannotation.h" -#include "qannotation_p.h" +#include "qfilterkey.h" +#include "qfilterkey_p.h" #include <private/qnode_p.h> #include <Qt3DCore/qscenepropertychange.h> @@ -47,21 +47,21 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -QAnnotationPrivate::QAnnotationPrivate() +QFilterKeyPrivate::QFilterKeyPrivate() : QNodePrivate() { } /*! - \class Qt3DRender::QAnnotation + \class Qt3DRender::QFilterKey \inmodule Qt3DRender \since 5.5 - \brief The QAnnotation class provides ... + \brief The QFilterKey class provides ... */ /*! \qmltype Annotation - \instantiates Qt3DRender::QAnnotation + \instantiates Qt3DRender::QFilterKey \inherits Node \inqmlmodule Qt3D.Render \since 5.5 @@ -71,10 +71,10 @@ QAnnotationPrivate::QAnnotationPrivate() /*! Copies the annotation in \a ref into this annotation. */ -void QAnnotation::copy(const QNode *ref) +void QFilterKey::copy(const QNode *ref) { QNode::copy(ref); - const QAnnotation *criterion = static_cast<const QAnnotation*>(ref); + const QFilterKey *criterion = static_cast<const QFilterKey*>(ref); d_func()->m_name = criterion->d_func()->m_name; d_func()->m_value = criterion->d_func()->m_value; } @@ -82,28 +82,28 @@ void QAnnotation::copy(const QNode *ref) /*! The constructor creats a new annotation under \a parent. */ -QAnnotation::QAnnotation(QNode *parent) - : QNode(*new QAnnotationPrivate, parent) +QFilterKey::QFilterKey(QNode *parent) + : QNode(*new QFilterKeyPrivate, parent) { } -QAnnotation::~QAnnotation() +QFilterKey::~QFilterKey() { QNode::cleanup(); } -void QAnnotation::setValue(const QVariant &value) +void QFilterKey::setValue(const QVariant &value) { - Q_D(QAnnotation); + Q_D(QFilterKey); if (value != d->m_value) { d->m_value = value; emit valueChanged(value); } } -void QAnnotation::setName(const QString &name) +void QFilterKey::setName(const QString &name) { - Q_D(QAnnotation); + Q_D(QFilterKey); if (name != d->m_name) { d->m_name = name; emit nameChanged(name); @@ -111,7 +111,7 @@ void QAnnotation::setName(const QString &name) } /*! - \property QAnnotation::value + \property QFilterKey::value */ @@ -119,14 +119,14 @@ void QAnnotation::setName(const QString &name) \qmlproperty variant Qt3D.Render::Annotation::value */ -QVariant QAnnotation::value() const +QVariant QFilterKey::value() const { - Q_D(const QAnnotation); + Q_D(const QFilterKey); return d->m_value; } /*! - \property QAnnotation::name + \property QFilterKey::name */ @@ -134,9 +134,9 @@ QVariant QAnnotation::value() const \qmlproperty string Qt3D.Render::Annotation::name */ -QString QAnnotation::name() const +QString QFilterKey::name() const { - Q_D(const QAnnotation); + Q_D(const QFilterKey); return d->m_name; } diff --git a/src/render/materialsystem/qannotation.h b/src/render/materialsystem/qfilterkey.h index ce31bcadc..44427ddf2 100644 --- a/src/render/materialsystem/qannotation.h +++ b/src/render/materialsystem/qfilterkey.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QANNOTATION_H -#define QT3DRENDER_QANNOTATION_H +#ifndef QT3DRENDER_QFILTERKEY_H +#define QT3DRENDER_QFILTERKEY_H #include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qnode.h> @@ -48,16 +48,16 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotationPrivate; +class QFilterKeyPrivate; -class QT3DRENDERSHARED_EXPORT QAnnotation : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QFilterKey : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) public: - explicit QAnnotation(Qt3DCore::QNode *parent = 0); - ~QAnnotation(); + explicit QFilterKey(Qt3DCore::QNode *parent = 0); + ~QFilterKey(); QVariant value() const; QString name() const; @@ -74,12 +74,12 @@ protected: void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: - Q_DECLARE_PRIVATE(QAnnotation) - QT3D_CLONEABLE(QAnnotation) + Q_DECLARE_PRIVATE(QFilterKey) + QT3D_CLONEABLE(QFilterKey) }; } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_QANNOTATION_H +#endif // QT3DRENDER_QFILTERKEY_H diff --git a/src/render/materialsystem/qannotation_p.h b/src/render/materialsystem/qfilterkey_p.h index 20f337e31..87c22a056 100644 --- a/src/render/materialsystem/qannotation_p.h +++ b/src/render/materialsystem/qfilterkey_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QANNOTATION_P_H -#define QT3DRENDER_QANNOTATION_P_H +#ifndef QT3DRENDER_QFILTERKEY_P_H +#define QT3DRENDER_QFILTERKEY_P_H // // W A R N I N G @@ -52,18 +52,18 @@ // #include <Qt3DCore/private/qnode_p.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotationPrivate : public Qt3DCore::QNodePrivate +class QFilterKeyPrivate : public Qt3DCore::QNodePrivate { public: - QAnnotationPrivate(); + QFilterKeyPrivate(); - Q_DECLARE_PUBLIC(QAnnotation) + Q_DECLARE_PUBLIC(QFilterKey) QString m_name; QVariant m_value; }; @@ -72,4 +72,4 @@ public: QT_END_NAMESPACE -#endif // QT3DRENDER_QANNOTATION_P_H +#endif // QT3DRENDER_QFILTERKEY_P_H diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp index 5efbafb19..5f6226f71 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -41,7 +41,7 @@ #include "qrenderpass.h" #include "qrenderpass_p.h" #include "qparameter.h" -#include "qannotation.h" +#include "qfilterkey.h" #include "qscenepropertychange.h" #include "qrenderstate.h" #include "private/qnode_p.h" @@ -64,8 +64,8 @@ void QRenderPass::copy(const QNode *ref) const QRenderPass *other = static_cast<const QRenderPass*>(ref); d_func()->m_shader = qobject_cast<QShaderProgram *>(QNode::clone(other->d_func()->m_shader)); - Q_FOREACH (QAnnotation *crit, other->d_func()->m_annotationList) - addAnnotation(qobject_cast<QAnnotation *>(QNode::clone(crit))); + Q_FOREACH (QFilterKey *crit, other->d_func()->m_filterKeyList) + addFilterKey(qobject_cast<QFilterKey *>(QNode::clone(crit))); Q_FOREACH (QRenderState *renderState, other->d_func()->m_renderStates) addRenderState(qobject_cast<QRenderState *>(QNode::clone(renderState))); Q_FOREACH (QParameter *p, other->d_func()->m_parameters) @@ -142,44 +142,44 @@ QShaderProgram *QRenderPass::shaderProgram() const return d->m_shader; } -void QRenderPass::addAnnotation(QAnnotation *annotation) +void QRenderPass::addFilterKey(QFilterKey *filterKey) { Q_D(QRenderPass); - if (!d->m_annotationList.contains(annotation)) { - d->m_annotationList.append(annotation); + if (!d->m_filterKeyList.contains(filterKey)) { + d->m_filterKeyList.append(filterKey); // We need to add it as a child of the current node if it has been declared inline // Or not previously added as a child of the current node so that // 1) The backend gets notified about it's creation // 2) When the current node is destroyed, it gets destroyed as well - if (!annotation->parent()) - annotation->setParent(this); + if (!filterKey->parent()) + filterKey->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); - change->setPropertyName("annotation"); - change->setValue(QVariant::fromValue(annotation->id())); + change->setPropertyName("filterKeys"); + change->setValue(QVariant::fromValue(filterKey->id())); d->notifyObservers(change); } } } -void QRenderPass::removeAnnotation(QAnnotation *annotation) +void QRenderPass::removeFilterKey(QFilterKey *filterKey) { Q_D(QRenderPass); if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); - change->setPropertyName("annotation"); - change->setValue(QVariant::fromValue(annotation->id())); + change->setPropertyName("filterKeys"); + change->setValue(QVariant::fromValue(filterKey->id())); d->notifyObservers(change); } - d->m_annotationList.removeOne(annotation); + d->m_filterKeyList.removeOne(filterKey); } -QList<QAnnotation *> QRenderPass::annotations() const +QList<QFilterKey *> QRenderPass::filterKeys() const { Q_D(const QRenderPass); - return d->m_annotationList; + return d->m_filterKeyList; } /*! diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index 9f6ea329c..d1f82d7a2 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -45,7 +45,7 @@ #include <Qt3DRender/qshaderprogram.h> #include <Qt3DRender/qrenderstate.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <QHash> #include <QList> @@ -77,9 +77,9 @@ public: QShaderProgram *shaderProgram() const; - void addAnnotation(QAnnotation *criterion); - void removeAnnotation(QAnnotation *criterion); - QList<QAnnotation *> annotations() const; + void addFilterKey(QFilterKey*filterKey); + void removeFilterKey(QFilterKey*filterKey); + QList<QFilterKey*> filterKeys() const; void addRenderState(QRenderState *state); void removeRenderState(QRenderState *state); diff --git a/src/render/materialsystem/qrenderpass_p.h b/src/render/materialsystem/qrenderpass_p.h index f3442ff9f..e7ecbada2 100644 --- a/src/render/materialsystem/qrenderpass_p.h +++ b/src/render/materialsystem/qrenderpass_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { class QParameter; class QParameterMapping; class QRenderState; -class QAnnotation; +class QFilterKey; typedef QList<QParameter*> ParameterList; namespace Render @@ -81,7 +81,7 @@ public: // map Parameter names to GLSL names QHash<QString, QString> m_parameterNameDict; - QList<QAnnotation *> m_annotationList; + QList<QFilterKey *> m_filterKeyList; QList<QParameterMapping *> m_bindings; QList<QRenderState *> m_renderStates; QList<QParameter *> m_parameters; diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index a070a9211..855ae827d 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -85,8 +85,8 @@ void QTechnique::copy(const QNode *ref) const QTechnique *tech = static_cast<const QTechnique*>(ref); d_func()->m_graphicsApiFilter.copy(tech->d_func()->m_graphicsApiFilter); - Q_FOREACH (QAnnotation *annotation, tech->d_func()->m_filterKeys) - addAnnotation(qobject_cast<QAnnotation *>(QNode::clone(annotation))); + Q_FOREACH (QFilterKey *annotation, tech->d_func()->m_filterKeys) + addFilterKey(qobject_cast<QFilterKey *>(QNode::clone(annotation))); Q_FOREACH (QRenderPass *pass, tech->d_func()->m_renderPasses) addRenderPass(qobject_cast<QRenderPass *>(QNode::clone(pass))); Q_FOREACH (QParameter *p, tech->d_func()->m_parameters) @@ -105,7 +105,7 @@ void QTechniquePrivate::_q_graphicsApiFilterChanged() } } -void QTechnique::addAnnotation(QAnnotation *criterion) +void QTechnique::addFilterKey(QFilterKey *criterion) { Q_D(QTechnique); if (!d->m_filterKeys.contains(criterion)) { @@ -127,7 +127,7 @@ void QTechnique::addAnnotation(QAnnotation *criterion) } } -void QTechnique::removeAnnotation(QAnnotation *criterion) +void QTechnique::removeFilterKey(QFilterKey *criterion) { Q_D(QTechnique); if (d->m_changeArbiter != Q_NULLPTR) { @@ -139,7 +139,7 @@ void QTechnique::removeAnnotation(QAnnotation *criterion) d->m_filterKeys.removeOne(criterion); } -QList<QAnnotation *> QTechnique::filterKeys() const +QList<QFilterKey *> QTechnique::filterKeys() const { Q_D(const QTechnique); return d->m_filterKeys; diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index 9a2b9dd9f..26bb3d115 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -43,7 +43,7 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qnode.h> #include <Qt3DRender/qrenderpass.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <QList> #include <QSharedPointer> @@ -64,9 +64,9 @@ public: explicit QTechnique(Qt3DCore::QNode *parent = 0); ~QTechnique(); - void addAnnotation(QAnnotation *criterion); - void removeAnnotation(QAnnotation *criterion); - QList<QAnnotation *> filterKeys() const; + void addFilterKey(QFilterKey*criterion); + void removeFilterKey(QFilterKey*criterion); + QList<QFilterKey*> filterKeys() const; void addParameter(QParameter *p); void removeParameter(QParameter *p); diff --git a/src/render/materialsystem/qtechnique_p.h b/src/render/materialsystem/qtechnique_p.h index 8ebda829b..9a91f16c5 100644 --- a/src/render/materialsystem/qtechnique_p.h +++ b/src/render/materialsystem/qtechnique_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { class QTechnique; -class QAnnotation; +class QFilterKey; class QParameter; class QRenderPass; @@ -70,7 +70,7 @@ public: ~QTechniquePrivate(); Q_DECLARE_PUBLIC(QTechnique) - QList<QAnnotation *> m_filterKeys; + QList<QFilterKey *> m_filterKeys; QList<QParameter *> m_parameters; QList<QRenderPass*> m_renderPasses; QGraphicsApiFilter m_graphicsApiFilter; diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp index 4a585f2cc..00827f8e1 100644 --- a/src/render/materialsystem/renderpass.cpp +++ b/src/render/materialsystem/renderpass.cpp @@ -79,7 +79,7 @@ void RenderPass::updateFromPeer(Qt3DCore::QNode *peer) m_shaderUuid = pass->shaderProgram()->id(); // The RenderPass clones frontend bindings in case the frontend ever removes them // TO DO: We probably need a QParameterMapper manager - Q_FOREACH (QAnnotation *c, pass->annotations()) + Q_FOREACH (QFilterKey *c, pass->filterKeys()) appendAnnotation(c->id()); Q_FOREACH (QRenderState *renderState, pass->renderStates()) appendRenderState(renderState->id()); @@ -93,7 +93,7 @@ void RenderPass::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) switch (e->type()) { case NodeAdded: { - if (propertyChange->propertyName() == QByteArrayLiteral("annotation")) { + if (propertyChange->propertyName() == QByteArrayLiteral("filterKeys")) { appendAnnotation(propertyChange->value().value<QNodeId>()); } else if (propertyChange->propertyName() == QByteArrayLiteral("shaderProgram")) { m_shaderUuid = propertyChange->value().value<QNodeId>(); @@ -107,7 +107,7 @@ void RenderPass::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } case NodeRemoved: { - if (propertyChange->propertyName() == QByteArrayLiteral("annotation")) { + if (propertyChange->propertyName() == QByteArrayLiteral("filterKeys")) { removeAnnotation(propertyChange->value().value<QNodeId>()); } else if (propertyChange->propertyName() == QByteArrayLiteral("shaderProgram")) { m_shaderUuid = QNodeId(); @@ -130,9 +130,9 @@ Qt3DCore::QNodeId RenderPass::shaderProgram() const return m_shaderUuid; } -QVector<Qt3DCore::QNodeId> RenderPass::annotations() const +QVector<Qt3DCore::QNodeId> RenderPass::filterKeys() const { - return m_annotationList; + return m_filterKeyList; } QVector<Qt3DCore::QNodeId> RenderPass::parameters() const @@ -142,13 +142,13 @@ QVector<Qt3DCore::QNodeId> RenderPass::parameters() const void RenderPass::appendAnnotation(Qt3DCore::QNodeId annotationId) { - if (!m_annotationList.contains(annotationId)) - m_annotationList.append(annotationId); + if (!m_filterKeyList.contains(annotationId)) + m_filterKeyList.append(annotationId); } void RenderPass::removeAnnotation(Qt3DCore::QNodeId annotationId) { - m_annotationList.removeOne(annotationId); + m_filterKeyList.removeOne(annotationId); } } // namespace Render diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h index 001bc744f..b1c159ce7 100644 --- a/src/render/materialsystem/renderpass_p.h +++ b/src/render/materialsystem/renderpass_p.h @@ -65,7 +65,7 @@ namespace Qt3DRender { class QRenderPass; class QAbstractShader; class QParameterMapping; -class QAnnotation; +class QFilterKey; class QRenderState; namespace Render { @@ -85,7 +85,7 @@ public: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; Qt3DCore::QNodeId shaderProgram() const; - QVector<Qt3DCore::QNodeId> annotations() const; + QVector<Qt3DCore::QNodeId> filterKeys() const; QVector<Qt3DCore::QNodeId> parameters() const; private: @@ -93,7 +93,7 @@ private: void removeAnnotation(Qt3DCore::QNodeId criterionId); Qt3DCore::QNodeId m_shaderUuid; - QVector<Qt3DCore::QNodeId> m_annotationList; + QVector<Qt3DCore::QNodeId> m_filterKeyList; ParameterPack m_parameterPack; }; diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp index 78913ed2f..b78aa25ec 100644 --- a/src/render/materialsystem/technique.cpp +++ b/src/render/materialsystem/technique.cpp @@ -76,14 +76,14 @@ void Technique::cleanup() m_graphicsApiFilter = Q_NULLPTR; m_parameterPack.clear(); m_renderPasses.clear(); - m_annotationList.clear(); + m_filterKeyList.clear(); } void Technique::updateFromPeer(Qt3DCore::QNode *peer) { m_parameterPack.clear(); m_renderPasses.clear(); - m_annotationList.clear(); + m_filterKeyList.clear(); if (m_graphicsApiFilter == Q_NULLPTR) m_graphicsApiFilter = new QGraphicsApiFilter(); @@ -95,8 +95,8 @@ void Technique::updateFromPeer(Qt3DCore::QNode *peer) m_parameterPack.appendParameter(p->id()); Q_FOREACH (QRenderPass *rPass, technique->renderPasses()) appendRenderPass(rPass->id()); - Q_FOREACH (QAnnotation *annotation, technique->filterKeys()) - appendAnnotation(annotation->id()); + Q_FOREACH (QFilterKey *filterKey, technique->filterKeys()) + appendFilterKey(filterKey->id()); // Copy GraphicsApiFilter info from frontend GraphicsApiFilter QGraphicsApiFilter *peerFilter = technique->graphicsApiFilter(); @@ -127,8 +127,8 @@ void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) else if (propertyChange->propertyName() == QByteArrayLiteral("parameter")) { m_parameterPack.appendParameter(propertyChange->value().value<QNodeId>()); } - else if (propertyChange->propertyName() == QByteArrayLiteral("annotation")) { - appendAnnotation(propertyChange->value().value<QNodeId>()); + else if (propertyChange->propertyName() == QByteArrayLiteral("filterKeys")) { + appendFilterKey(propertyChange->value().value<QNodeId>()); } break; } @@ -140,8 +140,8 @@ void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) else if (propertyChange->propertyName() == QByteArrayLiteral("parameter")) { m_parameterPack.removeParameter(propertyChange->value().value<QNodeId>()); } - else if (propertyChange->propertyName() == QByteArrayLiteral("annotation")) { - removeAnnotation(propertyChange->value().value<QNodeId>()); + else if (propertyChange->propertyName() == QByteArrayLiteral("filterKeys")) { + removeFilterKey(propertyChange->value().value<QNodeId>()); } break; } @@ -168,9 +168,9 @@ void Technique::removeRenderPass(Qt3DCore::QNodeId renderPassId) m_renderPasses.removeOne(renderPassId); } -QVector<Qt3DCore::QNodeId> Technique::annotations() const +QVector<Qt3DCore::QNodeId> Technique:: filterKeys() const { - return m_annotationList; + return m_filterKeyList; } QVector<Qt3DCore::QNodeId> Technique::renderPasses() const @@ -183,15 +183,15 @@ QGraphicsApiFilter *Technique::graphicsApiFilter() const return m_graphicsApiFilter; } -void Technique::appendAnnotation(Qt3DCore::QNodeId criterionId) +void Technique::appendFilterKey(Qt3DCore::QNodeId criterionId) { - if (!m_annotationList.contains(criterionId)) - m_annotationList.append(criterionId); + if (!m_filterKeyList.contains(criterionId)) + m_filterKeyList.append(criterionId); } -void Technique::removeAnnotation(Qt3DCore::QNodeId criterionId) +void Technique::removeFilterKey(Qt3DCore::QNodeId criterionId) { - m_annotationList.removeOne(criterionId); + m_filterKeyList.removeOne(criterionId); } } // namespace Render diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h index f0c09711a..f057cb6e6 100644 --- a/src/render/materialsystem/technique_p.h +++ b/src/render/materialsystem/technique_p.h @@ -54,7 +54,7 @@ #include <Qt3DRender/private/backendnode_p.h> #include <Qt3DRender/private/parameterpack_p.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <QVector> #include <QStringList> @@ -65,7 +65,7 @@ namespace Qt3DRender { class QTechnique; class QParameter; class QGraphicsApiFilter; -class QAnnotation; +class QFilterKey; class QRenderPass; namespace Render { @@ -87,10 +87,10 @@ public: void appendRenderPass(Qt3DCore::QNodeId renderPassId); void removeRenderPass(Qt3DCore::QNodeId renderPassId); - void appendAnnotation(Qt3DCore::QNodeId criterionId); - void removeAnnotation(Qt3DCore::QNodeId criterionId); + void appendFilterKey(Qt3DCore::QNodeId criterionId); + void removeFilterKey(Qt3DCore::QNodeId criterionId); - QVector<Qt3DCore::QNodeId> annotations() const; + QVector<Qt3DCore::QNodeId> filterKeys() const; QVector<Qt3DCore::QNodeId> renderPasses() const; QGraphicsApiFilter *graphicsApiFilter() const; @@ -98,7 +98,7 @@ private: QGraphicsApiFilter *m_graphicsApiFilter; ParameterPack m_parameterPack; - QVector<Qt3DCore::QNodeId> m_annotationList; + QVector<Qt3DCore::QNodeId> m_filterKeyList; QVector<Qt3DCore::QNodeId> m_renderPasses; }; |