diff options
| -rw-r--r-- | src/render/backend/handle_types_p.h | 4 | ||||
| -rw-r--r-- | src/render/backend/jobs/renderviewjobutils.cpp | 2 | ||||
| -rw-r--r-- | src/render/backend/managers_p.h | 4 | ||||
| -rw-r--r-- | src/render/backend/parameter.cpp (renamed from src/render/backend/renderparameter.cpp) | 18 | ||||
| -rw-r--r-- | src/render/backend/parameter_p.h (renamed from src/render/backend/renderparameter_p.h) | 10 | ||||
| -rw-r--r-- | src/render/backend/qrenderaspect.cpp | 2 | ||||
| -rw-r--r-- | src/render/backend/render-backend.pri | 8 |
7 files changed, 24 insertions, 24 deletions
diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h index 3d471e68a..393c64824 100644 --- a/src/render/backend/handle_types_p.h +++ b/src/render/backend/handle_types_p.h @@ -66,7 +66,7 @@ class RenderTexture; class RenderTransform; class RenderTarget; class RenderRenderPass; -class RenderParameter; +class Parameter; class RenderShaderData; class RenderTextureImage; class Buffer; @@ -93,7 +93,7 @@ typedef Qt3D::QHandle<RenderTransform, 16> HTransform; typedef Qt3D::QHandle<RenderTarget, 8> HTarget; typedef Qt3D::QHandle<RenderRenderPass, 16> HRenderPass; typedef Qt3D::QHandle<TexImageData, 16> HTextureData; -typedef Qt3D::QHandle<RenderParameter, 16> HParameter; +typedef Qt3D::QHandle<Parameter, 16> HParameter; typedef Qt3D::QHandle<RenderShaderData, 16> HShaderData; typedef Qt3D::QHandle<RenderTextureImage, 16> HTextureImage; typedef Qt3D::QHandle<Buffer, 16> HBuffer; diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp index 7ed58ce5b..8cd8c91d0 100644 --- a/src/render/backend/jobs/renderviewjobutils.cpp +++ b/src/render/backend/jobs/renderviewjobutils.cpp @@ -327,7 +327,7 @@ void addParametersForIds(ParameterInfoList *params, ParameterManager *manager, const QList<Qt3D::QNodeId> ¶meterIds) { Q_FOREACH (const QNodeId ¶mId, parameterIds) { - RenderParameter *param = manager->lookupResource(paramId); + Parameter *param = manager->lookupResource(paramId); if (param != Q_NULLPTR) { ParameterInfoList::iterator it = std::lower_bound(params->begin(), params->end(), param->name()); if (it == params->end() || it->name != param->name()) diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index 27676f879..aaa30f0ee 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -52,7 +52,7 @@ #include <Qt3DRenderer/private/rendertransform_p.h> #include <Qt3DRenderer/private/rendertarget_p.h> #include <Qt3DRenderer/private/renderrenderpass_p.h> -#include <Qt3DRenderer/private/renderparameter_p.h> +#include <Qt3DRenderer/private/parameter_p.h> #include <Qt3DRenderer/private/rendershaderdata_p.h> #include <Qt3DRenderer/private/handle_types_p.h> #include <Qt3DRenderer/private/uniformbuffer_p.h> @@ -242,7 +242,7 @@ public: class ParameterManager : public Qt3D::QResourceManager< - RenderParameter, + Parameter, Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, diff --git a/src/render/backend/renderparameter.cpp b/src/render/backend/parameter.cpp index 85d9e0980..47830c826 100644 --- a/src/render/backend/renderparameter.cpp +++ b/src/render/backend/parameter.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "renderparameter_p.h" +#include "parameter_p.h" #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DRenderer/qparameter.h> #include <Qt3DRenderer/qtexture.h> @@ -49,21 +49,21 @@ using namespace Qt3D; namespace Qt3DRender { namespace Render { -RenderParameter::RenderParameter() +Parameter::Parameter() : QBackendNode() , m_shaderDataManager(Q_NULLPTR) , m_textureManager(Q_NULLPTR) { } -void RenderParameter::updateFromPeer(Qt3D::QNode *mat) +void Parameter::updateFromPeer(Qt3D::QNode *mat) { QParameter *param = static_cast<QParameter *>(mat); m_name = param->name(); m_value = toBackendValue(param->value()); } -void RenderParameter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Parameter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -75,27 +75,27 @@ void RenderParameter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -QString RenderParameter::name() const +QString Parameter::name() const { return m_name; } -QVariant RenderParameter::value() const +QVariant Parameter::value() const { return m_value; } -void RenderParameter::setShaderDataManager(ShaderDataManager *shaderDataManager) +void Parameter::setShaderDataManager(ShaderDataManager *shaderDataManager) { m_shaderDataManager = shaderDataManager; } -void RenderParameter::setTextureManager(TextureManager *textureManager) +void Parameter::setTextureManager(TextureManager *textureManager) { m_textureManager = textureManager; } -QVariant RenderParameter::toBackendValue(const QVariant &value) +QVariant Parameter::toBackendValue(const QVariant &value) { QNode *node = value.value<QNode *>(); diff --git a/src/render/backend/renderparameter_p.h b/src/render/backend/parameter_p.h index b071b41a6..4ea1cea37 100644 --- a/src/render/backend/renderparameter_p.h +++ b/src/render/backend/parameter_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERPARAMETER_P_H -#define QT3DRENDER_RENDER_RENDERPARAMETER_P_H +#ifndef QT3DRENDER_RENDER_PARAMETER_P_H +#define QT3DRENDER_RENDER_PARAMETER_P_H #include <Qt3DCore/qbackendnode.h> #include <QVariant> @@ -50,10 +50,10 @@ class ParameterManager; class ShaderDataManager; class TextureManager; -class RenderParameter : public Qt3D::QBackendNode +class Parameter : public Qt3D::QBackendNode { public: - RenderParameter(); + Parameter(); void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE; void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; @@ -80,4 +80,4 @@ private: QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERPARAMETER_P_H +#endif // QT3DRENDER_RENDER_PARAMETER_P_H diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp index 4e0ef5812..4c1e9337b 100644 --- a/src/render/backend/qrenderaspect.cpp +++ b/src/render/backend/qrenderaspect.cpp @@ -226,7 +226,7 @@ void QRenderAspect::registerBackendTypes() registerBackendType<QSortMethod>(QBackendNodeFunctorPtr(new Render::FrameGraphNodeFunctor<Render::SortMethod, QSortMethod>(d->m_renderer->frameGraphManager()))); registerBackendType<QFrameGraphSelector>(QBackendNodeFunctorPtr(new Render::FrameGraphNodeFunctor<Render::FrameGraphSubtreeSelector, QFrameGraphSelector>(d->m_renderer->frameGraphManager()))); registerBackendType<QFrameGraph>(QBackendNodeFunctorPtr(new Render::FrameGraphComponentFunctor(d->m_renderer))); - registerBackendType<QParameter>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::RenderParameter, Render::ParameterManager>(d->m_renderer->parameterManager()))); + registerBackendType<QParameter>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Parameter, Render::ParameterManager>(d->m_renderer->parameterManager()))); registerBackendType<QShaderData>(QBackendNodeFunctorPtr(new Render::RenderShaderDataFunctor(d->m_renderer->shaderDataManager()))); registerBackendType<QAbstractTextureImage>(QBackendNodeFunctorPtr(new Render::RenderTextureImageFunctor(d->m_renderer->textureManager(), d->m_renderer->textureImageManager(), d->m_renderer->textureDataManager()))); registerBackendType<QStateSet>(QBackendNodeFunctorPtr(new Render::FrameGraphNodeFunctor<Render::StateSetNode, QStateSet>(d->m_renderer->frameGraphManager()))); diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri index eec70df8a..1c96e938c 100644 --- a/src/render/backend/render-backend.pri +++ b/src/render/backend/render-backend.pri @@ -39,7 +39,6 @@ HEADERS += \ $$PWD/qgraphicsutils_p.h \ $$PWD/managers_p.h \ $$PWD/handle_types_p.h \ - $$PWD/renderparameter_p.h \ $$PWD/platformsurfacefilter_p.h \ $$PWD/rendershaderdata_p.h \ $$PWD/renderparametermapping_p.h \ @@ -60,7 +59,8 @@ HEADERS += \ $$PWD/geometryrenderer_p.h \ $$PWD/layer_p.h \ $$PWD/material_p.h \ - $$PWD/nodefunctor_p.h + $$PWD/nodefunctor_p.h \ + $$PWD/parameter_p.h SOURCES += \ $$PWD/qrenderaspect.cpp \ @@ -91,7 +91,6 @@ SOURCES += \ $$PWD/renderscene.cpp \ $$PWD/scenemanager.cpp \ $$PWD/attachmentpack.cpp \ - $$PWD/renderparameter.cpp \ $$PWD/platformsurfacefilter.cpp \ $$PWD/rendershaderdata.cpp \ $$PWD/renderparametermapping.cpp \ @@ -109,4 +108,5 @@ SOURCES += \ $$PWD/geometry.cpp \ $$PWD/geometryrenderer.cpp \ $$PWD/layer.cpp \ - $$PWD/material.cpp + $$PWD/material.cpp \ + $$PWD/parameter.cpp |