summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-01-19 14:05:21 +0000
committerSean Harmer <sean.harmer@kdab.com>2016-01-19 14:35:48 +0000
commit0dacd686a106dfe677161e1bb01c2f5780c7540b (patch)
tree415f7edf620f1058e3bd5081fde4c6c435be8daf /examples
parent7678557c2d2135b9c34c3402146d126cc1eed0b0 (diff)
Adapt Scene3D example to use automatic aspect ratio mode
Change-Id: Iba759f89d33779a85010a3a1dc915358b24ab033 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/qt3d/scene3d/AnimatedEntity.qml15
-rw-r--r--examples/qt3d/scene3d/main.qml6
2 files changed, 5 insertions, 16 deletions
diff --git a/examples/qt3d/scene3d/AnimatedEntity.qml b/examples/qt3d/scene3d/AnimatedEntity.qml
index ba7cf4ff1..c09f48d7a 100644
--- a/examples/qt3d/scene3d/AnimatedEntity.qml
+++ b/examples/qt3d/scene3d/AnimatedEntity.qml
@@ -47,7 +47,6 @@ Entity {
id: camera
projectionType: CameraLens.PerspectiveProjection
fieldOfView: 45
- aspectRatio: 16/9
nearPlane : 0.1
farPlane : 1000.0
position: Qt.vector3d( 0.0, 0.0, 40.0 )
@@ -59,19 +58,9 @@ Entity {
components: [
FrameGraph {
- activeFrameGraph: Viewport {
- id: viewport
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
+ activeFrameGraph: ForwardRenderer {
+ camera: camera
clearColor: "transparent"
-
- CameraSelector {
- id : cameraSelector
- camera: camera
-
- ClearBuffer {
- buffers : ClearBuffer.ColorDepthBuffer
- }
- }
}
}
]
diff --git a/examples/qt3d/scene3d/main.qml b/examples/qt3d/scene3d/main.qml
index 6419309a8..9e5dbd0bd 100644
--- a/examples/qt3d/scene3d/main.qml
+++ b/examples/qt3d/scene3d/main.qml
@@ -64,9 +64,8 @@ Item {
Rectangle {
id: scene
- width: Math.min(parent.width, parent.height) - 100
- height: width
- anchors.centerIn: parent
+ anchors.fill: parent
+ anchors.margins: 50
color: "darkRed"
transform: Rotation {
@@ -84,6 +83,7 @@ Item {
anchors.margins: 10
focus: true
aspects: "input"
+ cameraAspectRatioMode: Scene3D.AutomaticAspectRatio
AnimatedEntity {}
}