From b21dfb2db3b48192e05dfdca9fdb85ed4bca02f2 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Thu, 11 Jun 2015 14:55:32 +0100 Subject: Use Qt3D.Renderer rather than Render This should make the documentation and code terminology consistent throughout. We can rename the source directories at a later date if needed. Task-number: QTBUG-46622 Change-Id: I2737e54192341808f4a0270ad19ba70f6c4af589 Reviewed-by: Kai Koehne Reviewed-by: Giuseppe D'Angelo --- examples/qt3d/anaglyph-rendering/StereoCamera.qml | 2 +- .../qt3d/anaglyph-rendering/StereoFrameGraph.qml | 2 +- examples/qt3d/anaglyph-rendering/main.qml | 2 +- examples/qt3d/assimp/main.qml | 2 +- examples/qt3d/bigmodel-qml/MyEntity.qml | 2 +- examples/qt3d/bigmodel-qml/main.qml | 2 +- examples/qt3d/controls/Logo.qml | 2 +- examples/qt3d/cylinder-qml/main.qml | 2 +- .../deferred-renderer-qml/DeferredRenderer.qml | 2 +- .../qt3d/deferred-renderer-qml/FinalEffect.qml | 2 +- examples/qt3d/deferred-renderer-qml/GBuffer.qml | 2 +- .../qt3d/deferred-renderer-qml/SceneEffect.qml | 2 +- examples/qt3d/deferred-renderer-qml/main.qml | 2 +- examples/qt3d/enabled-qml/main.qml | 2 +- examples/qt3d/gltf/main.qml | 2 +- examples/qt3d/keyboardinput-qml/main.qml | 2 +- examples/qt3d/loader-qml/CuboidEntity.qml | 2 +- examples/qt3d/loader-qml/SphereEntity.qml | 2 +- examples/qt3d/loader-qml/main.qml | 2 +- examples/qt3d/materials/Barrel.qml | 2 +- examples/qt3d/materials/BasicCamera.qml | 2 +- examples/qt3d/materials/Chest.qml | 2 +- examples/qt3d/materials/HousePlant.qml | 2 +- examples/qt3d/materials/PlaneEntity.qml | 2 +- examples/qt3d/materials/RenderableEntity.qml | 2 +- examples/qt3d/materials/SortedForwardRenderer.qml | 2 +- examples/qt3d/materials/TrefoilKnot.qml | 2 +- examples/qt3d/materials/main.qml | 2 +- examples/qt3d/multiviewport/main.qml | 2 +- examples/qt3d/playground-qml/AdsEffect.qml | 2 +- .../playground-qml/AnimatedDiffuseMaterial.qml | 2 +- examples/qt3d/playground-qml/ComplexTechnique.qml | 2 +- examples/qt3d/playground-qml/DetailView.qml | 2 +- examples/qt3d/playground-qml/MainView.qml | 2 +- examples/qt3d/playground-qml/MyForwardRenderer.qml | 2 +- examples/qt3d/playground-qml/RenderableEntity.qml | 2 +- examples/qt3d/playground-qml/main.qml | 2 +- examples/qt3d/scene3d/AnimatedEntity.qml | 2 +- examples/qt3d/shadow-map-qml/AdsEffect.qml | 2 +- examples/qt3d/shadow-map-qml/AdsMaterial.qml | 2 +- examples/qt3d/shadow-map-qml/GroundPlane.qml | 2 +- examples/qt3d/shadow-map-qml/Light.qml | 2 +- .../qt3d/shadow-map-qml/ShadowMapFrameGraph.qml | 2 +- examples/qt3d/shadow-map-qml/Toyplane.qml | 2 +- examples/qt3d/shadow-map-qml/Trefoil.qml | 2 +- examples/qt3d/shadow-map-qml/main.qml | 2 +- examples/qt3d/simple-qml/main.qml | 2 +- examples/qt3d/simple-shaders-qml/main.qml | 2 +- examples/qt3d/skybox/Skybox.qml | 2 +- examples/qt3d/skybox/main.qml | 2 +- examples/qt3d/tessellation-modes/BasicCamera.qml | 2 +- .../qt3d/tessellation-modes/TessellatedQuad.qml | 2 +- .../TessellatedWireframeEffect.qml | 2 +- .../TessellatedWireframeMaterial.qml | 2 +- examples/qt3d/tessellation-modes/main.qml | 2 +- examples/qt3d/torus-qml/main.qml | 2 +- examples/qt3d/wave/Background.qml | 2 +- examples/qt3d/wave/BackgroundEffect.qml | 2 +- examples/qt3d/wave/BasicCamera.qml | 2 +- examples/qt3d/wave/Wave.qml | 2 +- examples/qt3d/wave/WaveEffect.qml | 2 +- examples/qt3d/wave/WaveForwardRenderer.qml | 2 +- examples/qt3d/wave/WaveMaterial.qml | 2 +- examples/qt3d/wave/main.qml | 2 +- examples/qt3d/wireframe/BasicCamera.qml | 2 +- examples/qt3d/wireframe/TrefoilKnot.qml | 2 +- examples/qt3d/wireframe/WireframeEffect.qml | 2 +- examples/qt3d/wireframe/WireframeMaterial.qml | 2 +- examples/qt3d/wireframe/main.qml | 2 +- src/quick3d/imports/render/defaults/defaults.pri | 2 +- .../render/defaults/qml/DiffuseMapMaterial.qml | 2 +- .../defaults/qml/DiffuseSpecularMapMaterial.qml | 2 +- .../render/defaults/qml/ForwardRenderer.qml | 2 +- .../defaults/qml/NormalDiffuseMapAlphaMaterial.qml | 2 +- .../defaults/qml/NormalDiffuseMapMaterial.qml | 2 +- .../qml/NormalDiffuseSpecularMapMaterial.qml | 2 +- .../render/defaults/qml/PerVertexColorMaterial.qml | 2 +- .../imports/render/defaults/qml/PhongMaterial.qml | 2 +- .../imports/render/defaults/qml/SkyboxEntity.qml | 2 +- src/quick3d/imports/render/importsrender.pro | 8 +- src/quick3d/imports/render/qmldir | 6 +- .../imports/render/qt3dquick3drendererplugin.cpp | 253 +++++++++++++++++++++ .../imports/render/qt3dquick3drendererplugin.h | 54 +++++ .../imports/render/qt3dquick3drenderplugin.cpp | 253 --------------------- .../imports/render/qt3dquick3drenderplugin.h | 54 ----- .../frontend/framegraph-components/qframegraph.cpp | 4 +- .../framegraph-components/qframegraphnode.cpp | 4 +- .../framegraph-components/qlayerfilter.cpp | 4 +- src/render/frontend/qabstracttextureimage.cpp | 6 +- src/render/frontend/qannotation.cpp | 6 +- src/render/frontend/qblendstate.cpp | 4 +- src/render/frontend/qlayer.cpp | 4 +- src/render/frontend/qopenglfilter.cpp | 14 +- src/render/frontend/qparametermapping.cpp | 8 +- src/render/frontend/qpointlight.cpp | 2 +- src/render/frontend/qspotlight.cpp | 6 +- src/render/frontend/qtextureimage.cpp | 4 +- src/render/renderlogging.cpp | 20 +- 98 files changed, 436 insertions(+), 436 deletions(-) create mode 100644 src/quick3d/imports/render/qt3dquick3drendererplugin.cpp create mode 100644 src/quick3d/imports/render/qt3dquick3drendererplugin.h delete mode 100644 src/quick3d/imports/render/qt3dquick3drenderplugin.cpp delete mode 100644 src/quick3d/imports/render/qt3dquick3drenderplugin.h diff --git a/examples/qt3d/anaglyph-rendering/StereoCamera.qml b/examples/qt3d/anaglyph-rendering/StereoCamera.qml index c91d81ddf..3098ba367 100644 --- a/examples/qt3d/anaglyph-rendering/StereoCamera.qml +++ b/examples/qt3d/anaglyph-rendering/StereoCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml index 46164fc60..b958255ee 100644 --- a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml +++ b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Viewport { diff --git a/examples/qt3d/anaglyph-rendering/main.qml b/examples/qt3d/anaglyph-rendering/main.qml index bf1dd211c..aaa253f3c 100644 --- a/examples/qt3d/anaglyph-rendering/main.qml +++ b/examples/qt3d/anaglyph-rendering/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.4 as QQ2 Entity { diff --git a/examples/qt3d/assimp/main.qml b/examples/qt3d/assimp/main.qml index f9807491c..6ebbe8afd 100644 --- a/examples/qt3d/assimp/main.qml +++ b/examples/qt3d/assimp/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/bigmodel-qml/MyEntity.qml b/examples/qt3d/bigmodel-qml/MyEntity.qml index fd30c1071..8e0e819bc 100644 --- a/examples/qt3d/bigmodel-qml/MyEntity.qml +++ b/examples/qt3d/bigmodel-qml/MyEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/bigmodel-qml/main.qml b/examples/qt3d/bigmodel-qml/main.qml index 9d6a16264..704d17872 100644 --- a/examples/qt3d/bigmodel-qml/main.qml +++ b/examples/qt3d/bigmodel-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/controls/Logo.qml b/examples/qt3d/controls/Logo.qml index 7d85ee941..bcd7a4359 100644 --- a/examples/qt3d/controls/Logo.qml +++ b/examples/qt3d/controls/Logo.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.0 Entity { diff --git a/examples/qt3d/cylinder-qml/main.qml b/examples/qt3d/cylinder-qml/main.qml index 282826116..4c5e5e4e7 100644 --- a/examples/qt3d/cylinder-qml/main.qml +++ b/examples/qt3d/cylinder-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml index d95402cb9..82401fe66 100644 --- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml +++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Viewport { rect : Qt.rect(0.0, 0.0, 1.0, 1.0) diff --git a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml index f46e65c12..07dbdffa5 100644 --- a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml +++ b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { techniques : [ diff --git a/examples/qt3d/deferred-renderer-qml/GBuffer.qml b/examples/qt3d/deferred-renderer-qml/GBuffer.qml index 309cec160..94c889be1 100644 --- a/examples/qt3d/deferred-renderer-qml/GBuffer.qml +++ b/examples/qt3d/deferred-renderer-qml/GBuffer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 RenderTarget { diff --git a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml index e4cfdf8c5..589a4ac37 100644 --- a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml +++ b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { id : sceneMaterialEffect diff --git a/examples/qt3d/deferred-renderer-qml/main.qml b/examples/qt3d/deferred-renderer-qml/main.qml index d70619baa..4b9ee9a28 100644 --- a/examples/qt3d/deferred-renderer-qml/main.qml +++ b/examples/qt3d/deferred-renderer-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 Entity { diff --git a/examples/qt3d/enabled-qml/main.qml b/examples/qt3d/enabled-qml/main.qml index 031759556..a7cb5ed45 100644 --- a/examples/qt3d/enabled-qml/main.qml +++ b/examples/qt3d/enabled-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 Entity { diff --git a/examples/qt3d/gltf/main.qml b/examples/qt3d/gltf/main.qml index 3fd8ca398..acce5d7ac 100644 --- a/examples/qt3d/gltf/main.qml +++ b/examples/qt3d/gltf/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/keyboardinput-qml/main.qml b/examples/qt3d/keyboardinput-qml/main.qml index ef5afd077..100773280 100644 --- a/examples/qt3d/keyboardinput-qml/main.qml +++ b/examples/qt3d/keyboardinput-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import Qt3D.Input 2.0 Entity { diff --git a/examples/qt3d/loader-qml/CuboidEntity.qml b/examples/qt3d/loader-qml/CuboidEntity.qml index d05e47a57..9de96e1a3 100644 --- a/examples/qt3d/loader-qml/CuboidEntity.qml +++ b/examples/qt3d/loader-qml/CuboidEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { components: [ mesh, material, transform ] diff --git a/examples/qt3d/loader-qml/SphereEntity.qml b/examples/qt3d/loader-qml/SphereEntity.qml index fe36c1467..2825b8253 100644 --- a/examples/qt3d/loader-qml/SphereEntity.qml +++ b/examples/qt3d/loader-qml/SphereEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { components: [ mesh, material ] diff --git a/examples/qt3d/loader-qml/main.qml b/examples/qt3d/loader-qml/main.qml index fa3e8ff5a..76eb524ec 100644 --- a/examples/qt3d/loader-qml/main.qml +++ b/examples/qt3d/loader-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/materials/Barrel.qml b/examples/qt3d/materials/Barrel.qml index 1dcec0ca1..a79cffbc1 100644 --- a/examples/qt3d/materials/Barrel.qml +++ b/examples/qt3d/materials/Barrel.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/materials/BasicCamera.qml b/examples/qt3d/materials/BasicCamera.qml index f96132416..e8a8bd7f4 100644 --- a/examples/qt3d/materials/BasicCamera.qml +++ b/examples/qt3d/materials/BasicCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Camera { id: mainCamera diff --git a/examples/qt3d/materials/Chest.qml b/examples/qt3d/materials/Chest.qml index 1acd126ff..a8ef6b3f5 100644 --- a/examples/qt3d/materials/Chest.qml +++ b/examples/qt3d/materials/Chest.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/materials/HousePlant.qml b/examples/qt3d/materials/HousePlant.qml index 353a252d2..1f2a759af 100644 --- a/examples/qt3d/materials/HousePlant.qml +++ b/examples/qt3d/materials/HousePlant.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/materials/PlaneEntity.qml b/examples/qt3d/materials/PlaneEntity.qml index 222b5a33b..6e1f1925e 100644 --- a/examples/qt3d/materials/PlaneEntity.qml +++ b/examples/qt3d/materials/PlaneEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/materials/RenderableEntity.qml b/examples/qt3d/materials/RenderableEntity.qml index 03119b713..60b62a05b 100644 --- a/examples/qt3d/materials/RenderableEntity.qml +++ b/examples/qt3d/materials/RenderableEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml index 0687785fb..13e79800f 100644 --- a/examples/qt3d/materials/SortedForwardRenderer.qml +++ b/examples/qt3d/materials/SortedForwardRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 TechniqueFilter { id: root diff --git a/examples/qt3d/materials/TrefoilKnot.qml b/examples/qt3d/materials/TrefoilKnot.qml index 48b334ce0..51b2409b3 100644 --- a/examples/qt3d/materials/TrefoilKnot.qml +++ b/examples/qt3d/materials/TrefoilKnot.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml index cceac110b..2a3190640 100644 --- a/examples/qt3d/materials/main.qml +++ b/examples/qt3d/materials/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/multiviewport/main.qml b/examples/qt3d/multiviewport/main.qml index c5ad221dd..c5606fd25 100644 --- a/examples/qt3d/multiviewport/main.qml +++ b/examples/qt3d/multiviewport/main.qml @@ -36,7 +36,7 @@ import QtQuick 2.0 import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/playground-qml/AdsEffect.qml b/examples/qt3d/playground-qml/AdsEffect.qml index 4bc81ca44..958d69768 100644 --- a/examples/qt3d/playground-qml/AdsEffect.qml +++ b/examples/qt3d/playground-qml/AdsEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 // For Qt.vector3d() and friends. For some reason this is provided by // QQuickValueTypeProvider in QtQuick rather than the default value diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml index 50605baee..f376baf31 100644 --- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml +++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 Material { diff --git a/examples/qt3d/playground-qml/ComplexTechnique.qml b/examples/qt3d/playground-qml/ComplexTechnique.qml index 9bc3cad58..8d7395786 100644 --- a/examples/qt3d/playground-qml/ComplexTechnique.qml +++ b/examples/qt3d/playground-qml/ComplexTechnique.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Technique { annotations : [ diff --git a/examples/qt3d/playground-qml/DetailView.qml b/examples/qt3d/playground-qml/DetailView.qml index 92a2f3a1f..f0fc20d38 100644 --- a/examples/qt3d/playground-qml/DetailView.qml +++ b/examples/qt3d/playground-qml/DetailView.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/playground-qml/MainView.qml b/examples/qt3d/playground-qml/MainView.qml index 0f115d397..8e477f698 100644 --- a/examples/qt3d/playground-qml/MainView.qml +++ b/examples/qt3d/playground-qml/MainView.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 Entity { diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml index b4b412e77..0c9d08c62 100644 --- a/examples/qt3d/playground-qml/MyForwardRenderer.qml +++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 TechniqueFilter { id: root diff --git a/examples/qt3d/playground-qml/RenderableEntity.qml b/examples/qt3d/playground-qml/RenderableEntity.qml index 13be8f1f9..bdb1f22b9 100644 --- a/examples/qt3d/playground-qml/RenderableEntity.qml +++ b/examples/qt3d/playground-qml/RenderableEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { property Transform transform; diff --git a/examples/qt3d/playground-qml/main.qml b/examples/qt3d/playground-qml/main.qml index a5605f762..09a784955 100644 --- a/examples/qt3d/playground-qml/main.qml +++ b/examples/qt3d/playground-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import Qt3D.Input 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/scene3d/AnimatedEntity.qml b/examples/qt3d/scene3d/AnimatedEntity.qml index 72d9787d6..180907113 100644 --- a/examples/qt3d/scene3d/AnimatedEntity.qml +++ b/examples/qt3d/scene3d/AnimatedEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 diff --git a/examples/qt3d/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml index 1ddc58f3b..a54f32d13 100644 --- a/examples/qt3d/shadow-map-qml/AdsEffect.qml +++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { id: root diff --git a/examples/qt3d/shadow-map-qml/AdsMaterial.qml b/examples/qt3d/shadow-map-qml/AdsMaterial.qml index 322c7b9ac..93708cbe9 100644 --- a/examples/qt3d/shadow-map-qml/AdsMaterial.qml +++ b/examples/qt3d/shadow-map-qml/AdsMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 Material { diff --git a/examples/qt3d/shadow-map-qml/GroundPlane.qml b/examples/qt3d/shadow-map-qml/GroundPlane.qml index b863da3b5..e126547b5 100644 --- a/examples/qt3d/shadow-map-qml/GroundPlane.qml +++ b/examples/qt3d/shadow-map-qml/GroundPlane.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/shadow-map-qml/Light.qml b/examples/qt3d/shadow-map-qml/Light.qml index ca03f070f..e4a87830a 100644 --- a/examples/qt3d/shadow-map-qml/Light.qml +++ b/examples/qt3d/shadow-map-qml/Light.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml index b6932a76d..84dcd1f24 100644 --- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 FrameGraph { diff --git a/examples/qt3d/shadow-map-qml/Toyplane.qml b/examples/qt3d/shadow-map-qml/Toyplane.qml index 61c803469..3ac2b64ce 100644 --- a/examples/qt3d/shadow-map-qml/Toyplane.qml +++ b/examples/qt3d/shadow-map-qml/Toyplane.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/shadow-map-qml/Trefoil.qml b/examples/qt3d/shadow-map-qml/Trefoil.qml index 341ee6c23..9eefd425e 100644 --- a/examples/qt3d/shadow-map-qml/Trefoil.qml +++ b/examples/qt3d/shadow-map-qml/Trefoil.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/shadow-map-qml/main.qml b/examples/qt3d/shadow-map-qml/main.qml index 59040c39b..8bc021760 100644 --- a/examples/qt3d/shadow-map-qml/main.qml +++ b/examples/qt3d/shadow-map-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/simple-qml/main.qml b/examples/qt3d/simple-qml/main.qml index c82bafaa3..9d9038d7d 100644 --- a/examples/qt3d/simple-qml/main.qml +++ b/examples/qt3d/simple-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/examples/qt3d/simple-shaders-qml/main.qml index 22b6322be..89c2270e3 100644 --- a/examples/qt3d/simple-shaders-qml/main.qml +++ b/examples/qt3d/simple-shaders-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/skybox/Skybox.qml b/examples/qt3d/skybox/Skybox.qml index 49d269bf5..f396484bc 100644 --- a/examples/qt3d/skybox/Skybox.qml +++ b/examples/qt3d/skybox/Skybox.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/skybox/main.qml b/examples/qt3d/skybox/main.qml index fbb3c90d0..e84d027d6 100644 --- a/examples/qt3d/skybox/main.qml +++ b/examples/qt3d/skybox/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/tessellation-modes/BasicCamera.qml b/examples/qt3d/tessellation-modes/BasicCamera.qml index 062c84eff..385b40397 100644 --- a/examples/qt3d/tessellation-modes/BasicCamera.qml +++ b/examples/qt3d/tessellation-modes/BasicCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 Camera { diff --git a/examples/qt3d/tessellation-modes/TessellatedQuad.qml b/examples/qt3d/tessellation-modes/TessellatedQuad.qml index b6c3122a9..39199af10 100644 --- a/examples/qt3d/tessellation-modes/TessellatedQuad.qml +++ b/examples/qt3d/tessellation-modes/TessellatedQuad.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import Qt3D.Examples 1.0 import QtQuick 2.1 as QQ2 diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml index 0b51fde2a..57d9a0b4d 100644 --- a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml +++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 Effect { diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml index d66ad740c..c812e2295 100644 --- a/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml +++ b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 Material { diff --git a/examples/qt3d/tessellation-modes/main.qml b/examples/qt3d/tessellation-modes/main.qml index 425ca40de..864081cb5 100644 --- a/examples/qt3d/tessellation-modes/main.qml +++ b/examples/qt3d/tessellation-modes/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/torus-qml/main.qml b/examples/qt3d/torus-qml/main.qml index 05398d10b..47ad51c83 100644 --- a/examples/qt3d/torus-qml/main.qml +++ b/examples/qt3d/torus-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/wave/Background.qml b/examples/qt3d/wave/Background.qml index d25edfabf..b9005c2b4 100644 --- a/examples/qt3d/wave/Background.qml +++ b/examples/qt3d/wave/Background.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml index be02664f7..ad2170d47 100644 --- a/examples/qt3d/wave/BackgroundEffect.qml +++ b/examples/qt3d/wave/BackgroundEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { id: root diff --git a/examples/qt3d/wave/BasicCamera.qml b/examples/qt3d/wave/BasicCamera.qml index 740dd54ce..df21bcd5d 100644 --- a/examples/qt3d/wave/BasicCamera.qml +++ b/examples/qt3d/wave/BasicCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Camera { id: mainCamera diff --git a/examples/qt3d/wave/Wave.qml b/examples/qt3d/wave/Wave.qml index 023631b9e..72badde5f 100644 --- a/examples/qt3d/wave/Wave.qml +++ b/examples/qt3d/wave/Wave.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml index bca3737b8..4391d71c2 100644 --- a/examples/qt3d/wave/WaveEffect.qml +++ b/examples/qt3d/wave/WaveEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { id: root diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml index 9f8031668..49e6be22b 100644 --- a/examples/qt3d/wave/WaveForwardRenderer.qml +++ b/examples/qt3d/wave/WaveForwardRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 TechniqueFilter { id: root diff --git a/examples/qt3d/wave/WaveMaterial.qml b/examples/qt3d/wave/WaveMaterial.qml index 1417b54cb..c1dda4695 100644 --- a/examples/qt3d/wave/WaveMaterial.qml +++ b/examples/qt3d/wave/WaveMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Material { id: root diff --git a/examples/qt3d/wave/main.qml b/examples/qt3d/wave/main.qml index b2e0c1bff..0836cecd1 100644 --- a/examples/qt3d/wave/main.qml +++ b/examples/qt3d/wave/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import Qt3D.Input 2.0 Entity { diff --git a/examples/qt3d/wireframe/BasicCamera.qml b/examples/qt3d/wireframe/BasicCamera.qml index 740dd54ce..df21bcd5d 100644 --- a/examples/qt3d/wireframe/BasicCamera.qml +++ b/examples/qt3d/wireframe/BasicCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Camera { id: mainCamera diff --git a/examples/qt3d/wireframe/TrefoilKnot.qml b/examples/qt3d/wireframe/TrefoilKnot.qml index 7b6faf852..47a3b49ba 100644 --- a/examples/qt3d/wireframe/TrefoilKnot.qml +++ b/examples/qt3d/wireframe/TrefoilKnot.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml index c8fe3bef8..f413b2992 100644 --- a/examples/qt3d/wireframe/WireframeEffect.qml +++ b/examples/qt3d/wireframe/WireframeEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { id: root diff --git a/examples/qt3d/wireframe/WireframeMaterial.qml b/examples/qt3d/wireframe/WireframeMaterial.qml index 834ce657d..b8a08b29e 100644 --- a/examples/qt3d/wireframe/WireframeMaterial.qml +++ b/examples/qt3d/wireframe/WireframeMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Material { id: root diff --git a/examples/qt3d/wireframe/main.qml b/examples/qt3d/wireframe/main.qml index 8a9506c1c..ab739b187 100644 --- a/examples/qt3d/wireframe/main.qml +++ b/examples/qt3d/wireframe/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/src/quick3d/imports/render/defaults/defaults.pri b/src/quick3d/imports/render/defaults/defaults.pri index 4e871abc3..2d219b646 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 qt3dquick3drenderplugin.cpp +# qmldir array in qt3dquick3drendererplugin.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 5c6838dbd..3697b0b3d 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 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 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 43885be14..cb52a67cf 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 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 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 ee7744806..861854169 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 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 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/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml index df62ec84d..ff070197a 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 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 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 16e2f0b42..862ef5afa 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 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 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 bfb2cb163..44de8940b 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 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 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 6051ca3b9..2199a2cc6 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 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 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 dc66eb78a..2d2ed2d3a 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 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 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 2f0c54600..fd810bc9e 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 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro index 2bdb7c7bb..00f0538d0 100644 --- a/src/quick3d/imports/render/importsrender.pro +++ b/src/quick3d/imports/render/importsrender.pro @@ -1,14 +1,14 @@ CXX_MODULE = qml -TARGET = quick3drenderplugin -TARGETPATH = Qt3D/Render +TARGET = quick3drendererplugin +TARGETPATH = Qt3D/Renderer QT += core-private qml qml-private 3dcore 3drenderer 3dquick 3dquickrenderer-private HEADERS += \ - qt3dquick3drenderplugin.h + qt3dquick3drendererplugin.h SOURCES += \ - qt3dquick3drenderplugin.cpp + qt3dquick3drendererplugin.cpp OTHER_FILES += qmldir diff --git a/src/quick3d/imports/render/qmldir b/src/quick3d/imports/render/qmldir index 6654a6a50..27e4826df 100644 --- a/src/quick3d/imports/render/qmldir +++ b/src/quick3d/imports/render/qmldir @@ -1,3 +1,3 @@ -module Qt3D.Render -plugin quick3drenderplugin -classname Qt3DQuick3DRenderPlugin +module Qt3D.Renderer +plugin quick3drendererplugin +classname Qt3DQuick3DRendererPlugin diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp b/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp new file mode 100644 index 000000000..39e6a9d51 --- /dev/null +++ b/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp @@ -0,0 +1,253 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include "qt3dquick3drendererplugin.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void initResources() +{ + Q_INIT_RESOURCE(defaults); +} + +QT_BEGIN_NAMESPACE + +static const struct { + const char *type; + int major, minor; +} qmldir [] = { + // Materials + { "PhongMaterial", 2, 0 }, + { "DiffuseMapMaterial", 2, 0 }, + { "DiffuseSpecularMapMaterial", 2, 0 }, + { "NormalDiffuseMapAlphaMaterial", 2, 0 }, + { "NormalDiffuseMapMaterial", 2, 0 }, + { "NormalDiffuseSpecularMapMaterial", 2, 0 }, + { "PerVertexColorMaterial", 2, 0 }, + // FrameGraphs + { "ForwardRenderer", 2, 0 }, + // Entities + { "SkyboxEntity", 2, 0 } +}; + +QVariantList Quick3DShaderDataArrayToVariantListConverter(Qt3D::Render::Quick::Quick3DShaderDataArray *array) +{ + QList arrayValues = array->values(); + QVariantList values; + values.reserve(arrayValues.size()); + Q_FOREACH (Qt3D::QShaderData *data, arrayValues) + values.append(QVariant::fromValue(data)); + return values; +} + +void Qt3DQuick3DRendererPlugin::registerTypes(const char *uri) +{ + // Init resources for defaults QML files + initResources(); + + // Converters + QMetaType::registerConverter(Quick3DShaderDataArrayToVariantListConverter); + + // @uri Qt3D.Renderer + qmlRegisterUncreatableType(uri, 2, 0, "QAbstractSceneLoader", "QAbstractScene is abstract"); + qmlRegisterExtendedType(uri, 2, 0, "SceneLoader"); +// qmlRegisterCustomType(uri, 2, 0, "Effect", new Qt3D::Render::Quick::ShaderPropertyParser()); + qmlRegisterExtendedType(uri, 2, 0, "Effect"); + qmlRegisterExtendedType(uri, 2, 0, "Technique"); + qmlRegisterType(uri, 2, 0, "Annotation"); + qmlRegisterType(uri, 2, 0, "OpenGLFilter"); + qmlRegisterUncreatableType(uri, 2, 0, "QParameter", "Quick3D should instantiate Quick3DParameter only"); + qmlRegisterType(uri, 2, 0, "Parameter"); + qmlRegisterType(uri, 2, 0, "ParameterMapping"); + qmlRegisterExtendedType(uri, 2, 0, "Material"); + qmlRegisterExtendedType(uri, 2, 0, "RenderPass"); + qmlRegisterType(uri, 2, 0, "ShaderProgram"); + qmlRegisterUncreatableType(uri, 2, 0, "QShaderData", "Quick3D should instantiate Quick3DShaderData only"); + qmlRegisterType(uri, 2, 0, "ShaderDataArray"); + qmlRegisterType(uri, 2, 0, "ShaderData"); + + // Textures + qmlRegisterType(uri, 2, 0, "WrapMode");//, QStringLiteral("QTextureWrapMode cannot be created from QML")); + qmlRegisterUncreatableType(uri, 2, 0, "Texture", QStringLiteral("Texture should be created from one of the subclasses")); + qmlRegisterExtendedType(uri, 2, 0, "Texture1D"); + qmlRegisterExtendedType(uri, 2, 0, "Texture1DArray"); + qmlRegisterExtendedType(uri, 2, 0, "Texture2D"); + qmlRegisterExtendedType(uri, 2, 0, "Texture2DArray"); + qmlRegisterExtendedType(uri, 2, 0, "Texture3D"); + qmlRegisterExtendedType(uri, 2, 0, "TextureCubeMap"); + qmlRegisterExtendedType(uri, 2, 0, "TextureCubeMapArray"); + qmlRegisterExtendedType(uri, 2, 0, "Texture2DMultisample"); + qmlRegisterExtendedType(uri, 2, 0, "Texture2DMultisampleArray"); + qmlRegisterExtendedType(uri, 2, 0, "TextureRectangle"); + qmlRegisterExtendedType(uri, 2, 0, "TextureBuffer"); + qmlRegisterUncreatableType(uri, 2, 0, "QAbstractTextureImage", QStringLiteral("QAbstractTextureImage is abstract")); + qmlRegisterType(uri, 2, 0, "TextureImage"); + + // Meshes + qmlRegisterUncreatableType(uri, 2, 0, "QAbstractMesh", QStringLiteral("QAbstractMesh is abstract")); + qmlRegisterType(uri, 2, 0, "Mesh"); + qmlRegisterType(uri, 2, 0, "CuboidMesh"); + qmlRegisterType(uri, 2, 0, "CylinderMesh"); + qmlRegisterType(uri, 2, 0, "PlaneMesh"); + qmlRegisterType(uri, 2, 0, "TorusMesh"); + qmlRegisterType(uri, 2, 0, "SphereMesh"); + + // Layers + qmlRegisterType(uri, 2, 0, "Layer"); + qmlRegisterType(uri, 2, 0, "LayerFilter"); + + // Lights + qmlRegisterUncreatableType(uri, 2, 0, "QAbstractLight", QStringLiteral("QAbstractLight is abstract")); + qmlRegisterType(uri, 2, 0, "PointLight"); + qmlRegisterType(uri, 2, 0, "DirectionalLight"); + qmlRegisterType(uri, 2, 0, "SpotLight"); + + // FrameGraph + qmlRegisterExtendedType(uri, 2, 0, "CameraSelector"); + qmlRegisterExtendedType(uri, 2, 0, "RenderPassFilter"); + qmlRegisterExtendedType(uri, 2, 0, "TechniqueFilter"); + qmlRegisterExtendedType(uri, 2, 0, "Viewport"); + qmlRegisterExtendedType(uri, 2, 0, "RenderTargetSelector"); + qmlRegisterType(uri, 2, 0, "ClearBuffer"); + qmlRegisterUncreatableType(uri, 2, 0, "FrameGraphNode", QStringLiteral("FrameGraphNode is a base class")); + qmlRegisterExtendedType(uri, 2, 0, "StateSet"); + qmlRegisterType(uri, 2, 0, "NoDraw"); + qmlRegisterType(uri, 2, 0, "FrameGraph"); + + // RenderTarget + qmlRegisterType(uri, 2, 0, "RenderAttachment"); + qmlRegisterExtendedType(uri, 2, 0, "RenderTarget"); + + // Sorting + qmlRegisterType(uri, 2, 0, "SortCriterion"); + qmlRegisterExtendedType(uri, 2, 0, "SortMethod"); + + // RenderStates + qmlRegisterUncreatableType(uri, 2, 0, "RenderState", QStringLiteral("QRenderState is a base class")); + qmlRegisterType(uri, 2, 0, "BlendState"); + qmlRegisterType(uri, 2, 0, "BlendStateSeparate"); + qmlRegisterType(uri, 2, 0, "BlendEquation"); + qmlRegisterType(uri, 2, 0, "AlphaTest"); + qmlRegisterType(uri, 2, 0, "DepthTest"); + qmlRegisterType(uri, 2, 0, "DepthMask"); + qmlRegisterType(uri, 2, 0, "CullFace"); + qmlRegisterType(uri, 2, 0, "FrontFace"); + qmlRegisterType(uri, 2, 0, "StencilTest"); + qmlRegisterType(uri, 2, 0, "ScissorTest"); + qmlRegisterType(uri, 2, 0, "Dithering"); + qmlRegisterType(uri, 2, 0, "AlphaCoverage"); + qmlRegisterType(uri, 2, 0, "PolygonOffset"); + qmlRegisterType(uri, 2, 0, "ColorMask"); + + // Register types provided as QML files compiled into the plugin + for (int i = 0; i < int(sizeof(qmldir) / sizeof(qmldir[0])); i++) { + QString path = QStringLiteral("qrc:/Qt3D/Render/defaults/qml/"); + qmlRegisterType(QUrl(path + qmldir[i].type + QStringLiteral(".qml")), + uri, + qmldir[i].major, qmldir[i].minor, + qmldir[i].type); + } +} + +QT_END_NAMESPACE + + diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.h b/src/quick3d/imports/render/qt3dquick3drendererplugin.h new file mode 100644 index 000000000..50105d5ae --- /dev/null +++ b/src/quick3d/imports/render/qt3dquick3drendererplugin.h @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT3DQUICK3DRENDERPLUGIN_H +#define QT3DQUICK3DRENDERPLUGIN_H + +#include + +QT_BEGIN_NAMESPACE + +class Qt3DQuick3DRendererPlugin : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") +public: + void registerTypes(const char *uri) Q_DECL_OVERRIDE; +}; + +QT_END_NAMESPACE + +#endif // QT3DQUICK3DRENDERPLUGIN_H diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp deleted file mode 100644 index 4c3959c93..000000000 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ /dev/null @@ -1,253 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "qt3dquick3drenderplugin.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static void initResources() -{ - Q_INIT_RESOURCE(defaults); -} - -QT_BEGIN_NAMESPACE - -static const struct { - const char *type; - int major, minor; -} qmldir [] = { - // Materials - { "PhongMaterial", 2, 0 }, - { "DiffuseMapMaterial", 2, 0 }, - { "DiffuseSpecularMapMaterial", 2, 0 }, - { "NormalDiffuseMapAlphaMaterial", 2, 0 }, - { "NormalDiffuseMapMaterial", 2, 0 }, - { "NormalDiffuseSpecularMapMaterial", 2, 0 }, - { "PerVertexColorMaterial", 2, 0 }, - // FrameGraphs - { "ForwardRenderer", 2, 0 }, - // Entities - { "SkyboxEntity", 2, 0 } -}; - -QVariantList Quick3DShaderDataArrayToVariantListConverter(Qt3D::Render::Quick::Quick3DShaderDataArray *array) -{ - QList arrayValues = array->values(); - QVariantList values; - values.reserve(arrayValues.size()); - Q_FOREACH (Qt3D::QShaderData *data, arrayValues) - values.append(QVariant::fromValue(data)); - return values; -} - -void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) -{ - // Init resources for defaults QML files - initResources(); - - // Converters - QMetaType::registerConverter(Quick3DShaderDataArrayToVariantListConverter); - - // @uri Qt3D.Render - qmlRegisterUncreatableType(uri, 2, 0, "QAbstractSceneLoader", "QAbstractScene is abstract"); - qmlRegisterExtendedType(uri, 2, 0, "SceneLoader"); -// qmlRegisterCustomType(uri, 2, 0, "Effect", new Qt3D::Render::Quick::ShaderPropertyParser()); - qmlRegisterExtendedType(uri, 2, 0, "Effect"); - qmlRegisterExtendedType(uri, 2, 0, "Technique"); - qmlRegisterType(uri, 2, 0, "Annotation"); - qmlRegisterType(uri, 2, 0, "OpenGLFilter"); - qmlRegisterUncreatableType(uri, 2, 0, "QParameter", "Quick3D should instantiate Quick3DParameter only"); - qmlRegisterType(uri, 2, 0, "Parameter"); - qmlRegisterType(uri, 2, 0, "ParameterMapping"); - qmlRegisterExtendedType(uri, 2, 0, "Material"); - qmlRegisterExtendedType(uri, 2, 0, "RenderPass"); - qmlRegisterType(uri, 2, 0, "ShaderProgram"); - qmlRegisterUncreatableType(uri, 2, 0, "QShaderData", "Quick3D should instantiate Quick3DShaderData only"); - qmlRegisterType(uri, 2, 0, "ShaderDataArray"); - qmlRegisterType(uri, 2, 0, "ShaderData"); - - // Textures - qmlRegisterType(uri, 2, 0, "WrapMode");//, QStringLiteral("QTextureWrapMode cannot be created from QML")); - qmlRegisterUncreatableType(uri, 2, 0, "Texture", QStringLiteral("Texture should be created from one of the subclasses")); - qmlRegisterExtendedType(uri, 2, 0, "Texture1D"); - qmlRegisterExtendedType(uri, 2, 0, "Texture1DArray"); - qmlRegisterExtendedType(uri, 2, 0, "Texture2D"); - qmlRegisterExtendedType(uri, 2, 0, "Texture2DArray"); - qmlRegisterExtendedType(uri, 2, 0, "Texture3D"); - qmlRegisterExtendedType(uri, 2, 0, "TextureCubeMap"); - qmlRegisterExtendedType(uri, 2, 0, "TextureCubeMapArray"); - qmlRegisterExtendedType(uri, 2, 0, "Texture2DMultisample"); - qmlRegisterExtendedType(uri, 2, 0, "Texture2DMultisampleArray"); - qmlRegisterExtendedType(uri, 2, 0, "TextureRectangle"); - qmlRegisterExtendedType(uri, 2, 0, "TextureBuffer"); - qmlRegisterUncreatableType(uri, 2, 0, "QAbstractTextureImage", QStringLiteral("QAbstractTextureImage is abstract")); - qmlRegisterType(uri, 2, 0, "TextureImage"); - - // Meshes - qmlRegisterUncreatableType(uri, 2, 0, "QAbstractMesh", QStringLiteral("QAbstractMesh is abstract")); - qmlRegisterType(uri, 2, 0, "Mesh"); - qmlRegisterType(uri, 2, 0, "CuboidMesh"); - qmlRegisterType(uri, 2, 0, "CylinderMesh"); - qmlRegisterType(uri, 2, 0, "PlaneMesh"); - qmlRegisterType(uri, 2, 0, "TorusMesh"); - qmlRegisterType(uri, 2, 0, "SphereMesh"); - - // Layers - qmlRegisterType(uri, 2, 0, "Layer"); - qmlRegisterType(uri, 2, 0, "LayerFilter"); - - // Lights - qmlRegisterUncreatableType(uri, 2, 0, "QAbstractLight", QStringLiteral("QAbstractLight is abstract")); - qmlRegisterType(uri, 2, 0, "PointLight"); - qmlRegisterType(uri, 2, 0, "DirectionalLight"); - qmlRegisterType(uri, 2, 0, "SpotLight"); - - // FrameGraph - qmlRegisterExtendedType(uri, 2, 0, "CameraSelector"); - qmlRegisterExtendedType(uri, 2, 0, "RenderPassFilter"); - qmlRegisterExtendedType(uri, 2, 0, "TechniqueFilter"); - qmlRegisterExtendedType(uri, 2, 0, "Viewport"); - qmlRegisterExtendedType(uri, 2, 0, "RenderTargetSelector"); - qmlRegisterType(uri, 2, 0, "ClearBuffer"); - qmlRegisterUncreatableType(uri, 2, 0, "FrameGraphNode", QStringLiteral("FrameGraphNode is a base class")); - qmlRegisterExtendedType(uri, 2, 0, "StateSet"); - qmlRegisterType(uri, 2, 0, "NoDraw"); - qmlRegisterType(uri, 2, 0, "FrameGraph"); - - // RenderTarget - qmlRegisterType(uri, 2, 0, "RenderAttachment"); - qmlRegisterExtendedType(uri, 2, 0, "RenderTarget"); - - // Sorting - qmlRegisterType(uri, 2, 0, "SortCriterion"); - qmlRegisterExtendedType(uri, 2, 0, "SortMethod"); - - // RenderStates - qmlRegisterUncreatableType(uri, 2, 0, "RenderState", QStringLiteral("QRenderState is a base class")); - qmlRegisterType(uri, 2, 0, "BlendState"); - qmlRegisterType(uri, 2, 0, "BlendStateSeparate"); - qmlRegisterType(uri, 2, 0, "BlendEquation"); - qmlRegisterType(uri, 2, 0, "AlphaTest"); - qmlRegisterType(uri, 2, 0, "DepthTest"); - qmlRegisterType(uri, 2, 0, "DepthMask"); - qmlRegisterType(uri, 2, 0, "CullFace"); - qmlRegisterType(uri, 2, 0, "FrontFace"); - qmlRegisterType(uri, 2, 0, "StencilTest"); - qmlRegisterType(uri, 2, 0, "ScissorTest"); - qmlRegisterType(uri, 2, 0, "Dithering"); - qmlRegisterType(uri, 2, 0, "AlphaCoverage"); - qmlRegisterType(uri, 2, 0, "PolygonOffset"); - qmlRegisterType(uri, 2, 0, "ColorMask"); - - // Register types provided as QML files compiled into the plugin - for (int i = 0; i < int(sizeof(qmldir) / sizeof(qmldir[0])); i++) { - QString path = QStringLiteral("qrc:/Qt3D/Render/defaults/qml/"); - qmlRegisterType(QUrl(path + qmldir[i].type + QStringLiteral(".qml")), - uri, - qmldir[i].major, qmldir[i].minor, - qmldir[i].type); - } -} - -QT_END_NAMESPACE - - diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.h b/src/quick3d/imports/render/qt3dquick3drenderplugin.h deleted file mode 100644 index 05aceab7f..000000000 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DQUICK3DRENDERPLUGIN_H -#define QT3DQUICK3DRENDERPLUGIN_H - -#include - -QT_BEGIN_NAMESPACE - -class Qt3DQuick3DRenderPlugin : public QQmlExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") -public: - void registerTypes(const char *uri) Q_DECL_OVERRIDE; -}; - -QT_END_NAMESPACE - -#endif // QT3DQUICK3DRENDERPLUGIN_H diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp index 754e90ed3..345bff596 100644 --- a/src/render/frontend/framegraph-components/qframegraph.cpp +++ b/src/render/frontend/framegraph-components/qframegraph.cpp @@ -74,7 +74,7 @@ QFrameGraphPrivate::QFrameGraphPrivate() \qmltype FrameGraph \instantiates Qt3D::QFrameGraph \inherits Component3D - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief For OpenGL ... */ @@ -105,7 +105,7 @@ QFrameGraph::QFrameGraph(QFrameGraphPrivate &dd, QNode *parent) } /*! - \qmlproperty Qt3D.Render::FrameGraphNode Qt3D.Render::FrameGraph::activeFrameGraph + \qmlproperty Qt3D.Renderer::FrameGraphNode Qt3D.Renderer::FrameGraph::activeFrameGraph Holds the current activeFrameGraph root node. */ diff --git a/src/render/frontend/framegraph-components/qframegraphnode.cpp b/src/render/frontend/framegraph-components/qframegraphnode.cpp index 2f81b786e..9f4d10baa 100644 --- a/src/render/frontend/framegraph-components/qframegraphnode.cpp +++ b/src/render/frontend/framegraph-components/qframegraphnode.cpp @@ -65,7 +65,7 @@ QFrameGraphNodePrivate::QFrameGraphNodePrivate() /*! \qmltype FrameGraphNode - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \instantiates QFrameGraphNode \inherits Node \since 5.5 @@ -103,7 +103,7 @@ QFrameGraphNode::QFrameGraphNode(QFrameGraphNodePrivate &dd, QNode *parent) } /*! - \qmlproperty bool Qt3D.Render::FrameGraphNode::enabled + \qmlproperty bool Qt3D.Renderer::FrameGraphNode::enabled Holds whether the frame graph node is enabled or disabled. */ diff --git a/src/render/frontend/framegraph-components/qlayerfilter.cpp b/src/render/frontend/framegraph-components/qlayerfilter.cpp index cfccfb987..5d52b517e 100644 --- a/src/render/frontend/framegraph-components/qlayerfilter.cpp +++ b/src/render/frontend/framegraph-components/qlayerfilter.cpp @@ -62,7 +62,7 @@ QLayerFilterPrivate::QLayerFilterPrivate() \qmltype LayerFilter \instantiates Qt3D::QLayerFilter \inherits FrameGraphNode - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief For ... */ @@ -98,7 +98,7 @@ QLayerFilter::QLayerFilter(QLayerFilterPrivate &dd, QNode *parent) */ /*! - \qmlproperty stringlist Qt3D.Render::LayerFilter::layers + \qmlproperty stringlist Qt3D.Renderer::LayerFilter::layers */ diff --git a/src/render/frontend/qabstracttextureimage.cpp b/src/render/frontend/qabstracttextureimage.cpp index 96d679df6..c26503db9 100644 --- a/src/render/frontend/qabstracttextureimage.cpp +++ b/src/render/frontend/qabstracttextureimage.cpp @@ -51,7 +51,7 @@ namespace Qt3D { \qmltype AbstractTextureImage \instantiates Qt3D::QAbstractTextureImage \inherits Node - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \qmlabstract \since 5.5 \brief Encapsulates the necessary information to create an OpenGL texture image. @@ -110,7 +110,7 @@ int QAbstractTextureImage::mipmapLevel() const } /*! - \qmlproperty int Qt3D.Render::AbstractTextureImage::layer + \qmlproperty int Qt3D.Renderer::AbstractTextureImage::layer Holds the layer of the texture image. */ @@ -127,7 +127,7 @@ int QAbstractTextureImage::layer() const } /*! - \qmlproperty enumeration Qt3D.Render::AbstractTextureImage::cubeMapFace + \qmlproperty enumeration Qt3D.Renderer::AbstractTextureImage::cubeMapFace Holds the cube map face of the texture image. diff --git a/src/render/frontend/qannotation.cpp b/src/render/frontend/qannotation.cpp index 0476e1d6a..e04c26047 100644 --- a/src/render/frontend/qannotation.cpp +++ b/src/render/frontend/qannotation.cpp @@ -64,7 +64,7 @@ QAnnotationPrivate::QAnnotationPrivate() \qmltype Annotation \instantiates Qt3D::QAnnotation \inherits Node - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief For annotating ... */ @@ -112,7 +112,7 @@ void QAnnotation::setName(const QString &name) */ /*! - \qmlproperty variant Qt3D.Render::Annotation::value + \qmlproperty variant Qt3D.Renderer::Annotation::value */ QVariant QAnnotation::value() const @@ -127,7 +127,7 @@ QVariant QAnnotation::value() const */ /*! - \qmlproperty string Qt3D.Render::Annotation::name + \qmlproperty string Qt3D.Renderer::Annotation::name */ QString QAnnotation::name() const diff --git a/src/render/frontend/qblendstate.cpp b/src/render/frontend/qblendstate.cpp index 642ce03ab..b1c80f76e 100644 --- a/src/render/frontend/qblendstate.cpp +++ b/src/render/frontend/qblendstate.cpp @@ -75,7 +75,7 @@ public: \qmltype BlendState \instantiates Qt3D::QBlendState \inherits RenderState - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief Encapsulates blending information */ @@ -241,7 +241,7 @@ void QBlendState::setDstAlpha(QBlendState::Blending dstAlpha) \qmltype BlendStateSeparate \instantiates Qt3D::QBlendStateSeparate \inherits RenderState - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief Encapsulates blending information */ diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp index afef8df3f..c3767baf5 100644 --- a/src/render/frontend/qlayer.cpp +++ b/src/render/frontend/qlayer.cpp @@ -61,7 +61,7 @@ QLayerPrivate::QLayerPrivate() \qmltype Layer \instantiates Qt3D::QLayer \inherits Component3D - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief For ... */ @@ -98,7 +98,7 @@ QLayer::QLayer(QLayerPrivate &dd, QNode *parent) */ /*! - \qmlproperty stringlist Qt3D.Render::Layer::names + \qmlproperty stringlist Qt3D.Renderer::Layer::names */ diff --git a/src/render/frontend/qopenglfilter.cpp b/src/render/frontend/qopenglfilter.cpp index c6bf6da1a..101c28366 100644 --- a/src/render/frontend/qopenglfilter.cpp +++ b/src/render/frontend/qopenglfilter.cpp @@ -74,7 +74,7 @@ public: \qmltype OpenGLFilter \instantiates Qt3D::QOpenGLFilter \inherits QtObject - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief For OpenGL ... */ @@ -124,7 +124,7 @@ void QOpenGLFilter::copy(const QOpenGLFilter &ref) */ /*! - \qmlproperty enumeration Qt3D.Render::OpenGLFilter::api + \qmlproperty enumeration Qt3D.Renderer::OpenGLFilter::api \value ES QSurfaceFormat::OpenGLES @@ -143,7 +143,7 @@ QOpenGLFilter::Api QOpenGLFilter::api() const */ /*! - \qmlproperty enumeration Qt3D.Render::OpenGLFilter::profile + \qmlproperty enumeration Qt3D.Renderer::OpenGLFilter::profile \value None QSurfaceFormat::NoProfile \value Core QSurfaceFormat::CoreProfile @@ -162,7 +162,7 @@ QOpenGLFilter::Profile QOpenGLFilter::profile() const */ /*! - \qmlproperty int Qt3D.Render::OpenGLFilter::minorVersion + \qmlproperty int Qt3D.Renderer::OpenGLFilter::minorVersion */ @@ -178,7 +178,7 @@ int QOpenGLFilter::minorVersion() const */ /*! - \qmlproperty int Qt3D.Render::OpenGLFilter::majorVersion + \qmlproperty int Qt3D.Renderer::OpenGLFilter::majorVersion */ @@ -194,7 +194,7 @@ int QOpenGLFilter::majorVersion() const */ /*! - \qmlproperty stringlist Qt3D.Render::OpenGLFilter::extensions + \qmlproperty stringlist Qt3D.Renderer::OpenGLFilter::extensions */ @@ -210,7 +210,7 @@ QStringList QOpenGLFilter::extensions() const */ /*! - \qmlproperty string Qt3D.Render::OpenGLFilter::vendor + \qmlproperty string Qt3D.Renderer::OpenGLFilter::vendor */ diff --git a/src/render/frontend/qparametermapping.cpp b/src/render/frontend/qparametermapping.cpp index e2b266f8d..6214e2a17 100644 --- a/src/render/frontend/qparametermapping.cpp +++ b/src/render/frontend/qparametermapping.cpp @@ -61,7 +61,7 @@ QParameterMappingPrivate::QParameterMappingPrivate() \qmltype ParameterMapping \instantiates Qt3D::QParameterMapping \inherits Node - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief For ... */ @@ -121,7 +121,7 @@ QParameterMapping::QParameterMapping(const QString ¶meterName, const QString */ /*! - \qmlproperty string Qt3D.Render::ParameterMapping::parameterName + \qmlproperty string Qt3D.Renderer::ParameterMapping::parameterName */ @@ -140,7 +140,7 @@ void QParameterMapping::setParameterName(const QString &name) */ /*! - \qmlproperty string Qt3D.Render::ParameterMapping::shaderVariableName + \qmlproperty string Qt3D.Renderer::ParameterMapping::shaderVariableName */ @@ -159,7 +159,7 @@ void QParameterMapping::setShaderVariableName(const QString &name) */ /*! - \qmlproperty BindingType Qt3D.Render::ParameterMapping::bindingType + \qmlproperty BindingType Qt3D.Renderer::ParameterMapping::bindingType \value Uniform \value Attribute diff --git a/src/render/frontend/qpointlight.cpp b/src/render/frontend/qpointlight.cpp index 77cb68954..f4ade9b5d 100644 --- a/src/render/frontend/qpointlight.cpp +++ b/src/render/frontend/qpointlight.cpp @@ -78,7 +78,7 @@ QPointLightPrivate::QPointLightPrivate() \qmltype PointLight \instantiates Qt3D::QPointLight \inherits AbstractLight - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief For OpenGL ... */ diff --git a/src/render/frontend/qspotlight.cpp b/src/render/frontend/qspotlight.cpp index cef18fe10..2eb947d64 100644 --- a/src/render/frontend/qspotlight.cpp +++ b/src/render/frontend/qspotlight.cpp @@ -83,7 +83,7 @@ QSpotLightPrivate::QSpotLightPrivate() \qmltype SpotLight \instantiates Qt3D::QSpotLight \inherits AbstractLight - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief For OpenGL ... */ @@ -119,7 +119,7 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent) } /*! - \qmlproperty vector3d Qt3D.Render::SpotLight::direction + \qmlproperty vector3d Qt3D.Renderer::SpotLight::direction */ @@ -136,7 +136,7 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent) /*! - \qmlproperty float Qt3D.Render::SpotLight::cutOffAngle + \qmlproperty float Qt3D.Renderer::SpotLight::cutOffAngle */ diff --git a/src/render/frontend/qtextureimage.cpp b/src/render/frontend/qtextureimage.cpp index e3ada359a..4596bf943 100644 --- a/src/render/frontend/qtextureimage.cpp +++ b/src/render/frontend/qtextureimage.cpp @@ -106,7 +106,7 @@ private: \qmltype TextureImage \instantiates Qt3D::QTextureImage \inherits AbstractTextureImage - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief Encapsulates the necessary information to create an OpenGL texture image from an image source. @@ -144,7 +144,7 @@ QUrl QTextureImage::source() const */ /*! - \qmlproperty url Qt3D.Render::TextureImage::source + \qmlproperty url Qt3D.Renderer::TextureImage::source This property holdsthe source url from which data for the texture image will be loaded. diff --git a/src/render/renderlogging.cpp b/src/render/renderlogging.cpp index 95bb88a8f..c5823c6dc 100644 --- a/src/render/renderlogging.cpp +++ b/src/render/renderlogging.cpp @@ -42,16 +42,16 @@ namespace Qt3D { namespace Render { -Q_LOGGING_CATEGORY(Backend, "Qt3D.Render.Backend") -Q_LOGGING_CATEGORY(Frontend, "Qt3D.Render.Frontend") -Q_LOGGING_CATEGORY(Io, "Qt3D.Render.IO") -Q_LOGGING_CATEGORY(Jobs, "Qt3D.Render.Jobs") -Q_LOGGING_CATEGORY(Framegraph, "Qt3D.Render.Framegraph") -Q_LOGGING_CATEGORY(RenderNodes, "Qt3D.Render.RenderNodes") -Q_LOGGING_CATEGORY(Rendering, "Qt3D.Render.Rendering") -Q_LOGGING_CATEGORY(Memory, "Qt3D.Render.Memory") -Q_LOGGING_CATEGORY(Shaders, "Qt3D.Render.Shaders") -Q_LOGGING_CATEGORY(RenderStates, "Qt3D.Render.RenderStates") +Q_LOGGING_CATEGORY(Backend, "Qt3D.Renderer.Backend") +Q_LOGGING_CATEGORY(Frontend, "Qt3D.Renderer.Frontend") +Q_LOGGING_CATEGORY(Io, "Qt3D.Renderer.IO") +Q_LOGGING_CATEGORY(Jobs, "Qt3D.Renderer.Jobs") +Q_LOGGING_CATEGORY(Framegraph, "Qt3D.Renderer.Framegraph") +Q_LOGGING_CATEGORY(RenderNodes, "Qt3D.Renderer.RenderNodes") +Q_LOGGING_CATEGORY(Rendering, "Qt3D.Renderer.Rendering") +Q_LOGGING_CATEGORY(Memory, "Qt3D.Renderer.Memory") +Q_LOGGING_CATEGORY(Shaders, "Qt3D.Renderer.Shaders") +Q_LOGGING_CATEGORY(RenderStates, "Qt3D.Renderer.RenderStates") } // Render -- cgit v1.2.3