diff options
Diffstat (limited to 'src/render/backend')
22 files changed, 132 insertions, 132 deletions
diff --git a/src/render/backend/attachmentpack_p.h b/src/render/backend/attachmentpack_p.h index cbf96cc99..317e86ae9 100644 --- a/src/render/backend/attachmentpack_p.h +++ b/src/render/backend/attachmentpack_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qrenderattachment.h> +#include <Qt3DRender/qrenderattachment.h> #include <QVector> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp index 72a392277..d2b72656e 100644 --- a/src/render/backend/cameralens.cpp +++ b/src/render/backend/cameralens.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "cameralens_p.h" -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qcameralens.h> diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index a0f8d4c98..aca931217 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -35,17 +35,17 @@ ****************************************************************************/ #include "entity_p.h" -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/qabstractlight.h> -#include <Qt3DRenderer/qlayer.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/sphere.h> -#include <Qt3DRenderer/qshaderdata.h> -#include <Qt3DRenderer/qgeometryrenderer.h> -#include <Qt3DRenderer/private/geometryrenderermanager_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/qabstractlight.h> +#include <Qt3DRender/qlayer.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/sphere.h> +#include <Qt3DRender/qshaderdata.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/private/geometryrenderermanager_p.h> #include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qentity.h> diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h index 74c8e1b51..a127c8f45 100644 --- a/src/render/backend/entity_p.h +++ b/src/render/backend/entity_p.h @@ -49,8 +49,8 @@ // We mean it. // -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/handle_types_p.h> #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> #include <Qt3DCore/qhandle.h> diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h index 2e7b23f42..ec558d3a7 100644 --- a/src/render/backend/handle_types_p.h +++ b/src/render/backend/handle_types_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qhandle.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/layer_p.h b/src/render/backend/layer_p.h index d75e7164c..23351e5f9 100644 --- a/src/render/backend/layer_p.h +++ b/src/render/backend/layer_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qbackendnode.h> #include <QStringList> diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index 1c4e9d86e..5baada03d 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -49,27 +49,27 @@ // #include <Qt3DCore/private/qresourcemanager_p.h> -#include <Qt3DRenderer/private/renderattachment_p.h> -#include <Qt3DRenderer/private/cameralens_p.h> -#include <Qt3DRenderer/private/annotation_p.h> -#include <Qt3DRenderer/private/effect_p.h> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/private/layer_p.h> -#include <Qt3DRenderer/private/material_p.h> -#include <Qt3DRenderer/private/shader_p.h> -#include <Qt3DRenderer/private/sortcriterion_p.h> -#include <Qt3DRenderer/private/technique_p.h> -#include <Qt3DRenderer/private/texture_p.h> -#include <Qt3DRenderer/private/transform_p.h> -#include <Qt3DRenderer/private/rendertarget_p.h> -#include <Qt3DRenderer/private/renderpass_p.h> -#include <Qt3DRenderer/private/parameter_p.h> -#include <Qt3DRenderer/private/shaderdata_p.h> -#include <Qt3DRenderer/private/handle_types_p.h> -#include <Qt3DRenderer/private/uniformbuffer_p.h> -#include <Qt3DRenderer/private/textureimage_p.h> -#include <Qt3DRenderer/private/attribute_p.h> -#include <Qt3DRenderer/private/geometry_p.h> +#include <Qt3DRender/private/renderattachment_p.h> +#include <Qt3DRender/private/cameralens_p.h> +#include <Qt3DRender/private/annotation_p.h> +#include <Qt3DRender/private/effect_p.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/private/layer_p.h> +#include <Qt3DRender/private/material_p.h> +#include <Qt3DRender/private/shader_p.h> +#include <Qt3DRender/private/sortcriterion_p.h> +#include <Qt3DRender/private/technique_p.h> +#include <Qt3DRender/private/texture_p.h> +#include <Qt3DRender/private/transform_p.h> +#include <Qt3DRender/private/rendertarget_p.h> +#include <Qt3DRender/private/renderpass_p.h> +#include <Qt3DRender/private/parameter_p.h> +#include <Qt3DRender/private/shaderdata_p.h> +#include <Qt3DRender/private/handle_types_p.h> +#include <Qt3DRender/private/uniformbuffer_p.h> +#include <Qt3DRender/private/textureimage_p.h> +#include <Qt3DRender/private/attribute_p.h> +#include <Qt3DRender/private/geometry_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/platformsurfacefilter.cpp b/src/render/backend/platformsurfacefilter.cpp index fec56ee3e..6e7e1a21c 100644 --- a/src/render/backend/platformsurfacefilter.cpp +++ b/src/render/backend/platformsurfacefilter.cpp @@ -36,7 +36,7 @@ #include "platformsurfacefilter_p.h" -#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRender/private/renderer_p.h> #include <QMetaObject> #include <QPlatformSurfaceEvent> diff --git a/src/render/backend/qgraphicsutils_p.h b/src/render/backend/qgraphicsutils_p.h index f705d4ae4..7b88a7691 100644 --- a/src/render/backend/qgraphicsutils_p.h +++ b/src/render/backend/qgraphicsutils_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/private/shadervariables_p.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/private/shadervariables_p.h> #include <QMatrix2x2> #include <QMatrix3x3> #include <QMatrix4x4> diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp index df25fb466..00fea7011 100644 --- a/src/render/backend/quniformvalue.cpp +++ b/src/render/backend/quniformvalue.cpp @@ -36,8 +36,8 @@ #include "quniformvalue_p.h" -#include <Qt3DRenderer/private/graphicscontext_p.h> -#include <Qt3DRenderer/private/texture_p.h> +#include <Qt3DRender/private/graphicscontext_p.h> +#include <Qt3DRender/private/texture_p.h> #include <Qt3DCore/qframeallocator.h> @@ -45,7 +45,7 @@ #include <QDebug> #include <QColor> #include <QQuaternion> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h index 51bb2fc29..9f0381200 100644 --- a/src/render/backend/quniformvalue_p.h +++ b/src/render/backend/quniformvalue_p.h @@ -53,9 +53,9 @@ #include <QVector> #include <QOpenGLShaderProgram> #include <Qt3DCore/qnodeid.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> -#include <Qt3DRenderer/private/shadervariables_p.h> +#include <Qt3DRender/private/shadervariables_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderattachment.cpp b/src/render/backend/renderattachment.cpp index 92436a217..231a19254 100644 --- a/src/render/backend/renderattachment.cpp +++ b/src/render/backend/renderattachment.cpp @@ -34,9 +34,9 @@ ** ****************************************************************************/ -#include <Qt3DRenderer/private/renderattachment_p.h> +#include <Qt3DRender/private/renderattachment_p.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qtexture.h> +#include <Qt3DRender/qtexture.h> #include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderattachment_p.h b/src/render/backend/renderattachment_p.h index d2c4487c0..9b6c5f8bf 100644 --- a/src/render/backend/renderattachment_p.h +++ b/src/render/backend/renderattachment_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/qrenderattachment.h> -#include <Qt3DRenderer/private/attachmentpack_p.h> +#include <Qt3DRender/qrenderattachment.h> +#include <Qt3DRender/private/attachmentpack_p.h> #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> diff --git a/src/render/backend/rendercommand.cpp b/src/render/backend/rendercommand.cpp index 8f748ac27..a3e971fd2 100644 --- a/src/render/backend/rendercommand.cpp +++ b/src/render/backend/rendercommand.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "rendercommand_p.h" -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DRender/qsortcriterion.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendercommand_p.h b/src/render/backend/rendercommand_p.h index f2a18226c..4c0abe0eb 100644 --- a/src/render/backend/rendercommand_p.h +++ b/src/render/backend/rendercommand_p.h @@ -50,8 +50,8 @@ // #include <qglobal.h> -#include <Qt3DRenderer/private/quniformvalue_p.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/private/quniformvalue_p.h> +#include <Qt3DRender/private/handle_types_p.h> #include <QOpenGLShaderProgram> #include <QOpenGLTexture> #include <QMatrix4x4> diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 651f7c323..859f24dbf 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -40,42 +40,42 @@ #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qparametermapping.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qeffect.h> - -#include <Qt3DRenderer/private/renderviewjob_p.h> -#include <Qt3DRenderer/private/renderstates_p.h> -#include <Qt3DRenderer/private/cameraselectornode_p.h> -#include <Qt3DRenderer/private/framegraphvisitor_p.h> -#include <Qt3DRenderer/private/graphicscontext_p.h> -#include <Qt3DRenderer/private/cameralens_p.h> -#include <Qt3DRenderer/private/rendercommand_p.h> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/private/material_p.h> -#include <Qt3DRenderer/private/renderpassfilternode_p.h> -#include <Qt3DRenderer/private/renderqueue_p.h> -#include <Qt3DRenderer/private/shader_p.h> -#include <Qt3DRenderer/private/renderstateset_p.h> -#include <Qt3DRenderer/private/technique_p.h> -#include <Qt3DRenderer/private/renderthread_p.h> -#include <Qt3DRenderer/private/renderview_p.h> -#include <Qt3DRenderer/private/techniquefilternode_p.h> -#include <Qt3DRenderer/private/texturedatamanager_p.h> -#include <Qt3DRenderer/private/scenemanager_p.h> -#include <Qt3DRenderer/private/viewportnode_p.h> -#include <Qt3DRenderer/private/abstractsceneparser_p.h> -#include <Qt3DRenderer/private/vsyncframeadvanceservice_p.h> -#include <Qt3DRenderer/private/buffermanager_p.h> -#include <Qt3DRenderer/private/loadbufferjob_p.h> -#include <Qt3DRenderer/private/loadgeometryjob_p.h> -#include <Qt3DRenderer/private/geometryrenderermanager_p.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qparametermapping.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qeffect.h> + +#include <Qt3DRender/private/renderviewjob_p.h> +#include <Qt3DRender/private/renderstates_p.h> +#include <Qt3DRender/private/cameraselectornode_p.h> +#include <Qt3DRender/private/framegraphvisitor_p.h> +#include <Qt3DRender/private/graphicscontext_p.h> +#include <Qt3DRender/private/cameralens_p.h> +#include <Qt3DRender/private/rendercommand_p.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/private/material_p.h> +#include <Qt3DRender/private/renderpassfilternode_p.h> +#include <Qt3DRender/private/renderqueue_p.h> +#include <Qt3DRender/private/shader_p.h> +#include <Qt3DRender/private/renderstateset_p.h> +#include <Qt3DRender/private/technique_p.h> +#include <Qt3DRender/private/renderthread_p.h> +#include <Qt3DRender/private/renderview_p.h> +#include <Qt3DRender/private/techniquefilternode_p.h> +#include <Qt3DRender/private/texturedatamanager_p.h> +#include <Qt3DRender/private/scenemanager_p.h> +#include <Qt3DRender/private/viewportnode_p.h> +#include <Qt3DRender/private/abstractsceneparser_p.h> +#include <Qt3DRender/private/vsyncframeadvanceservice_p.h> +#include <Qt3DRender/private/buffermanager_p.h> +#include <Qt3DRender/private/loadbufferjob_p.h> +#include <Qt3DRender/private/loadgeometryjob_p.h> +#include <Qt3DRender/private/geometryrenderermanager_p.h> #include <Qt3DCore/qcameralens.h> #include <Qt3DCore/private/qaspectmanager_p.h> diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h index f272de2ed..21749b69a 100644 --- a/src/render/backend/renderer_p.h +++ b/src/render/backend/renderer_p.h @@ -49,10 +49,10 @@ // We mean it. // -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/private/quniformvalue_p.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/private/quniformvalue_p.h> +#include <Qt3DRender/private/handle_types_p.h> #include <Qt3DCore/qaspectjob.h> #include <QHash> diff --git a/src/render/backend/renderqueue.cpp b/src/render/backend/renderqueue.cpp index 1cdb8f96f..fd68b1bc0 100644 --- a/src/render/backend/renderqueue.cpp +++ b/src/render/backend/renderqueue.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "renderqueue_p.h" -#include <Qt3DRenderer/private/renderview_p.h> +#include <Qt3DRender/private/renderview_p.h> #include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index dc528349c..44570449e 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -34,10 +34,10 @@ ** ****************************************************************************/ -#include <Qt3DRenderer/private/rendertarget_p.h> +#include <Qt3DRender/private/rendertarget_p.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qrendertarget.h> -#include <Qt3DRenderer/qrenderattachment.h> +#include <Qt3DRender/qrendertarget.h> +#include <Qt3DRender/qrenderattachment.h> #include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderthread.cpp b/src/render/backend/renderthread.cpp index e899d0057..5738fc0ec 100644 --- a/src/render/backend/renderthread.cpp +++ b/src/render/backend/renderthread.cpp @@ -35,10 +35,10 @@ ****************************************************************************/ #include "renderthread_p.h" -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/renderview_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/renderview_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <QEventLoop> #include <QTime> #include <QMutexLocker> diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index 8583aed99..f509f645c 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -36,30 +36,30 @@ ****************************************************************************/ #include "renderview_p.h" -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qrendertarget.h> -#include <Qt3DRenderer/sphere.h> - -#include <Qt3DRenderer/private/cameraselectornode_p.h> -#include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/private/layerfilternode_p.h> -#include <Qt3DRenderer/private/qparameter_p.h> -#include <Qt3DRenderer/private/cameralens_p.h> -#include <Qt3DRenderer/private/rendercommand_p.h> -#include <Qt3DRenderer/private/effect_p.h> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/layer_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/private/renderpassfilternode_p.h> -#include <Qt3DRenderer/private/renderpass_p.h> -#include <Qt3DRenderer/private/geometryrenderer_p.h> -#include <Qt3DRenderer/private/renderstateset_p.h> -#include <Qt3DRenderer/private/techniquefilternode_p.h> -#include <Qt3DRenderer/private/viewportnode_p.h> - -#include <Qt3DRenderer/qparametermapping.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qrendertarget.h> +#include <Qt3DRender/sphere.h> + +#include <Qt3DRender/private/cameraselectornode_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> +#include <Qt3DRender/private/layerfilternode_p.h> +#include <Qt3DRender/private/qparameter_p.h> +#include <Qt3DRender/private/cameralens_p.h> +#include <Qt3DRender/private/rendercommand_p.h> +#include <Qt3DRender/private/effect_p.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/layer_p.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/private/renderpassfilternode_p.h> +#include <Qt3DRender/private/renderpass_p.h> +#include <Qt3DRender/private/geometryrenderer_p.h> +#include <Qt3DRender/private/renderstateset_p.h> +#include <Qt3DRender/private/techniquefilternode_p.h> +#include <Qt3DRender/private/viewportnode_p.h> + +#include <Qt3DRender/qparametermapping.h> #include <Qt3DCore/qentity.h> diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h index 6cf7a308c..67bed52a3 100644 --- a/src/render/backend/renderview_p.h +++ b/src/render/backend/renderview_p.h @@ -49,18 +49,18 @@ // We mean it. // -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qclearbuffer.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/cameralens_p.h> -#include <Qt3DRenderer/private/attachmentpack_p.h> -#include <Qt3DRenderer/private/handle_types_p.h> -#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qclearbuffer.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/cameralens_p.h> +#include <Qt3DRender/private/attachmentpack_p.h> +#include <Qt3DRender/private/handle_types_p.h> +#include <Qt3DRender/qparameter.h> #include <Qt3DCore/qframeallocator.h> // TODO: Move out once this is all refactored -#include <Qt3DRenderer/private/renderviewjobutils_p.h> +#include <Qt3DRender/private/renderviewjobutils_p.h> #include <QVector> #include <QMutex> |