diff options
Diffstat (limited to 'src/quick3d/imports/render')
17 files changed, 106 insertions, 106 deletions
diff --git a/src/quick3d/imports/render/defaults/defaults.pri b/src/quick3d/imports/render/defaults/defaults.pri index cd658cf2a..5487dac49 100644 --- a/src/quick3d/imports/render/defaults/defaults.pri +++ b/src/quick3d/imports/render/defaults/defaults.pri @@ -3,7 +3,7 @@ # resource file. # # To have the plugin register them as types, add an entries to the -# qmldir array in qt3dquick3drendererplugin.cpp +# qmldir array in qt3dquick3drenderplugin.cpp QML_FILES = \ $$PWD/qml/PhongMaterial.qml \ $$PWD/qml/DiffuseMapMaterial.qml \ diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml index d6d543ba2..ef5cf5aba 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml index 9be6951d6..c93618f3c 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml index 6c2b4f923..cdad6bb2d 100644 --- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml +++ b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 TechniqueFilter { // Expose camera to allow user to choose which camera to use for rendering diff --git a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml index 7128701e7..a12754506 100644 --- a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id:root diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml index 9981f4b30..2d028bce6 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml index f30f46452..719ac90e7 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml index bc60ade6a..42302f32f 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml index d891b5671..6b8cd57cc 100644 --- a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id:root diff --git a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml index d930561e7..13e4b6f33 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id:root diff --git a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml index a7d5c85fe..99fa247bb 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id:root diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml index 1c6571b09..9763a321a 100644 --- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml +++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { diff --git a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml index ce04f60ee..0b7661aff 100644 --- a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro index 00f0538d0..4326356d4 100644 --- a/src/quick3d/imports/render/importsrender.pro +++ b/src/quick3d/imports/render/importsrender.pro @@ -1,14 +1,14 @@ CXX_MODULE = qml -TARGET = quick3drendererplugin -TARGETPATH = Qt3D/Renderer +TARGET = quick3drenderplugin +TARGETPATH = Qt3D/Render -QT += core-private qml qml-private 3dcore 3drenderer 3dquick 3dquickrenderer-private +QT += core-private qml qml-private 3dcore 3drender 3dquick 3dquickrender-private HEADERS += \ - qt3dquick3drendererplugin.h + qt3dquick3drenderplugin.h SOURCES += \ - qt3dquick3drendererplugin.cpp + qt3dquick3drenderplugin.cpp OTHER_FILES += qmldir diff --git a/src/quick3d/imports/render/qmldir b/src/quick3d/imports/render/qmldir index 27e4826df..6654a6a50 100644 --- a/src/quick3d/imports/render/qmldir +++ b/src/quick3d/imports/render/qmldir @@ -1,3 +1,3 @@ -module Qt3D.Renderer -plugin quick3drendererplugin -classname Qt3DQuick3DRendererPlugin +module Qt3D.Render +plugin quick3drenderplugin +classname Qt3DQuick3DRenderPlugin diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index d5b6e7d37..2225b18d8 100644 --- a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -35,89 +35,89 @@ ** ****************************************************************************/ -#include "qt3dquick3drendererplugin.h" -#include <Qt3DRenderer/qabstractsceneloader.h> -#include <Qt3DRenderer/qsceneloader.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qviewport.h> -#include <Qt3DRenderer/qrenderpassfilter.h> -#include <Qt3DRenderer/qtechniquefilter.h> -#include <Qt3DRenderer/qrendertargetselector.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qframegraph.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qcameraselector.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qannotation.h> -#include <Qt3DRenderer/qparametermapping.h> -#include <Qt3DRenderer/qcuboidmesh.h> -#include <Qt3DRenderer/qcylindermesh.h> -#include <Qt3DRenderer/qplanemesh.h> -#include <Qt3DRenderer/qspheremesh.h> -#include <Qt3DRenderer/qtorusmesh.h> -#include <Qt3DRenderer/qlayer.h> -#include <Qt3DRenderer/qlayerfilter.h> -#include <Qt3DRenderer/qabstractlight.h> -#include <Qt3DRenderer/qspotlight.h> -#include <Qt3DRenderer/qdirectionallight.h> -#include <Qt3DRenderer/qpointlight.h> -#include <Qt3DRenderer/qopenglfilter.h> -#include <Qt3DRenderer/qrenderstate.h> -#include <Qt3DRenderer/qblendstate.h> -#include <Qt3DRenderer/qblendequation.h> -#include <Qt3DRenderer/qalphatest.h> -#include <Qt3DRenderer/qdepthtest.h> -#include <Qt3DRenderer/qdepthmask.h> -#include <Qt3DRenderer/qcullface.h> -#include <Qt3DRenderer/qfrontface.h> -#include <Qt3DRenderer/qstenciltest.h> -#include <Qt3DRenderer/qstenciltestseparate.h> -#include <Qt3DRenderer/qscissortest.h> -#include <Qt3DRenderer/qdithering.h> -#include <Qt3DRenderer/qrenderattachment.h> -#include <Qt3DRenderer/qclearbuffer.h> -#include <Qt3DRenderer/qsortcriterion.h> -#include <Qt3DRenderer/qalphacoverage.h> -#include <Qt3DRenderer/qpolygonoffset.h> -#include <Qt3DRenderer/qcolormask.h> -#include <Qt3DRenderer/qshaderdata.h> -#include <Qt3DRenderer/qnodraw.h> -#include <Qt3DRenderer/qclipplane.h> -#include <Qt3DRenderer/qstencilop.h> -#include <Qt3DRenderer/qstencilopseparate.h> -#include <Qt3DRenderer/qstencilmask.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qtorusgeometry.h> -#include <Qt3DRenderer/qspheregeometry.h> -#include <Qt3DRenderer/qcuboidgeometry.h> -#include <Qt3DRenderer/qplanegeometry.h> -#include <Qt3DRenderer/qgeometryrenderer.h> -#include <Qt3DRenderer/qcylindergeometry.h> -#include <Qt3DQuickRenderer/quick3dtechnique.h> -#include <Qt3DQuickRenderer/quick3dmaterial.h> -#include <Qt3DQuickRenderer/quick3dtechniquefilter.h> -#include <Qt3DQuickRenderer/quick3dviewport.h> -#include <Qt3DQuickRenderer/quick3drenderpassfilter.h> -#include <Qt3DQuickRenderer/quick3drendertarget.h> -#include <Qt3DQuickRenderer/quick3deffect.h> -#include <Qt3DQuickRenderer/quick3dscene.h> -#include <Qt3DQuickRenderer/quick3dtexture.h> -#include <Qt3DQuickRenderer/private/shaderpropertyparser_p.h> -#include <Qt3DQuickRenderer/quick3drenderpass.h> -#include <Qt3DQuickRenderer/quick3dsortmethod.h> -#include <Qt3DQuickRenderer/quick3dparameter.h> -#include <Qt3DQuickRenderer/quick3dshaderdata.h> -#include <Qt3DQuickRenderer/quick3dshaderdataarray.h> -#include <Qt3DQuickRenderer/quick3dstateset.h> -#include <Qt3DQuickRenderer/quick3drendertargetselector.h> -#include <Qt3DQuickRenderer/quick3dgeometry.h> -#include <Qt3DQuickRenderer/quick3dbuffer.h> -#include <Qt3DQuickRenderer/private/qt3dquickrenderer_global_p.h> +#include "qt3dquick3drenderplugin.h" +#include <Qt3DRender/qabstractsceneloader.h> +#include <Qt3DRender/qsceneloader.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qviewport.h> +#include <Qt3DRender/qrenderpassfilter.h> +#include <Qt3DRender/qtechniquefilter.h> +#include <Qt3DRender/qrendertargetselector.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qframegraph.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qcameraselector.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qparametermapping.h> +#include <Qt3DRender/qcuboidmesh.h> +#include <Qt3DRender/qcylindermesh.h> +#include <Qt3DRender/qplanemesh.h> +#include <Qt3DRender/qspheremesh.h> +#include <Qt3DRender/qtorusmesh.h> +#include <Qt3DRender/qlayer.h> +#include <Qt3DRender/qlayerfilter.h> +#include <Qt3DRender/qabstractlight.h> +#include <Qt3DRender/qspotlight.h> +#include <Qt3DRender/qdirectionallight.h> +#include <Qt3DRender/qpointlight.h> +#include <Qt3DRender/qopenglfilter.h> +#include <Qt3DRender/qrenderstate.h> +#include <Qt3DRender/qblendstate.h> +#include <Qt3DRender/qblendequation.h> +#include <Qt3DRender/qalphatest.h> +#include <Qt3DRender/qdepthtest.h> +#include <Qt3DRender/qdepthmask.h> +#include <Qt3DRender/qcullface.h> +#include <Qt3DRender/qfrontface.h> +#include <Qt3DRender/qstenciltest.h> +#include <Qt3DRender/qstenciltestseparate.h> +#include <Qt3DRender/qscissortest.h> +#include <Qt3DRender/qdithering.h> +#include <Qt3DRender/qrenderattachment.h> +#include <Qt3DRender/qclearbuffer.h> +#include <Qt3DRender/qsortcriterion.h> +#include <Qt3DRender/qalphacoverage.h> +#include <Qt3DRender/qpolygonoffset.h> +#include <Qt3DRender/qcolormask.h> +#include <Qt3DRender/qshaderdata.h> +#include <Qt3DRender/qnodraw.h> +#include <Qt3DRender/qclipplane.h> +#include <Qt3DRender/qstencilop.h> +#include <Qt3DRender/qstencilopseparate.h> +#include <Qt3DRender/qstencilmask.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qtorusgeometry.h> +#include <Qt3DRender/qspheregeometry.h> +#include <Qt3DRender/qcuboidgeometry.h> +#include <Qt3DRender/qplanegeometry.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/qcylindergeometry.h> +#include <Qt3DQuickRender/quick3dtechnique.h> +#include <Qt3DQuickRender/quick3dmaterial.h> +#include <Qt3DQuickRender/quick3dtechniquefilter.h> +#include <Qt3DQuickRender/quick3dviewport.h> +#include <Qt3DQuickRender/quick3drenderpassfilter.h> +#include <Qt3DQuickRender/quick3drendertarget.h> +#include <Qt3DQuickRender/quick3deffect.h> +#include <Qt3DQuickRender/quick3dscene.h> +#include <Qt3DQuickRender/quick3dtexture.h> +#include <Qt3DQuickRender/private/shaderpropertyparser_p.h> +#include <Qt3DQuickRender/quick3drenderpass.h> +#include <Qt3DQuickRender/quick3dsortmethod.h> +#include <Qt3DQuickRender/quick3dparameter.h> +#include <Qt3DQuickRender/quick3dshaderdata.h> +#include <Qt3DQuickRender/quick3dshaderdataarray.h> +#include <Qt3DQuickRender/quick3dstateset.h> +#include <Qt3DQuickRender/quick3drendertargetselector.h> +#include <Qt3DQuickRender/quick3dgeometry.h> +#include <Qt3DQuickRender/quick3dbuffer.h> +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> static void initResources() { @@ -157,7 +157,7 @@ QVariantList Quick3DShaderDataArrayToVariantListConverter(Qt3DRender::Render::Qu return values; } -void Qt3DQuick3DRendererPlugin::registerTypes(const char *uri) +void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) { // Init resources for defaults QML files initResources(); diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.h b/src/quick3d/imports/render/qt3dquick3drenderplugin.h index 50105d5ae..05aceab7f 100644 --- a/src/quick3d/imports/render/qt3dquick3drendererplugin.h +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -class Qt3DQuick3DRendererPlugin : public QQmlExtensionPlugin +class Qt3DQuick3DRenderPlugin : public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") |