diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-18 10:08:41 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-18 10:54:59 +0000 |
| commit | 4b4a407512fdd4cc0a2f7caa463b7b03520b3f62 (patch) | |
| tree | e66ecb95b53b8e0a9e263772147ef1201fa9ece7 /examples/qt3d/materials | |
| parent | d401456e1b1a3d0f4c043137a3cff935c0c8aa0e (diff) | |
Temporarily expose window to QML context
Allows to restore most of the QML examples using this approach until a
more permanent solution can be developed (I have an idea on how to do
this and will try it today).
Change-Id: I9b9bb86a5323140be3ed2456cdfa91b1f93187b1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/materials')
| -rw-r--r-- | examples/qt3d/materials/SortedForwardRenderer.qml | 39 | ||||
| -rw-r--r-- | examples/qt3d/materials/main.qml | 1 |
2 files changed, 23 insertions, 17 deletions
diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml index 9d09f0a29..2f2e72e6e 100644 --- a/examples/qt3d/materials/SortedForwardRenderer.qml +++ b/examples/qt3d/materials/SortedForwardRenderer.qml @@ -43,28 +43,33 @@ TechniqueFilter { // Expose camera to allow user to choose which camera to use for rendering property alias camera: cameraSelector.camera + property alias window: surfaceSelector.window // Select the forward rendering Technique of any used Effect requires: [ Annotation { name: "renderingStyle"; value: "forward" } ] - // Use the whole viewport - Viewport { - id: viewport - objectName : "viewport" - rect: Qt.rect(0.0, 0.0, 1.0, 1.0) - clearColor: "white" + RenderSurfaceSelector { + id: surfaceSelector - // Use the specified camera - CameraSelector { - id : cameraSelector - objectName : "cameraSelector" - ClearBuffer { - buffers : ClearBuffer.ColorDepthBuffer - SortMethod { - criteria: [ - SortCriterion { sort: SortCriterion.StateChangeCost }, - SortCriterion { sort: SortCriterion.Material } - ] + // Use the whole viewport + Viewport { + id: viewport + objectName : "viewport" + rect: Qt.rect(0.0, 0.0, 1.0, 1.0) + clearColor: "white" + + // Use the specified camera + CameraSelector { + id : cameraSelector + objectName : "cameraSelector" + ClearBuffer { + buffers : ClearBuffer.ColorDepthBuffer + SortMethod { + criteria: [ + SortCriterion { sort: SortCriterion.StateChangeCost }, + SortCriterion { sort: SortCriterion.Material } + ] + } } } } diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml index a470e2415..1d94c8c6f 100644 --- a/examples/qt3d/materials/main.qml +++ b/examples/qt3d/materials/main.qml @@ -49,6 +49,7 @@ Entity { activeFrameGraph: SortedForwardRenderer { id: renderer camera: mainCamera + window: _q_window } } ] |