diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-08-17 15:23:10 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-08-17 23:15:54 +0200 |
| commit | 3aac7a0f18a33cc8acf76ac9e25c0cd320105174 (patch) | |
| tree | bf37dec586cf43eff601bfb4b9f580afec475bb0 /src/render | |
| parent | 47f2c2044887edaeed39025437411fddddcae423 (diff) | |
Mark backend render classes as private and fix compilation
Change-Id: I1afb8408e03d4b5405e8ee82d1a3b6b4364d3f5d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render')
123 files changed, 431 insertions, 481 deletions
diff --git a/src/render/backend/cameramanager.cpp b/src/render/backend/cameramanager.cpp index 53f39fd0c..8985a8bc1 100644 --- a/src/render/backend/cameramanager.cpp +++ b/src/render/backend/cameramanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "cameramanager.h" +#include "cameramanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/cameramanager.h b/src/render/backend/cameramanager_p.h index af349d611..f6f6bf12d 100644 --- a/src/render/backend/cameramanager.h +++ b/src/render/backend/cameramanager_p.h @@ -45,7 +45,7 @@ #include <QtGlobal> #include <Qt3DCore/qresourcesmanager.h> #include <QUuid> -#include <Qt3DRenderer/rendercameralens.h> +#include <Qt3DRenderer/private/rendercameralens_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/criterionmanager.cpp b/src/render/backend/criterionmanager.cpp index b4767418a..321b248a4 100644 --- a/src/render/backend/criterionmanager.cpp +++ b/src/render/backend/criterionmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "criterionmanager.h" +#include "criterionmanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/criterionmanager.h b/src/render/backend/criterionmanager_p.h index 920c25cdd..9a69d6871 100644 --- a/src/render/backend/criterionmanager.h +++ b/src/render/backend/criterionmanager_p.h @@ -43,7 +43,7 @@ #define QT3D_RENDER_CRITERIONMANAGER_H #include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/rendercriterion.h> +#include <Qt3DRenderer/private/rendercriterion_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/effectmanager.cpp b/src/render/backend/effectmanager.cpp index f867d2384..d554e214d 100644 --- a/src/render/backend/effectmanager.cpp +++ b/src/render/backend/effectmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "effectmanager.h" +#include "effectmanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/effectmanager.h b/src/render/backend/effectmanager_p.h index 925bdd675..c057564cd 100644 --- a/src/render/backend/effectmanager.h +++ b/src/render/backend/effectmanager_p.h @@ -43,7 +43,7 @@ #define QT3D_RENDER_EFFECTMANAGER_H #include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/rendereffect.h> +#include <Qt3DRenderer/private/rendereffect_p.h> #include <Qt3DCore/qresourcesmanager.h> #include <QUuid> diff --git a/src/render/backend/entitymanager.cpp b/src/render/backend/entitymanager.cpp index 2f6cd34bc..faf1a04c7 100644 --- a/src/render/backend/entitymanager.cpp +++ b/src/render/backend/entitymanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "entitymanager.h" +#include "entitymanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/entitymanager.h b/src/render/backend/entitymanager_p.h index 139088507..4b062cbc5 100644 --- a/src/render/backend/entitymanager.h +++ b/src/render/backend/entitymanager_p.h @@ -46,7 +46,7 @@ #include <QUuid> #include <Qt3DCore/qabstractrenderpass.h> #include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/renderentity.h> +#include <Qt3DRenderer/private/renderentity_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraph/cameraselectornode.cpp b/src/render/backend/framegraph/cameraselectornode.cpp index 428aaf2e8..9fafe3875 100644 --- a/src/render/backend/framegraph/cameraselectornode.cpp +++ b/src/render/backend/framegraph/cameraselectornode.cpp @@ -41,7 +41,7 @@ #include "cameraselectornode.h" #include <Qt3DRenderer/qcameraselector.h> -#include <Qt3DRenderer/renderer.h> +#include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/rendereraspect.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qchangearbiter.h> diff --git a/src/render/backend/framegraph/framegraphnode.cpp b/src/render/backend/framegraph/framegraphnode.cpp index f91b22c2b..c8ef4cbcb 100644 --- a/src/render/backend/framegraph/framegraphnode.cpp +++ b/src/render/backend/framegraph/framegraphnode.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "framegraphnode.h" -#include "renderer.h" -#include "framegraphmanager.h" +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/framegraphmanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraph/framegraphvisitor.cpp b/src/render/backend/framegraph/framegraphvisitor.cpp index 0d774ffce..16c274d02 100644 --- a/src/render/backend/framegraph/framegraphvisitor.cpp +++ b/src/render/backend/framegraph/framegraphvisitor.cpp @@ -42,7 +42,7 @@ #include "framegraphvisitor.h" #include "framegraphnode.h" -#include "renderer.h" +#include <Qt3DRenderer/private/renderer_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraph/layerfilternode.cpp b/src/render/backend/framegraph/layerfilternode.cpp index 948288802..30b2e509b 100644 --- a/src/render/backend/framegraph/layerfilternode.cpp +++ b/src/render/backend/framegraph/layerfilternode.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "layerfilternode.h" -#include "renderer.h" +#include <Qt3DRenderer/private/renderer_p.h> #include "rendereraspect.h" #include "qlayerfilter.h" #include <Qt3DCore/qchangearbiter.h> diff --git a/src/render/backend/framegraph/renderpassfilternode.cpp b/src/render/backend/framegraph/renderpassfilternode.cpp index a383bb626..9b398fab2 100644 --- a/src/render/backend/framegraph/renderpassfilternode.cpp +++ b/src/render/backend/framegraph/renderpassfilternode.cpp @@ -41,8 +41,8 @@ #include "renderpassfilternode.h" #include "rendereraspect.h" -#include "renderer.h" -#include "criterionmanager.h" +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/criterionmanager_p.h> #include "qcriterion.h" #include "qrenderpassfilter.h" #include <Qt3DCore/qaspectmanager.h> diff --git a/src/render/backend/framegraph/techniquefilternode.cpp b/src/render/backend/framegraph/techniquefilternode.cpp index 090b03d82..6bfbc5d4b 100644 --- a/src/render/backend/framegraph/techniquefilternode.cpp +++ b/src/render/backend/framegraph/techniquefilternode.cpp @@ -42,9 +42,9 @@ #include "techniquefilternode.h" #include "qcriterion.h" #include "qtechniquefilter.h" -#include "renderer.h" #include "rendereraspect.h" -#include "criterionmanager.h" +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/criterionmanager_p.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qchangearbiter.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/backend/framegraph/viewportnode.cpp b/src/render/backend/framegraph/viewportnode.cpp index 362b93c84..875614232 100644 --- a/src/render/backend/framegraph/viewportnode.cpp +++ b/src/render/backend/framegraph/viewportnode.cpp @@ -41,7 +41,7 @@ #include "viewportnode.h" -#include <Qt3DRenderer/renderer.h> +#include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/rendereraspect.h> #include <Qt3DRenderer/qviewport.h> diff --git a/src/render/backend/framegraphmanager.cpp b/src/render/backend/framegraphmanager.cpp index fe23caf22..ee48fc679 100644 --- a/src/render/backend/framegraphmanager.cpp +++ b/src/render/backend/framegraphmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "framegraphmanager.h" +#include "framegraphmanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraphmanager.h b/src/render/backend/framegraphmanager_p.h index f3ce7be3e..f3ce7be3e 100644 --- a/src/render/backend/framegraphmanager.h +++ b/src/render/backend/framegraphmanager_p.h diff --git a/src/render/backend/genericstate.h b/src/render/backend/genericstate_p.h index 340f289cf..70de6db45 100644 --- a/src/render/backend/genericstate.h +++ b/src/render/backend/genericstate_p.h @@ -45,7 +45,7 @@ #include <QList> -#include <Qt3DRenderer/renderstate.h> +#include <Qt3DRenderer/private/renderstate_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/jobs/loadmeshdatajob.cpp b/src/render/backend/jobs/loadmeshdatajob.cpp index 596e58675..9ff2ac9ae 100644 --- a/src/render/backend/jobs/loadmeshdatajob.cpp +++ b/src/render/backend/jobs/loadmeshdatajob.cpp @@ -42,12 +42,12 @@ #include "loadmeshdatajob.h" #include <objloader.h> -#include <sphere.h> -#include <qmesh.h> -#include <renderer.h> -#include <meshdatamanager.h> -#include <meshmanager.h> #include <qattribute.h> +#include <qmesh.h> +#include <sphere.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/meshdatamanager_p.h> +#include <Qt3DRenderer/private/meshmanager_p.h> #include <QThread> #include "renderlogging.h" diff --git a/src/render/backend/jobs/renderviewjob.cpp b/src/render/backend/jobs/renderviewjob.cpp index c803afb46..eebb79b52 100644 --- a/src/render/backend/jobs/renderviewjob.cpp +++ b/src/render/backend/jobs/renderviewjob.cpp @@ -41,8 +41,8 @@ #include "renderviewjob.h" -#include <renderview.h> -#include <renderer.h> +#include <Qt3DRenderer/private/renderview_p.h> +#include <Qt3DRenderer/private/renderer_p.h> #include "renderlogging.h" diff --git a/src/render/backend/jobs/updateboundingvolumejob.cpp b/src/render/backend/jobs/updateboundingvolumejob.cpp index 8f3a88fce..6ce3b953d 100644 --- a/src/render/backend/jobs/updateboundingvolumejob.cpp +++ b/src/render/backend/jobs/updateboundingvolumejob.cpp @@ -41,7 +41,8 @@ #include "updateboundingvolumejob.h" -#include <renderentity.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/renderentity_p.h> #include <sphere.h> #include "renderlogging.h" diff --git a/src/render/backend/jobs/updateworldtransformjob.cpp b/src/render/backend/jobs/updateworldtransformjob.cpp index f5dd32b00..ebf52d8f0 100644 --- a/src/render/backend/jobs/updateworldtransformjob.cpp +++ b/src/render/backend/jobs/updateworldtransformjob.cpp @@ -41,10 +41,10 @@ #include "updateworldtransformjob.h" -#include <renderer.h> -#include <renderentity.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/renderentity_p.h> #include <sphere.h> -#include <rendertransform.h> +#include <Qt3DRenderer/private/rendertransform_p.h> #include "renderlogging.h" #include <QThread> diff --git a/src/render/backend/layermanager.cpp b/src/render/backend/layermanager.cpp index 5b5209d40..2d771e3c8 100644 --- a/src/render/backend/layermanager.cpp +++ b/src/render/backend/layermanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "layermanager.h" +#include "layermanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/layermanager.h b/src/render/backend/layermanager_p.h index 8db4329c8..3cb001eed 100644 --- a/src/render/backend/layermanager.h +++ b/src/render/backend/layermanager_p.h @@ -43,7 +43,7 @@ #define QT3D_RENDER_LAYERMANAGER_H #include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/renderlayer.h> +#include <Qt3DRenderer/private/renderlayer_p.h> #include <QUuid> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/lightmanager.cpp b/src/render/backend/lightmanager.cpp index d46756bfb..d2ddabbf3 100644 --- a/src/render/backend/lightmanager.cpp +++ b/src/render/backend/lightmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "lightmanager.h" +#include "lightmanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/lightmanager.h b/src/render/backend/lightmanager_p.h index 37efda282..3a1c271df 100644 --- a/src/render/backend/lightmanager.h +++ b/src/render/backend/lightmanager_p.h @@ -43,7 +43,7 @@ #define QT3D_RENDER_LIGHTMANAGER_H #include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/renderlight.h> +#include <Qt3DRenderer/private/renderlight_p.h> #include <QUuid> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/materialmanager.cpp b/src/render/backend/materialmanager.cpp index 906f75aa8..253a41275 100644 --- a/src/render/backend/materialmanager.cpp +++ b/src/render/backend/materialmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "materialmanager.h" +#include "materialmanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/materialmanager.h b/src/render/backend/materialmanager_p.h index 0b2ed2b85..99d77d2b0 100644 --- a/src/render/backend/materialmanager.h +++ b/src/render/backend/materialmanager_p.h @@ -45,7 +45,7 @@ #include <QtGlobal> #include <QUuid> #include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/rendermaterial.h> +#include <Qt3DRenderer/private/rendermaterial_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/matrixmanager.cpp b/src/render/backend/matrixmanager.cpp index eb46b145e..afd813015 100644 --- a/src/render/backend/matrixmanager.cpp +++ b/src/render/backend/matrixmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "matrixmanager.h" +#include "matrixmanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/matrixmanager.h b/src/render/backend/matrixmanager_p.h index f8a79ca64..f8a79ca64 100644 --- a/src/render/backend/matrixmanager.h +++ b/src/render/backend/matrixmanager_p.h diff --git a/src/render/backend/meshdatamanager.cpp b/src/render/backend/meshdatamanager.cpp index 4c3e8c2a5..af53b47e1 100644 --- a/src/render/backend/meshdatamanager.cpp +++ b/src/render/backend/meshdatamanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "meshdatamanager.h" +#include "meshdatamanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/meshdatamanager.h b/src/render/backend/meshdatamanager_p.h index a52984e55..b7e2bb21f 100644 --- a/src/render/backend/meshdatamanager.h +++ b/src/render/backend/meshdatamanager_p.h @@ -45,7 +45,7 @@ #include <Qt3DCore/qabstractmesh.h> #include <Qt3DCore/qresourcesmanager.h> #include <Qt3DRenderer/meshdata.h> -#include <Qt3DRenderer/rendermesh.h> +#include <Qt3DRenderer/private/rendermesh_p.h> #include <QHash> #include <QPair> diff --git a/src/render/backend/meshmanager.cpp b/src/render/backend/meshmanager.cpp index 410b1c226..c5c8c59ae 100644 --- a/src/render/backend/meshmanager.cpp +++ b/src/render/backend/meshmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "meshmanager.h" +#include "meshmanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/meshmanager.h b/src/render/backend/meshmanager_p.h index 9db8c1a9e..f2566b0ca 100644 --- a/src/render/backend/meshmanager.h +++ b/src/render/backend/meshmanager_p.h @@ -43,8 +43,8 @@ #define QT3D_RENDER_MESHMANAGER_H #include <Qt3DCore/qhandle.h> -#include <Qt3DRenderer/rendermesh.h> #include <Qt3DCore/qresourcesmanager.h> +#include <Qt3DRenderer/private/rendermesh_p.h> #include <QUuid> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/parameterpack.cpp b/src/render/backend/parameterpack.cpp index d8b481c44..258c56d0d 100644 --- a/src/render/backend/parameterpack.cpp +++ b/src/render/backend/parameterpack.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "parameterpack.h" -#include "qparameter.h" -#include "rendereraspect.h" -#include "renderer.h" +#include "parameterpack_p.h" +#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRenderer/rendereraspect.h> +#include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/backend/parameterpack.h b/src/render/backend/parameterpack_p.h index b375728e6..b375728e6 100644 --- a/src/render/backend/parameterpack.h +++ b/src/render/backend/parameterpack_p.h diff --git a/src/render/backend/qgraphicscontext.cpp b/src/render/backend/qgraphicscontext.cpp index 711552507..3f0fd790b 100644 --- a/src/render/backend/qgraphicscontext.cpp +++ b/src/render/backend/qgraphicscontext.cpp @@ -40,29 +40,29 @@ ** ****************************************************************************/ -#include "qgraphicscontext.h" - -#include "rendershader.h" -#include "rendermaterial.h" -#include "rendertexture.h" -#include "rendercommand.h" -#include "qparameter.h" -#include "renderstate.h" -#include "qgraphicshelperinterface.h" -#include "qopenglfilter.h" -#include "renderer.h" -#include "texturemanager.h" -#include "renderlogging.h" +#include "qgraphicscontext_p.h" + +#include <Qt3DRenderer/qopenglfilter.h> +#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRenderer/renderlogging.h> +#include <Qt3DRenderer/private/rendershader_p.h> +#include <Qt3DRenderer/private/rendermaterial_p.h> +#include <Qt3DRenderer/private/rendertexture_p.h> +#include <Qt3DRenderer/private/rendercommand_p.h> +#include <Qt3DRenderer/private/renderstate_p.h> +#include <Qt3DRenderer/private/qgraphicshelperinterface_p.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/texturemanager_p.h> #include <QOpenGLShaderProgram> #if !defined(QT_OPENGL_ES_2) #include <QOpenGLFunctions_2_0> #include <QOpenGLFunctions_3_2_Core> -#include "qgraphicshelpergl2.h" -#include "qgraphicshelpergl3.h" +#include <Qt3DRenderer/private/qgraphicshelpergl2_p.h> +#include <Qt3DRenderer/private/qgraphicshelpergl3_p.h> #else #include <QOpenGLFunctions_ES2> -#include "qgraphicshelperes2.h" +#include <Qt3DRenderer/private/qgraphicshelperes2_p.h> #endif #include <QSurface> diff --git a/src/render/backend/qgraphicscontext.h b/src/render/backend/qgraphicscontext_p.h index eafd669cb..ccd01eaba 100644 --- a/src/render/backend/qgraphicscontext.h +++ b/src/render/backend/qgraphicscontext_p.h @@ -50,8 +50,8 @@ #include <QColor> #include <QMatrix4x4> #include <QBitArray> -#include <Qt3DRenderer/quniformvalue.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/private/quniformvalue_p.h> +#include <Qt3DRenderer/private/meshdata_p.h> #include <Qt3DRenderer/qattribute.h> #include <Qt3DRenderer/qbuffer.h> diff --git a/src/render/backend/qgraphicshelperes2.cpp b/src/render/backend/qgraphicshelperes2.cpp index bad0647d1..3462a2bd5 100644 --- a/src/render/backend/qgraphicshelperes2.cpp +++ b/src/render/backend/qgraphicshelperes2.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qgraphicshelperes2.h" +#include "qgraphicshelperes2_p.h" #include "qopenglfunctions_es2.h" #include "renderlogging.h" diff --git a/src/render/backend/qgraphicshelperes2.h b/src/render/backend/qgraphicshelperes2_p.h index 507162f5d..a66f5b0e8 100644 --- a/src/render/backend/qgraphicshelperes2.h +++ b/src/render/backend/qgraphicshelperes2_p.h @@ -42,7 +42,7 @@ #ifndef QT3D_RENDER_QGRAPHICSHELPERES2_H #define QT3D_RENDER_QGRAPHICSHELPERES2_H -#include <Qt3DRenderer/qgraphicshelperinterface.h> +#include <Qt3DRenderer/private/qgraphicshelperinterface_p.h> #include <QOpenGLContext> #ifdef QT_OPENGL_ES_2 diff --git a/src/render/backend/qgraphicshelpergl2.cpp b/src/render/backend/qgraphicshelpergl2.cpp index 1ef234586..4200de65e 100644 --- a/src/render/backend/qgraphicshelpergl2.cpp +++ b/src/render/backend/qgraphicshelpergl2.cpp @@ -41,7 +41,7 @@ #ifndef QT_OPENGL_ES_2 -#include "qgraphicshelpergl2.h" +#include "qgraphicshelpergl2_p.h" #include <QOpenGLFunctions_2_0> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/qgraphicshelpergl2.h b/src/render/backend/qgraphicshelpergl2_p.h index 122e4c650..c8eed3ea5 100644 --- a/src/render/backend/qgraphicshelpergl2.h +++ b/src/render/backend/qgraphicshelpergl2_p.h @@ -44,7 +44,7 @@ #ifndef QT_OPENGL_ES_2 -#include <Qt3DRenderer/qgraphicshelperinterface.h> +#include <Qt3DRenderer/private/qgraphicshelperinterface_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/qgraphicshelpergl3.cpp b/src/render/backend/qgraphicshelpergl3.cpp index 0974990b5..033724037 100644 --- a/src/render/backend/qgraphicshelpergl3.cpp +++ b/src/render/backend/qgraphicshelpergl3.cpp @@ -41,7 +41,7 @@ #ifndef QT_OPENGL_ES_2 -#include "qgraphicshelpergl3.h" +#include "qgraphicshelpergl3_p.h" #include <QOpenGLFunctions_3_2_Core> #include "renderlogging.h" diff --git a/src/render/backend/qgraphicshelpergl3.h b/src/render/backend/qgraphicshelpergl3_p.h index 1178b631d..41106b1f5 100644 --- a/src/render/backend/qgraphicshelpergl3.h +++ b/src/render/backend/qgraphicshelpergl3_p.h @@ -44,7 +44,7 @@ #ifndef QT_OPENGL_ES_2 -#include <Qt3DRenderer/qgraphicshelperinterface.h> +#include <Qt3DRenderer/private/qgraphicshelperinterface_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/qgraphicshelperinterface.h b/src/render/backend/qgraphicshelperinterface_p.h index 20355b004..20355b004 100644 --- a/src/render/backend/qgraphicshelperinterface.h +++ b/src/render/backend/qgraphicshelperinterface_p.h diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp index 46c0d7218..e1737e167 100644 --- a/src/render/backend/quniformvalue.cpp +++ b/src/render/backend/quniformvalue.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "quniformvalue.h" +#include "quniformvalue_p.h" -#include "qgraphicscontext.h" -#include "rendertexture.h" +#include <Qt3DRenderer/private/qgraphicscontext_p.h> +#include <Qt3DRenderer/private/rendertexture_p.h> #include <Qt3DCore/qframeallocator.h> diff --git a/src/render/backend/quniformvalue.h b/src/render/backend/quniformvalue_p.h index ab537abe6..7b4ecef33 100644 --- a/src/render/backend/quniformvalue.h +++ b/src/render/backend/quniformvalue_p.h @@ -50,7 +50,7 @@ #include <Qt3DRenderer/renderlogging.h> // for RenderTexturePtr -#include <Qt3DRenderer/rendertextureprovider.h> +#include <Qt3DRenderer/private/rendertextureprovider_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri index 5fff3d00d..8b4d77a5a 100644 --- a/src/render/backend/render-backend.pri +++ b/src/render/backend/render-backend.pri @@ -5,57 +5,57 @@ include("jobs/render-jobs.pri") HEADERS += \ $$PWD/rendereraspect.h \ - $$PWD/renderthread.h \ - $$PWD/renderconfiguration.h \ - $$PWD/renderdevice.h \ - $$PWD/renderer.h \ - $$PWD/rendermaterial.h \ - $$PWD/rendermesh.h \ - $$PWD/qgraphicscontext.h \ - $$PWD/rendershader.h \ - $$PWD/rendertechnique.h \ - $$PWD/rendercameralens.h \ - $$PWD/quniformvalue.h \ - $$PWD/renderscenebuilder.h \ - $$PWD/rendertexture.h \ - $$PWD/rendertextureprovider.h \ - $$PWD/meshdatamanager.h \ - $$PWD/states/blendstate.h \ - $$PWD/genericstate.h \ - $$PWD/qgraphicshelperinterface.h \ - $$PWD/qgraphicshelpergl3.h \ - $$PWD/qgraphicshelperes2.h \ - $$PWD/qgraphicshelpergl2.h \ - $$PWD/renderview.h \ - $$PWD/rendercommand.h \ - $$PWD/cameramanager.h \ - $$PWD/renderqueues.h \ - $$PWD/materialmanager.h \ - $$PWD/meshmanager.h \ - $$PWD/matrixmanager.h \ - $$PWD/vaomanager.h \ - $$PWD/shadermanager.h \ - $$PWD/techniquemanager.h \ - $$PWD/rendereffect.h \ - $$PWD/effectmanager.h \ - $$PWD/renderrenderpass.h \ - $$PWD/renderpassmanager.h \ - $$PWD/parameterpack.h \ - $$PWD/texturemanager.h \ - $$PWD/texturedatamanager.h \ - $$PWD/renderlayer.h \ - $$PWD/layermanager.h \ - $$PWD/renderlight.h \ - $$PWD/lightmanager.h \ - $$PWD/renderentity.h \ - $$PWD/entitymanager.h \ - $$PWD/rendercriterion.h \ - $$PWD/criterionmanager.h \ - $$PWD/rendersceneobserver.h \ - $$PWD/framegraphmanager.h \ - $$PWD/rendertransform.h \ - $$PWD/transformmanager.h \ - $$PWD/renderstate.h + $$PWD/renderthread_p.h \ + $$PWD/renderconfiguration_p.h \ + $$PWD/renderdevice_p.h \ + $$PWD/renderer_p.h \ + $$PWD/rendermaterial_p.h \ + $$PWD/rendermesh_p.h \ + $$PWD/qgraphicscontext_p.h \ + $$PWD/rendershader_p.h \ + $$PWD/rendertechnique_p.h \ + $$PWD/rendercameralens_p.h \ + $$PWD/quniformvalue_p.h \ + $$PWD/renderscenebuilder_p.h \ + $$PWD/rendertexture_p.h \ + $$PWD/rendertextureprovider_p.h \ + $$PWD/meshdatamanager_p.h \ + $$PWD/states/blendstate_p.h \ + $$PWD/genericstate_p.h \ + $$PWD/qgraphicshelperinterface_p.h \ + $$PWD/qgraphicshelpergl3_p.h \ + $$PWD/qgraphicshelperes2_p.h \ + $$PWD/qgraphicshelpergl2_p.h \ + $$PWD/renderview_p.h \ + $$PWD/rendercommand_p.h \ + $$PWD/cameramanager_p.h \ + $$PWD/renderqueues_p.h \ + $$PWD/materialmanager_p.h \ + $$PWD/meshmanager_p.h \ + $$PWD/matrixmanager_p.h \ + $$PWD/vaomanager_p.h \ + $$PWD/shadermanager_p.h \ + $$PWD/techniquemanager_p.h \ + $$PWD/rendereffect_p.h \ + $$PWD/effectmanager_p.h \ + $$PWD/renderrenderpass_p.h \ + $$PWD/renderpassmanager_p.h \ + $$PWD/parameterpack_p.h \ + $$PWD/texturemanager_p.h \ + $$PWD/texturedatamanager_p.h \ + $$PWD/renderlayer_p.h \ + $$PWD/layermanager_p.h \ + $$PWD/renderlight_p.h \ + $$PWD/lightmanager_p.h \ + $$PWD/renderentity_p.h \ + $$PWD/entitymanager_p.h \ + $$PWD/rendercriterion_p.h \ + $$PWD/criterionmanager_p.h \ + $$PWD/rendersceneobserver_p.h \ + $$PWD/framegraphmanager_p.h \ + $$PWD/rendertransform_p.h \ + $$PWD/transformmanager_p.h \ + $$PWD/renderstate_p.h SOURCES += \ $$PWD/rendereraspect.cpp \ diff --git a/src/render/backend/rendercameralens.cpp b/src/render/backend/rendercameralens.cpp index 3469f9943..a169a6c5a 100644 --- a/src/render/backend/rendercameralens.cpp +++ b/src/render/backend/rendercameralens.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "rendercameralens.h" +#include "rendercameralens_p.h" #include "rendereraspect.h" #include "renderlogging.h" @@ -48,7 +48,7 @@ #include <Qt3DCore/qentity.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/renderer.h> +#include <Qt3DRenderer/private/renderer_p.h> #include <QOpenGLContext> diff --git a/src/render/backend/rendercameralens.h b/src/render/backend/rendercameralens_p.h index b93874b84..b93874b84 100644 --- a/src/render/backend/rendercameralens.h +++ b/src/render/backend/rendercameralens_p.h diff --git a/src/render/backend/rendercommand.cpp b/src/render/backend/rendercommand.cpp index a8382cf0b..cea35e4f0 100644 --- a/src/render/backend/rendercommand.cpp +++ b/src/render/backend/rendercommand.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "rendercommand.h" +#include "rendercommand_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendercommand.h b/src/render/backend/rendercommand_p.h index ac7065973..ac09312af 100644 --- a/src/render/backend/rendercommand.h +++ b/src/render/backend/rendercommand_p.h @@ -44,8 +44,8 @@ #define QT3D_RENDER_RENDERCOMMAND_H #include <qglobal.h> -#include <Qt3DRenderer/quniformvalue.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/private/quniformvalue_p.h> +#include <Qt3DRenderer/private/meshdata_p.h> #include <Qt3DCore/qhandle.h> #include <QOpenGLShaderProgram> #include <QOpenGLTexture> diff --git a/src/render/backend/renderconfiguration.cpp b/src/render/backend/renderconfiguration.cpp index f13361998..3825dee78 100644 --- a/src/render/backend/renderconfiguration.cpp +++ b/src/render/backend/renderconfiguration.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "renderconfiguration.h" +#include "renderconfiguration_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderconfiguration.h b/src/render/backend/renderconfiguration_p.h index 686056575..686056575 100644 --- a/src/render/backend/renderconfiguration.h +++ b/src/render/backend/renderconfiguration_p.h diff --git a/src/render/backend/rendercriterion.cpp b/src/render/backend/rendercriterion.cpp index 91d6fc2d0..d601059f6 100644 --- a/src/render/backend/rendercriterion.cpp +++ b/src/render/backend/rendercriterion.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "rendercriterion.h" -#include "rendereraspect.h" -#include "renderer.h" +#include "rendercriterion_p.h" +#include <Qt3DRenderer/rendereraspect.h> +#include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qchangearbiter.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/backend/rendercriterion.h b/src/render/backend/rendercriterion_p.h index d988e97b9..d988e97b9 100644 --- a/src/render/backend/rendercriterion.h +++ b/src/render/backend/rendercriterion_p.h diff --git a/src/render/backend/renderdevice.cpp b/src/render/backend/renderdevice.cpp index 544bfb378..d275b5e51 100644 --- a/src/render/backend/renderdevice.cpp +++ b/src/render/backend/renderdevice.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "renderdevice.h" +#include "renderdevice_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderdevice.h b/src/render/backend/renderdevice_p.h index 7d2349110..7d2349110 100644 --- a/src/render/backend/renderdevice.h +++ b/src/render/backend/renderdevice_p.h diff --git a/src/render/backend/rendereffect.cpp b/src/render/backend/rendereffect.cpp index 94f6f4c11..9f6fe5844 100644 --- a/src/render/backend/rendereffect.cpp +++ b/src/render/backend/rendereffect.cpp @@ -39,19 +39,21 @@ ** ****************************************************************************/ -#include <QVariant> -#include "rendereffect.h" -#include "rendereraspect.h" -#include "renderer.h" -#include "techniquemanager.h" +#include <Qt3DRenderer/private/rendereffect_p.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/renderscenebuilder_p.h> +#include <Qt3DRenderer/private/techniquemanager_p.h> +#include <Qt3DRenderer/qeffect.h> +#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRenderer/rendereraspect.h> + #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qabstracteffect.h> #include <Qt3DCore/qabstracttechnique.h> #include <Qt3DCore/qchangearbiter.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/renderscenebuilder.h> + +#include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendereffect.h b/src/render/backend/rendereffect_p.h index 21dd7f353..a3a09d0f3 100644 --- a/src/render/backend/rendereffect.h +++ b/src/render/backend/rendereffect_p.h @@ -43,7 +43,7 @@ #define QT3D_RENDER_RENDEREFFECT_H #include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/parameterpack.h> +#include <Qt3DRenderer/private/parameterpack_p.h> #include <Qt3DCore/qobserverinterface.h> #include <QList> #include <QUuid> diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp index e67d51300..45d3c5472 100644 --- a/src/render/backend/renderentity.cpp +++ b/src/render/backend/renderentity.cpp @@ -39,35 +39,35 @@ ** ****************************************************************************/ -#include "renderentity.h" -#include "rendereraspect.h" -#include "renderer.h" -#include "entitymanager.h" -#include "matrixmanager.h" -#include "cameramanager.h" -#include "materialmanager.h" -#include "lightmanager.h" -#include "layermanager.h" -#include "meshmanager.h" -#include "meshdatamanager.h" -#include "transformmanager.h" -#include "qmesh.h" -#include "qabstractshapemesh.h" -#include "renderscenebuilder.h" -#include "qmaterial.h" -#include <sphere.h> +#include "renderentity_p.h" +#include <Qt3DRenderer/private/cameramanager_p.h> +#include <Qt3DRenderer/private/entitymanager_p.h> +#include <Qt3DRenderer/private/layermanager_p.h> +#include <Qt3DRenderer/private/lightmanager_p.h> +#include <Qt3DRenderer/private/materialmanager_p.h> +#include <Qt3DRenderer/private/matrixmanager_p.h> +#include <Qt3DRenderer/private/meshdatamanager_p.h> +#include <Qt3DRenderer/private/meshmanager_p.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/renderscenebuilder_p.h> +#include <Qt3DRenderer/private/transformmanager_p.h> +#include <Qt3DRenderer/qabstractlight.h> +#include <Qt3DRenderer/qabstractshapemesh.h> +#include <Qt3DRenderer/qlayer.h> +#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRenderer/qmesh.h> +#include <Qt3DRenderer/rendereraspect.h> +#include <Qt3DRenderer/renderlogging.h> +#include <Qt3DRenderer/sphere.h> -#include <Qt3DCore/qentity.h> -#include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qaspectmanager.h> +#include <Qt3DCore/qcameralens.h> +#include <Qt3DCore/qentity.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qtransform.h> -#include <Qt3DRenderer/qlayer.h> -#include <Qt3DRenderer/qabstractlight.h> #include <QMatrix4x4> #include <QString> -#include "renderlogging.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderentity.h b/src/render/backend/renderentity_p.h index 13a936610..bb83ab7fb 100644 --- a/src/render/backend/renderentity.h +++ b/src/render/backend/renderentity_p.h @@ -43,16 +43,16 @@ #ifndef QT3D_RENDER_RENDERNODE_H #define QT3D_RENDER_RENDERNODE_H -#include "rendermesh.h" -#include "meshmanager.h" -#include "renderlayer.h" -#include "renderer.h" -#include "layermanager.h" -#include "lightmanager.h" -#include "cameramanager.h" -#include "rendertransform.h" -#include "transformmanager.h" -#include "materialmanager.h" +#include <Qt3DRenderer/private/rendermesh_p.h> +#include <Qt3DRenderer/private/meshmanager_p.h> +#include <Qt3DRenderer/private/renderlayer_p.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/layermanager_p.h> +#include <Qt3DRenderer/private/lightmanager_p.h> +#include <Qt3DRenderer/private/cameramanager_p.h> +#include <Qt3DRenderer/private/rendertransform_p.h> +#include <Qt3DRenderer/private/transformmanager_p.h> +#include <Qt3DRenderer/private/materialmanager_p.h> #include <Qt3DCore/qobserverinterface.h> #include <Qt3DCore/qhandle.h> diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 5e452b20d..e740898fe 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -40,7 +40,7 @@ ** ****************************************************************************/ -#include "renderer.h" +#include "renderer_p.h" #include <Qt3DCore/nodevisitor.h> #include <Qt3DCore/qentity.h> @@ -53,48 +53,48 @@ #include "jobs/renderviewjob.h" -#include <qmaterial.h> -#include <qmesh.h> -#include <qtechnique.h> -#include <qshaderprogram.h> -#include <qrenderpass.h> -#include <qabstractshapemesh.h> -#include <cameramanager.h> -#include <meshdatamanager.h> -#include <meshmanager.h> -#include <rendermesh.h> -#include <renderqueues.h> -#include <rendermaterial.h> -#include <renderentity.h> -#include <rendertechnique.h> -#include <renderscenebuilder.h> -#include <rendershader.h> -#include <rendereraspect.h> -#include <qgraphicscontext.h> -#include <rendercameralens.h> -#include <rendertextureprovider.h> -#include <renderstate.h> -#include <states/blendstate.h> -#include <entitymanager.h> -#include <renderview.h> -#include <rendercommand.h> -#include <materialmanager.h> -#include <matrixmanager.h> -#include <vaomanager.h> -#include <shadermanager.h> -#include <techniquemanager.h> -#include <effectmanager.h> -#include <renderpassmanager.h> -#include <texturemanager.h> -#include <texturedatamanager.h> -#include <layermanager.h> -#include <lightmanager.h> -#include "renderlogging.h" -#include "qparametermapper.h" -#include "renderthread.h" -#include "criterionmanager.h" -#include "framegraphmanager.h" -#include "transformmanager.h" +#include <Qt3DRenderer/qabstractshapemesh.h> +#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRenderer/qmesh.h> +#include <Qt3DRenderer/qtechnique.h> +#include <Qt3DRenderer/qshaderprogram.h> +#include <Qt3DRenderer/qrenderpass.h> +#include <Qt3DRenderer/rendereraspect.h> +#include <Qt3DRenderer/renderlogging.h> +#include <Qt3DRenderer/qparametermapper.h> +#include <Qt3DRenderer/private/cameramanager_p.h> +#include <Qt3DRenderer/private/meshdatamanager_p.h> +#include <Qt3DRenderer/private/meshmanager_p.h> +#include <Qt3DRenderer/private/rendermesh_p.h> +#include <Qt3DRenderer/private/renderqueues_p.h> +#include <Qt3DRenderer/private/rendermaterial_p.h> +#include <Qt3DRenderer/private/renderentity_p.h> +#include <Qt3DRenderer/private/rendertechnique_p.h> +#include <Qt3DRenderer/private/renderscenebuilder_p.h> +#include <Qt3DRenderer/private/rendershader_p.h> +#include <Qt3DRenderer/private/qgraphicscontext_p.h> +#include <Qt3DRenderer/private/rendercameralens_p.h> +#include <Qt3DRenderer/private/rendertextureprovider_p.h> +#include <Qt3DRenderer/private/renderstate_p.h> +#include <Qt3DRenderer/private/blendstate_p.h> +#include <Qt3DRenderer/private/entitymanager_p.h> +#include <Qt3DRenderer/private/renderview_p.h> +#include <Qt3DRenderer/private/rendercommand_p.h> +#include <Qt3DRenderer/private/materialmanager_p.h> +#include <Qt3DRenderer/private/matrixmanager_p.h> +#include <Qt3DRenderer/private/vaomanager_p.h> +#include <Qt3DRenderer/private/shadermanager_p.h> +#include <Qt3DRenderer/private/techniquemanager_p.h> +#include <Qt3DRenderer/private/effectmanager_p.h> +#include <Qt3DRenderer/private/renderpassmanager_p.h> +#include <Qt3DRenderer/private/texturemanager_p.h> +#include <Qt3DRenderer/private/texturedatamanager_p.h> +#include <Qt3DRenderer/private/layermanager_p.h> +#include <Qt3DRenderer/private/lightmanager_p.h> +#include <Qt3DRenderer/private/renderthread_p.h> +#include <Qt3DRenderer/private/criterionmanager_p.h> +#include <Qt3DRenderer/private/framegraphmanager_p.h> +#include <Qt3DRenderer/private/transformmanager_p.h> #include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qabstracteffect.h> @@ -163,6 +163,7 @@ Renderer::Renderer(int cachedFrames) void Renderer::buildDefaultTechnique() { + // TODO: Either use public API only or just go direct to the private backend API here m_defaultTechnique = new QTechnique; m_defaultTechnique->setObjectName(QStringLiteral("default-technique")); @@ -177,7 +178,7 @@ void Renderer::buildDefaultTechnique() m_defaultRenderStateSet = new RenderStateSet; m_defaultRenderStateSet->addState(DepthTest::getOrCreate(GL_LESS)); m_defaultRenderStateSet->addState(CullFace::getOrCreate(GL_BACK)); - basicPass->setStateSet(m_defaultRenderStateSet); + //basicPass->setStateSet(m_defaultRenderStateSet); m_defaultTechnique->addPass(basicPass); diff --git a/src/render/backend/renderer.h b/src/render/backend/renderer_p.h index 2e5d2036b..3fd45f76d 100644 --- a/src/render/backend/renderer.h +++ b/src/render/backend/renderer_p.h @@ -44,7 +44,7 @@ #define QT3D_RENDER_RENDERER_H #include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/quniformvalue.h> +#include <Qt3DRenderer/private/quniformvalue_p.h> #include <Qt3DCore/qjob.h> #include <Qt3DCore/qhandle.h> diff --git a/src/render/backend/rendereraspect.cpp b/src/render/backend/rendereraspect.cpp index e8179e0db..d08621363 100644 --- a/src/render/backend/rendereraspect.cpp +++ b/src/render/backend/rendereraspect.cpp @@ -41,11 +41,11 @@ #include "rendereraspect.h" -#include "rendermesh.h" -#include "meshmanager.h" -#include "meshdatamanager.h" -#include "renderer.h" -#include "rendersceneobserver.h" +#include <Qt3DRenderer/private/rendermesh_p.h> +#include <Qt3DRenderer/private/meshmanager_p.h> +#include <Qt3DRenderer/private/meshdatamanager_p.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/rendersceneobserver_p.h> #include <loadmeshdatajob.h> #include <updateworldtransformjob.h> diff --git a/src/render/backend/renderlayer.cpp b/src/render/backend/renderlayer.cpp index 1404a36fb..366959cd8 100644 --- a/src/render/backend/renderlayer.cpp +++ b/src/render/backend/renderlayer.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "renderlayer.h" -#include "renderer.h" +#include "renderlayer_p.h" +#include "renderer_p.h" #include "rendereraspect.h" #include "qlayer.h" #include <Qt3DCore/qaspectmanager.h> diff --git a/src/render/backend/renderlayer.h b/src/render/backend/renderlayer_p.h index fdb6cf6f1..fdb6cf6f1 100644 --- a/src/render/backend/renderlayer.h +++ b/src/render/backend/renderlayer_p.h diff --git a/src/render/backend/renderlight.cpp b/src/render/backend/renderlight.cpp index c6c4fd7a2..06566abcf 100644 --- a/src/render/backend/renderlight.cpp +++ b/src/render/backend/renderlight.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "renderlight.h" -#include "renderer.h" +#include "renderlight_p.h" +#include "renderer_p.h" #include "rendereraspect.h" #include "qabstractlight.h" #include <Qt3DCore/qchangearbiter.h> diff --git a/src/render/backend/renderlight.h b/src/render/backend/renderlight_p.h index ff3ea81e3..ff3ea81e3 100644 --- a/src/render/backend/renderlight.h +++ b/src/render/backend/renderlight_p.h diff --git a/src/render/backend/rendermaterial.cpp b/src/render/backend/rendermaterial.cpp index bd61a0b4f..c55fb5b04 100644 --- a/src/render/backend/rendermaterial.cpp +++ b/src/render/backend/rendermaterial.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "rendermaterial.h" -#include "rendereraspect.h" -#include "qgraphicscontext.h" -#include "rendertechnique.h" -#include "rendertextureprovider.h" -#include "qparameter.h" -#include "renderer.h" -#include "effectmanager.h" -#include "rendereffect.h" -#include <qtechnique.h> // for Parameter +#include "rendermaterial_p.h" +#include <Qt3DRenderer/rendereraspect.h> +#include <Qt3DRenderer/private/qgraphicscontext_p.h> +#include <Qt3DRenderer/private/rendertechnique_p.h> +#include <Qt3DRenderer/private/rendertextureprovider_p.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/effectmanager_p.h> +#include <Qt3DRenderer/private/rendereffect_p.h> +#include <qparameter.h> +#include <qtechnique.h> #include <qmaterial.h> #include <Qt3DCore/qabstracteffect.h> #include <Qt3DCore/qaspectmanager.h> diff --git a/src/render/backend/rendermaterial.h b/src/render/backend/rendermaterial_p.h index a16574991..ce97da391 100644 --- a/src/render/backend/rendermaterial.h +++ b/src/render/backend/rendermaterial_p.h @@ -46,9 +46,9 @@ #include <Qt3DCore/qobserverinterface.h> -#include <Qt3DRenderer/quniformvalue.h> -#include <Qt3DRenderer/rendertextureprovider.h> -#include <Qt3DRenderer/parameterpack.h> +#include <Qt3DRenderer/private/quniformvalue_p.h> +#include <Qt3DRenderer/private/rendertextureprovider_p.h> +#include <Qt3DRenderer/private/parameterpack_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendermesh.cpp b/src/render/backend/rendermesh.cpp index e00a1fa74..d675bd2ae 100644 --- a/src/render/backend/rendermesh.cpp +++ b/src/render/backend/rendermesh.cpp @@ -40,16 +40,16 @@ ** ****************************************************************************/ -#include "rendermesh.h" -#include "rendertechnique.h" -#include "rendermaterial.h" +#include "rendermesh_p.h" #include "rendereraspect.h" -#include "renderer.h" -#include "meshdatamanager.h" +#include <qtechnique.h> +#include <Qt3DRenderer/private/rendertechnique_p.h> +#include <Qt3DRenderer/private/rendermaterial_p.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/meshdatamanager_p.h> #include "qmesh.h" -#include "qgraphicscontext.h" +#include <Qt3DRenderer/private/qgraphicscontext_p.h> #include <meshdata.h> -#include <qtechnique.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/backend/rendermesh.h b/src/render/backend/rendermesh_p.h index 06c5699da..06c5699da 100644 --- a/src/render/backend/rendermesh.h +++ b/src/render/backend/rendermesh_p.h diff --git a/src/render/backend/renderpassmanager.cpp b/src/render/backend/renderpassmanager.cpp index 86a4aef02..c3e226f17 100644 --- a/src/render/backend/renderpassmanager.cpp +++ b/src/render/backend/renderpassmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "renderpassmanager.h" +#include "renderpassmanager_p.h" #include <Qt3DCore/qabstractrenderpass.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderpassmanager.h b/src/render/backend/renderpassmanager_p.h index 439e3aaf6..8984b8b51 100644 --- a/src/render/backend/renderpassmanager.h +++ b/src/render/backend/renderpassmanager_p.h @@ -43,7 +43,7 @@ #define QT3D_RENDER_RENDERPASSMANAGER_H #include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/renderrenderpass.h> +#include <Qt3DRenderer/private/renderrenderpass_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderqueues.cpp b/src/render/backend/renderqueues.cpp index 8807c9de6..e570ad2eb 100644 --- a/src/render/backend/renderqueues.cpp +++ b/src/render/backend/renderqueues.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "renderqueues.h" -#include "renderview.h" +#include "renderqueues_p.h" +#include <Qt3DRenderer/private/renderview_p.h> #include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderqueues.h b/src/render/backend/renderqueues_p.h index 63fd0d7e1..63fd0d7e1 100644 --- a/src/render/backend/renderqueues.h +++ b/src/render/backend/renderqueues_p.h diff --git a/src/render/backend/renderrenderpass.cpp b/src/render/backend/renderrenderpass.cpp index afae98a18..81d57199c 100644 --- a/src/render/backend/renderrenderpass.cpp +++ b/src/render/backend/renderrenderpass.cpp @@ -40,17 +40,19 @@ ** ****************************************************************************/ -#include "renderrenderpass.h" -#include "renderer.h" -#include "rendereraspect.h" -#include "rendercriterion.h" -#include "criterionmanager.h" +#include "renderrenderpass_p.h" +#include <Qt3DRenderer/private/criterionmanager_p.h> +#include <Qt3DRenderer/private/rendercriterion_p.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/qparametermapper.h> +#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRenderer/rendereraspect.h> + #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qchangearbiter.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qabstractshader.h> -#include <Qt3DRenderer/qparametermapper.h> -#include <Qt3DRenderer/qrenderstate.h> + QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderrenderpass.h b/src/render/backend/renderrenderpass_p.h index beb31b90a..beb31b90a 100644 --- a/src/render/backend/renderrenderpass.h +++ b/src/render/backend/renderrenderpass_p.h diff --git a/src/render/backend/renderscenebuilder.cpp b/src/render/backend/renderscenebuilder.cpp index 4d5bd998f..40f7d8533 100644 --- a/src/render/backend/renderscenebuilder.cpp +++ b/src/render/backend/renderscenebuilder.cpp @@ -39,42 +39,42 @@ ** ****************************************************************************/ -#include "renderscenebuilder.h" +#include "renderscenebuilder_p.h" -#include "entitymanager.h" -#include "meshdatamanager.h" -#include "meshmanager.h" -#include "cameramanager.h" -#include "layermanager.h" -#include "lightmanager.h" -#include "techniquemanager.h" -#include "effectmanager.h" -#include "renderpassmanager.h" -#include "renderer.h" -#include "renderentity.h" -#include "renderlogging.h" -#include "materialmanager.h" -#include "qabstractscene.h" -#include "qparameter.h" -#include "qparametermapper.h" -#include "rendercriterion.h" -#include "criterionmanager.h" -#include "rendereraspect.h" -#include "transformmanager.h" -#include "shadermanager.h" -#include <qmaterial.h> -#include <qmesh.h> -#include <qabstractshapemesh.h> -#include <qlayer.h> -#include <qabstractlight.h> +#include <Qt3DRenderer/qabstractlight.h> +#include <Qt3DRenderer/qabstractscene.h> +#include <Qt3DRenderer/qabstractshapemesh.h> +#include <Qt3DRenderer/qcameraselector.h> +#include <Qt3DRenderer/qframegraph.h> +#include <Qt3DRenderer/qlayer.h> +#include <Qt3DRenderer/qlayerfilter.h> +#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRenderer/qmesh.h> +#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRenderer/qparametermapper.h> +#include <Qt3DRenderer/qrenderpassfilter.h> +#include <Qt3DRenderer/qrendertargetselector.h> +#include <Qt3DRenderer/qtechniquefilter.h> +#include <Qt3DRenderer/qviewport.h> +#include <Qt3DRenderer/rendereraspect.h> +#include <Qt3DRenderer/renderlogging.h> -#include <qframegraph.h> -#include <qviewport.h> -#include <qtechniquefilter.h> -#include <qrenderpassfilter.h> -#include <qcameraselector.h> -#include <qrendertargetselector.h> -#include <qlayerfilter.h> +#include <Qt3DRenderer/private/cameramanager_p.h> +#include <Qt3DRenderer/private/criterionmanager_p.h> +#include <Qt3DRenderer/private/effectmanager_p.h> +#include <Qt3DRenderer/private/entitymanager_p.h> +#include <Qt3DRenderer/private/layermanager_p.h> +#include <Qt3DRenderer/private/lightmanager_p.h> +#include <Qt3DRenderer/private/materialmanager_p.h> +#include <Qt3DRenderer/private/meshdatamanager_p.h> +#include <Qt3DRenderer/private/meshmanager_p.h> +#include <Qt3DRenderer/private/rendercriterion_p.h> +#include <Qt3DRenderer/private/renderentity_p.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/renderpassmanager_p.h> +#include <Qt3DRenderer/private/shadermanager_p.h> +#include <Qt3DRenderer/private/techniquemanager_p.h> +#include <Qt3DRenderer/private/transformmanager_p.h> #include <techniquefilternode.h> #include <cameraselectornode.h> diff --git a/src/render/backend/renderscenebuilder.h b/src/render/backend/renderscenebuilder_p.h index c26f369f3..22da59b5b 100644 --- a/src/render/backend/renderscenebuilder.h +++ b/src/render/backend/renderscenebuilder_p.h @@ -43,11 +43,11 @@ #define QT3D_RENDER_RENDERSCENEBUILDER_H #include <Qt3DCore/nodevisitor.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/framegraphmanager_p.h> #include <Qt3DCore/qhandle.h> -#include <QStack> -#include <Qt3DRenderer/renderer.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/framegraphmanager.h> +#include <QStack> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendersceneobserver.cpp b/src/render/backend/rendersceneobserver.cpp index 9eee5776e..6d9dd7948 100644 --- a/src/render/backend/rendersceneobserver.cpp +++ b/src/render/backend/rendersceneobserver.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "rendersceneobserver.h" -#include "renderer.h" -#include "renderscenebuilder.h" -#include "qscenepropertychange.h" +#include "rendersceneobserver_p.h" +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/renderscenebuilder_p.h> +#include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendersceneobserver.h b/src/render/backend/rendersceneobserver_p.h index e5a079236..e5a079236 100644 --- a/src/render/backend/rendersceneobserver.h +++ b/src/render/backend/rendersceneobserver_p.h diff --git a/src/render/backend/rendershader.cpp b/src/render/backend/rendershader.cpp index e113d5e66..76e195e61 100644 --- a/src/render/backend/rendershader.cpp +++ b/src/render/backend/rendershader.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "rendershader.h" +#include "rendershader_p.h" #include <QDebug> #include <QFile> #include <QOpenGLContext> #include <QOpenGLShaderProgram> #include <qshaderprogram.h> -#include <Qt3DRenderer/QGraphicsContext> -#include <Qt3DRenderer/renderer.h> +#include <Qt3DRenderer/private/qgraphicscontext_p.h> +#include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/rendereraspect.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qaspectmanager.h> diff --git a/src/render/backend/rendershader.h b/src/render/backend/rendershader_p.h index 2e71fea63..e21852e2b 100644 --- a/src/render/backend/rendershader.h +++ b/src/render/backend/rendershader_p.h @@ -47,7 +47,7 @@ // for Parameter::StandardUniforms enum - maybe should move to // somewhere common to avoid this include? #include <Qt3DRenderer/qparameter.h> - +#include <Qt3DRenderer/private/quniformvalue_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderstate.cpp b/src/render/backend/renderstate.cpp index 1f9fc7992..a08bc2215 100644 --- a/src/render/backend/renderstate.cpp +++ b/src/render/backend/renderstate.cpp @@ -40,16 +40,15 @@ ** ****************************************************************************/ -#include "renderstate.h" +#include "renderstate_p.h" #include <bitset> #include <QDebug> #include <QOpenGLContext> -#include "qgraphicscontext.h" - -#include "states/blendstate.h" +#include <Qt3DRenderer/private/qgraphicscontext_p.h> +#include <Qt3DRenderer/private/blendstate_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderstate.h b/src/render/backend/renderstate_p.h index b079533d6..b079533d6 100644 --- a/src/render/backend/renderstate.h +++ b/src/render/backend/renderstate_p.h diff --git a/src/render/backend/rendertechnique.cpp b/src/render/backend/rendertechnique.cpp index 92a8a2ad1..1ea495c6c 100644 --- a/src/render/backend/rendertechnique.cpp +++ b/src/render/backend/rendertechnique.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include "rendertechnique.h" -#include "rendershader.h" - -#include <qrenderpass.h> -#include <qtechnique.h> -#include "rendereraspect.h" -#include "renderer.h" -#include "rendercriterion.h" -#include "criterionmanager.h" -#include "renderpassmanager.h" -#include "qopenglfilter.h" +#include "rendertechnique_p.h" + +#include <Qt3DRenderer/qrenderpass.h> +#include <Qt3DRenderer/qtechnique.h> +#include <Qt3DRenderer/qopenglfilter.h> +#include <Qt3DRenderer/rendereraspect.h> +#include <Qt3DRenderer/private/criterionmanager_p.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/rendercriterion_p.h> +#include <Qt3DRenderer/private/renderpassmanager_p.h> +#include <Qt3DRenderer/private/rendershader_p.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qchangearbiter.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/backend/rendertechnique.h b/src/render/backend/rendertechnique_p.h index 040071031..8f234bce1 100644 --- a/src/render/backend/rendertechnique.h +++ b/src/render/backend/rendertechnique_p.h @@ -46,7 +46,7 @@ #include <QVector> #include <QStringList> #include <Qt3DCore/qobserverinterface.h> -#include <Qt3DRenderer/parameterpack.h> +#include <Qt3DRenderer/private/parameterpack_p.h> #include <Qt3DRenderer/qcriterion.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendertexture.cpp b/src/render/backend/rendertexture.cpp index 91edb4115..08840efb9 100644 --- a/src/render/backend/rendertexture.cpp +++ b/src/render/backend/rendertexture.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "rendertexture.h" +#include "rendertexture_p.h" #include <QDebug> #include <QOpenGLTexture> diff --git a/src/render/backend/rendertexture.h b/src/render/backend/rendertexture_p.h index 126f42451..126f42451 100644 --- a/src/render/backend/rendertexture.h +++ b/src/render/backend/rendertexture_p.h diff --git a/src/render/backend/rendertextureprovider.cpp b/src/render/backend/rendertextureprovider.cpp index 313ee0824..6a194d06a 100644 --- a/src/render/backend/rendertextureprovider.cpp +++ b/src/render/backend/rendertextureprovider.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "rendertextureprovider.h" +#include "rendertextureprovider_p.h" #include "texture.h" -#include "rendertexture.h" +#include <Qt3DRenderer/private/rendertexture_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendertextureprovider.h b/src/render/backend/rendertextureprovider_p.h index 938c9039c..938c9039c 100644 --- a/src/render/backend/rendertextureprovider.h +++ b/src/render/backend/rendertextureprovider_p.h diff --git a/src/render/backend/renderthread.cpp b/src/render/backend/renderthread.cpp index 3c1ecde52..bfad05fcf 100644 --- a/src/render/backend/renderthread.cpp +++ b/src/render/backend/renderthread.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "renderthread.h" -#include "renderer.h" -#include "renderview.h" +#include "renderthread_p.h" +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/renderview_p.h> #include "renderlogging.h" #include <QEventLoop> diff --git a/src/render/backend/renderthread.h b/src/render/backend/renderthread_p.h index 687a846e3..687a846e3 100644 --- a/src/render/backend/renderthread.h +++ b/src/render/backend/renderthread_p.h diff --git a/src/render/backend/rendertransform.cpp b/src/render/backend/rendertransform.cpp index 082f38c9b..648d014c4 100644 --- a/src/render/backend/rendertransform.cpp +++ b/src/render/backend/rendertransform.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "rendertransform.h" +#include "rendertransform_p.h" #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qchangearbiter.h> #include <Qt3DCore/qtransform.h> -#include <Qt3DRenderer/renderer.h> +#include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/rendereraspect.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendertransform.h b/src/render/backend/rendertransform_p.h index 70812418f..70812418f 100644 --- a/src/render/backend/rendertransform.h +++ b/src/render/backend/rendertransform_p.h diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index 378a14a6b..fd6aa36d1 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -40,42 +40,42 @@ ** ****************************************************************************/ -#include "renderview.h" -#include "qmaterial.h" -#include "renderer.h" -#include "rendercameralens.h" -#include "rendercommand.h" -#include "renderentity.h" -#include "meshdatamanager.h" -#include "vaomanager.h" -#include "meshmanager.h" -#include "meshdata.h" -#include "cameramanager.h" -#include "entitymanager.h" -#include "materialmanager.h" -#include "techniquemanager.h" -#include "shadermanager.h" +#include "renderview_p.h" +#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/rendercameralens_p.h> +#include <Qt3DRenderer/private/rendercommand_p.h> +#include <Qt3DRenderer/private/renderentity_p.h> +#include <Qt3DRenderer/private/meshdatamanager_p.h> +#include <Qt3DRenderer/private/vaomanager_p.h> +#include <Qt3DRenderer/private/meshmanager_p.h> +#include <Qt3DRenderer/private/meshdata_p.h> +#include <Qt3DRenderer/private/cameramanager_p.h> +#include <Qt3DRenderer/private/entitymanager_p.h> +#include <Qt3DRenderer/private/materialmanager_p.h> +#include <Qt3DRenderer/private/techniquemanager_p.h> +#include <Qt3DRenderer/private/shadermanager_p.h> #include <cameraselectornode.h> #include <framegraphnode.h> #include <renderpassfilternode.h> #include <techniquefilternode.h> #include <viewportnode.h> #include <layerfilternode.h> -#include "rendereffect.h" -#include "effectmanager.h" -#include "renderlogging.h" -#include "renderpassmanager.h" -#include "renderrenderpass.h" -#include "qparametermapper.h" -#include "qparameter.h" -#include "texturemanager.h" -#include "texture.h" -#include "renderlayer.h" -#include "layermanager.h" -#include "criterionmanager.h" -#include "lightmanager.h" -#include "qopenglfilter.h" -#include "renderlight.h" +#include <Qt3DRenderer/private/rendereffect_p.h> +#include <Qt3DRenderer/private/effectmanager_p.h> +#include <Qt3DRenderer/renderlogging.h> +#include <Qt3DRenderer/private/renderpassmanager_p.h> +#include <Qt3DRenderer/private/renderrenderpass_p.h> +#include <Qt3DRenderer/private/qparametermapper_p.h> +#include <Qt3DRenderer/private/qparameter_p.h> +#include <Qt3DRenderer/private/texturemanager_p.h> +#include <Qt3DRenderer/texture.h> +#include <Qt3DRenderer/private/renderlayer_p.h> +#include <Qt3DRenderer/private/layermanager_p.h> +#include <Qt3DRenderer/private/criterionmanager_p.h> +#include <Qt3DRenderer/private/lightmanager_p.h> +#include <Qt3DRenderer/qopenglfilter.h> +#include <Qt3DRenderer/private/renderlight_p.h> #include "qalphatest.h" #include "qblendequation.h" @@ -87,7 +87,7 @@ #include "qfrontface.h" #include "qscissortest.h" #include "qstenciltest.h" -#include "blendstate.h" +#include <Qt3DRenderer/private/blendstate_p.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qabstracteffect.h> diff --git a/src/render/backend/renderview.h b/src/render/backend/renderview_p.h index dc566dc89..4868d2e22 100644 --- a/src/render/backend/renderview.h +++ b/src/render/backend/renderview_p.h @@ -43,8 +43,8 @@ #ifndef QT3D_RENDER_RENDERVIEW_H #define QT3D_RENDER_RENDERVIEW_H -#include <Qt3DRenderer/renderer.h> -#include <Qt3DRenderer/rendercameralens.h> +#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/rendercameralens_p.h> #include <Qt3DRenderer/qparameter.h> #include <Qt3DCore/qhandle.h> #include <QVector> diff --git a/src/render/backend/shadermanager.cpp b/src/render/backend/shadermanager.cpp index 89793846b..880da8b8b 100644 --- a/src/render/backend/shadermanager.cpp +++ b/src/render/backend/shadermanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "shadermanager.h" +#include "shadermanager_p.h" #include <QUuid> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/shadermanager.h b/src/render/backend/shadermanager_p.h index 35d4e5136..3bf916e80 100644 --- a/src/render/backend/shadermanager.h +++ b/src/render/backend/shadermanager_p.h @@ -44,7 +44,7 @@ #include <Qt3DCore/qresourcesmanager.h> #include <Qt3DCore/qhandle.h> -#include <Qt3DRenderer/rendershader.h> +#include <Qt3DRenderer/private/rendershader_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/states/blendstate.cpp b/src/render/backend/states/blendstate.cpp index e3b0098f0..cdb1856cc 100644 --- a/src/render/backend/states/blendstate.cpp +++ b/src/render/backend/states/blendstate.cpp @@ -40,9 +40,9 @@ ** ****************************************************************************/ -#include "blendstate.h" +#include "blendstate_p.h" -#include "qgraphicscontext.h" +#include <Qt3DRenderer/private/qgraphicscontext_p.h> #include <QOpenGLFunctions_3_2_Core> diff --git a/src/render/backend/states/blendstate.h b/src/render/backend/states/blendstate_p.h index 86019d8b1..9a3d29bf6 100644 --- a/src/render/backend/states/blendstate.h +++ b/src/render/backend/states/blendstate_p.h @@ -43,8 +43,8 @@ #ifndef BLENDSTATE_H #define BLENDSTATE_H -#include <Qt3DRenderer/renderstate.h> -#include <Qt3DRenderer/genericstate.h> +#include <Qt3DRenderer/private/renderstate_p.h> +#include <Qt3DRenderer/private/genericstate_p.h> #include <QOpenGLContext> diff --git a/src/render/backend/techniquemanager.cpp b/src/render/backend/techniquemanager.cpp index d0a42f670..09ff40142 100644 --- a/src/render/backend/techniquemanager.cpp +++ b/src/render/backend/techniquemanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "techniquemanager.h" +#include "techniquemanager_p.h" #include <Qt3DCore/qabstracteffect.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/techniquemanager.h b/src/render/backend/techniquemanager_p.h index f6e6653b5..d63735d10 100644 --- a/src/render/backend/techniquemanager.h +++ b/src/render/backend/techniquemanager_p.h @@ -44,7 +44,7 @@ #include <Qt3DCore/qresourcesmanager.h> #include <Qt3DCore/qhandle.h> -#include <Qt3DRenderer/rendertechnique.h> +#include <Qt3DRenderer/private/rendertechnique_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/texturedatamanager.cpp b/src/render/backend/texturedatamanager.cpp index e1522f252..1f9822c86 100644 --- a/src/render/backend/texturedatamanager.cpp +++ b/src/render/backend/texturedatamanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "texturedatamanager.h" +#include "texturedatamanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/texturedatamanager.h b/src/render/backend/texturedatamanager_p.h index afacef660..afacef660 100644 --- a/src/render/backend/texturedatamanager.h +++ b/src/render/backend/texturedatamanager_p.h diff --git a/src/render/backend/texturemanager.cpp b/src/render/backend/texturemanager.cpp index ba5d67f30..212ef7f37 100644 --- a/src/render/backend/texturemanager.cpp +++ b/src/render/backend/texturemanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "texturemanager.h" +#include "texturemanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/texturemanager.h b/src/render/backend/texturemanager_p.h index a285b433c..76db02279 100644 --- a/src/render/backend/texturemanager.h +++ b/src/render/backend/texturemanager_p.h @@ -43,7 +43,7 @@ #define QT3D_RENDER_TEXTUREMANAGER_H #include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/rendertexture.h> +#include <Qt3DRenderer/private/rendertexture_p.h> #include <QUuid> diff --git a/src/render/backend/transformmanager.cpp b/src/render/backend/transformmanager.cpp index f202b7a0d..640d19106 100644 --- a/src/render/backend/transformmanager.cpp +++ b/src/render/backend/transformmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "transformmanager.h" +#include "transformmanager_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/transformmanager.h b/src/render/backend/transformmanager_p.h index 0ef8033b5..fb1c3a818 100644 --- a/src/render/backend/transformmanager.h +++ b/src/render/backend/transformmanager_p.h @@ -43,7 +43,7 @@ #define QT3D_RENDER_TRANSFORMMANAGER_H #include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/rendertransform.h> +#include <Qt3DRenderer/private/rendertransform_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/vaomanager.cpp b/src/render/backend/vaomanager.cpp index 0ac018ef6..a536a25e3 100644 --- a/src/render/backend/vaomanager.cpp +++ b/src/render/backend/vaomanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "vaomanager.h" +#include "vaomanager_p.h" #include <QOpenGLVertexArrayObject> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/vaomanager.h b/src/render/backend/vaomanager_p.h index 7bc356e25..7bc356e25 100644 --- a/src/render/backend/vaomanager.h +++ b/src/render/backend/vaomanager_p.h diff --git a/src/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp index 1dd7c63df..86c231279 100644 --- a/src/render/frontend/qitemmodelbuffer.cpp +++ b/src/render/frontend/qitemmodelbuffer.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qitemmodelbuffer.h" -#include "qgraphicscontext.h" +#include <Qt3DRenderer/private/qgraphicscontext_p.h> #include <QDebug> #include <QColor> diff --git a/src/render/frontend/qparameter.cpp b/src/render/frontend/qparameter.cpp index 7c66f1630..720a738b8 100644 --- a/src/render/frontend/qparameter.cpp +++ b/src/render/frontend/qparameter.cpp @@ -155,38 +155,6 @@ bool QParameter::isTextureType() const } } -Render::QUniformValue::Type QParameter::uniformType() const -{ - Q_D(const QParameter); - switch (d->m_type) { - case Bool: - case BoolVec2: - case BoolVec3: - case BoolVec4: - return Render::QUniformValue::Bool; - - // integers! - - case Float: - case FloatVec2: - case FloatVec3: - case FloatVec4: - case FloatMat3: - case FloatMat4: - return Render::QUniformValue::Float; - - case Double: - case DoubleVec2: - case DoubleVec3: - case DoubleVec4: - return Render::QUniformValue::Double; - - default: - qCWarning(Render::Backend) << Q_FUNC_INFO << "couldn't map datatype:" << QString::number(d->m_type, 16); - return Render::QUniformValue::Invalid; - } -} - } // Qt3D QT_END_NAMESPACE diff --git a/src/render/frontend/qparameter.h b/src/render/frontend/qparameter.h index 23186bbe8..5eec02517 100644 --- a/src/render/frontend/qparameter.h +++ b/src/render/frontend/qparameter.h @@ -44,7 +44,6 @@ #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/quniformvalue.h> QT_BEGIN_NAMESPACE @@ -110,11 +109,6 @@ public: bool isTextureType() const; - /** - * @brief uniformType - map the data type to the primitive uniform type - * @return - */ - Render::QUniformValue::Type uniformType() const; Q_SIGNALS: void valueChanged(); void nameChanged(); diff --git a/src/render/frontend/qparametermapper_p.h b/src/render/frontend/qparametermapper_p.h index c96b867ab..2d7d5a43c 100644 --- a/src/render/frontend/qparametermapper_p.h +++ b/src/render/frontend/qparametermapper_p.h @@ -43,13 +43,12 @@ #define QT3D_QPARAMETERMAPPER_P_H #include <private/qnode_p.h> +#include <Qt3DRenderer/QParameterMapper> QT_BEGIN_NAMESPACE namespace Qt3D { -class QParameterMapper; - class QParameterMapperPrivate : public QNodePrivate { public: diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp index 65f091a45..fd7168f84 100644 --- a/src/render/frontend/qrenderpass.cpp +++ b/src/render/frontend/qrenderpass.cpp @@ -54,7 +54,6 @@ namespace Qt3D { QRenderPassPrivate::QRenderPassPrivate(QRenderPass *qq) : QAbstractRenderPassPrivate(qq) - , m_stateSet(0) { } @@ -96,18 +95,6 @@ ParameterList QRenderPass::uniforms() const return d->m_uniforms; } -void QRenderPass::setStateSet(Render::RenderStateSet *ss) -{ - Q_D(QRenderPass); - d->m_stateSet = ss; -} - -Render::RenderStateSet *QRenderPass::stateSet() const -{ - Q_D(const QRenderPass); - return d->m_stateSet; -} - void QRenderPass::addCriterion(QCriterion *criterion) { Q_D(QRenderPass); diff --git a/src/render/frontend/qrenderpass.h b/src/render/frontend/qrenderpass.h index fbcc5120e..593787a63 100644 --- a/src/render/frontend/qrenderpass.h +++ b/src/render/frontend/qrenderpass.h @@ -47,7 +47,7 @@ #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/renderstate.h> +#include <Qt3DRenderer/qrenderstate.h> #include <Qt3DRenderer/qcriterion.h> #include <QHash> @@ -80,9 +80,6 @@ public: ParameterList attributes() const; ParameterList uniforms() const; - void setStateSet(Render::RenderStateSet* ss); - Render::RenderStateSet* stateSet() const; - void addCriterion(QCriterion *criterion); void removeCriterion(QCriterion *criterion); QList<QCriterion *> criteria() const; diff --git a/src/render/frontend/qrenderpass_p.h b/src/render/frontend/qrenderpass_p.h index d19964e87..28a8f6653 100644 --- a/src/render/frontend/qrenderpass_p.h +++ b/src/render/frontend/qrenderpass_p.h @@ -75,8 +75,6 @@ public: QList<QCriterion *> m_criteriaList; QList<QParameterMapper *> m_bindings; QList<QRenderState *> m_renderStates; - - Render::RenderStateSet* m_stateSet; }; } // Qt3D diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index 76c7ba27d..60be17f1c 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -71,8 +71,8 @@ #include <QVector3D> // need to move these to somewhere common? -#include <renderstate.h> -#include <states/blendstate.h> +#include <Qt3DRenderer/private/renderstate_p.h> +#include <Qt3DRenderer/private/blendstate_p.h> QT_BEGIN_NAMESPACE @@ -869,56 +869,57 @@ void GLTFParser::processJSONTechnique( QString id, QJsonObject jsonObj ) // pass->addUniformBinding(paramDict[pname], uniformName); } // of program-instance attributes - QJsonObject states = po.value(KEY_STATES).toObject(); - Render::RenderStateSet* ss = new Render::RenderStateSet; + // TODO: Use public state api only here +// QJsonObject states = po.value(KEY_STATES).toObject(); +// Render::RenderStateSet* ss = new Render::RenderStateSet; - Q_FOREACH (QString stateName, states.keys()) { - Render::RenderState* s= buildState(stateName.toUtf8(), states.value(stateName)); - if (!s) - continue; +// Q_FOREACH (QString stateName, states.keys()) { +// Render::RenderState* s= buildState(stateName.toUtf8(), states.value(stateName)); +// if (!s) +// continue; - ss->addState(s); - } // of program-instance attributes +// ss->addState(s); +// } // of program-instance attributes - pass->setStateSet(ss); +// pass->setStateSet(ss); t->addPass(pass); } // of passes iteration m_techniques[id] = t; } -Render::RenderState* GLTFParser::buildState(const QByteArray& nm, QJsonValue v) -{ - if (nm == "blendEnable") { - return NULL; // will see a blendEquation spec too - } - - if (nm == "blendFunc") { - QJsonObject obj = v.toObject(); - GLenum srcF = static_cast<GLenum>(obj.value(QStringLiteral("sfactor")).toInt()); - GLenum dstF = static_cast<GLenum>(obj.value(QStringLiteral("dfactor")).toInt()); - return Render::BlendState::getOrCreate(srcF, dstF); - } - - if (nm == "blendEquation") { - return Render::BlendEquation::getOrCreate(static_cast<GLenum>(v.toInt())); - } - - if (nm == "cullFaceEnable" && v.toInt()) { - return Render::CullFace::getOrCreate(GL_BACK); - } - - if (nm == "depthTestEnable" && v.toInt()) { - return Render::DepthTest::getOrCreate(GL_LESS); - } - - if (nm == "depthMask") { - return Render::DepthMask::getOrCreate(v.toInt() ? GL_TRUE : GL_FALSE); - } - - qCWarning(Render::Io) << Q_FUNC_INFO << "unsupported gltf state:" << nm; - return NULL; -} +//Render::RenderState* GLTFParser::buildState(const QByteArray& nm, QJsonValue v) +//{ +// if (nm == "blendEnable") { +// return NULL; // will see a blendEquation spec too +// } + +// if (nm == "blendFunc") { +// QJsonObject obj = v.toObject(); +// GLenum srcF = static_cast<GLenum>(obj.value(QStringLiteral("sfactor")).toInt()); +// GLenum dstF = static_cast<GLenum>(obj.value(QStringLiteral("dfactor")).toInt()); +// return Render::BlendState::getOrCreate(srcF, dstF); +// } + +// if (nm == "blendEquation") { +// return Render::BlendEquation::getOrCreate(static_cast<GLenum>(v.toInt())); +// } + +// if (nm == "cullFaceEnable" && v.toInt()) { +// return Render::CullFace::getOrCreate(GL_BACK); +// } + +// if (nm == "depthTestEnable" && v.toInt()) { +// return Render::DepthTest::getOrCreate(GL_LESS); +// } + +// if (nm == "depthMask") { +// return Render::DepthMask::getOrCreate(v.toInt() ? GL_TRUE : GL_FALSE); +// } + +// qCWarning(Render::Io) << Q_FUNC_INFO << "unsupported gltf state:" << nm; +// return NULL; +//} QFile *GLTFParser::resolveLocalData(QString path) { diff --git a/src/render/io/gltfparser.h b/src/render/io/gltfparser.h index f61496abf..0688b321d 100644 --- a/src/render/io/gltfparser.h +++ b/src/render/io/gltfparser.h @@ -160,7 +160,7 @@ private: QVariant parameterValueFromJSON(QParameter *p, QJsonValue val); - Render::RenderState *buildState(const QByteArray& nm, QJsonValue obj); + //Render::RenderState *buildState(const QByteArray& nm, QJsonValue obj); }; } diff --git a/src/render/io/meshdata_p.h b/src/render/io/meshdata_p.h index ef3d89735..9904df829 100644 --- a/src/render/io/meshdata_p.h +++ b/src/render/io/meshdata_p.h @@ -44,6 +44,7 @@ #include <private/qabstractmeshdata_p.h> #include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRenderer/meshdata.h> QT_BEGIN_NAMESPACE |