diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-02-25 12:07:13 +0000 |
|---|---|---|
| committer | Robert Brock <robert.brock@kdab.com> | 2016-03-03 09:52:17 +0000 |
| commit | 7f334c8dee3e40ee22e6a3b0be921921487145ab (patch) | |
| tree | dd3844c02fe25e5f0ae3886a220b8e2dbf622c6e /examples | |
| parent | 921a6641ee3b5997ac0a8a3099af02ab1d5585de (diff) | |
QRenderTargetOutput enum
As per API review
renamed FooAttachment to just Foo
Change-Id: Ifd977b2b8bdb6706a70dd10f2ea3ee6a381c26b8
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples')
4 files changed, 10 insertions, 10 deletions
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp index 0c05bfa4f..c9607fdc2 100644 --- a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp +++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp @@ -61,10 +61,10 @@ GBuffer::GBuffer(Qt3DCore::QNode *parent) }; const Qt3DRender::QRenderTargetOutput::AttachmentPoint attachmentPoints[AttachmentsCount] = { - Qt3DRender::QRenderTargetOutput::ColorAttachment0, - Qt3DRender::QRenderTargetOutput::ColorAttachment1, - Qt3DRender::QRenderTargetOutput::ColorAttachment2, - Qt3DRender::QRenderTargetOutput::DepthAttachment + Qt3DRender::QRenderTargetOutput::Color0, + Qt3DRender::QRenderTargetOutput::Color1, + Qt3DRender::QRenderTargetOutput::Color2, + Qt3DRender::QRenderTargetOutput::Depth }; for (int i = 0; i < AttachmentsCount; i++) { diff --git a/examples/qt3d/deferred-renderer-qml/GBuffer.qml b/examples/qt3d/deferred-renderer-qml/GBuffer.qml index 6ed16d9ea..3111704f7 100644 --- a/examples/qt3d/deferred-renderer-qml/GBuffer.qml +++ b/examples/qt3d/deferred-renderer-qml/GBuffer.qml @@ -62,7 +62,7 @@ RenderTarget { RenderTargetOutput { objectName : "color" - attachmentPoint : RenderAttachment.ColorAttachment0 + attachmentPoint : RenderTargetOutput.Color0 texture : Texture2D { id : colorAttachment width : 1024 @@ -79,7 +79,7 @@ RenderTarget { }, RenderTargetOutput { objectName : "position" - attachmentPoint : RenderAttachment.ColorAttachment1 + attachmentPoint : RenderTargetOutput.Color1 texture : Texture2D { id : positionAttachment width : 1024 @@ -98,7 +98,7 @@ RenderTarget { }, RenderTargetOutput { objectName : "normal" - attachmentPoint : RenderAttachment.ColorAttachment2 + attachmentPoint : RenderTargetOutput.Color2 texture : Texture2D { id : normalAttachment width : 1024 @@ -117,7 +117,7 @@ RenderTarget { }, RenderTargetOutput { objectName : "depth" - attachmentPoint : RenderAttachment.DepthAttachment + attachmentPoint : RenderTargetOutput.Depth texture : Texture2D { id : depthAttachment width : 1024 diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml index 0f20b193b..a212a69af 100644 --- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml +++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml @@ -75,7 +75,7 @@ FrameGraph { attachments: [ RenderTargetOutput { name: "depth" - attachmentPoint: RenderTargetOutput.DepthAttachment + attachmentPoint: RenderTargetOutput.Depth texture: Texture2D { id: depthTexture width: mainview.width diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml index 9c9cb7ab0..07c9a9a36 100644 --- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml @@ -71,7 +71,7 @@ FrameGraph { attachments: [ RenderTargetOutput { name: "depth" - attachmentPoint: RenderTargetOutput.DepthAttachment + attachmentPoint: RenderTargetOutput.Depth texture: Texture2D { id: depthTexture width: 1024 |