diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /tests/manual/lod/main.qml | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'tests/manual/lod/main.qml')
| -rw-r--r-- | tests/manual/lod/main.qml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/manual/lod/main.qml b/tests/manual/lod/main.qml index 8d9c8722a..80547dcff 100644 --- a/tests/manual/lod/main.qml +++ b/tests/manual/lod/main.qml @@ -49,9 +49,9 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Render 2.2 +import Qt3D.Render 2.9 import Qt3D.Input 2.0 -import Qt3D.Extras 2.2 +import Qt3D.Extras 2.9 import QtQuick 2.0 as QQ2 @@ -126,10 +126,8 @@ Entity { id: lod camera: camera thresholds: [1000, 600, 300, 180] - thresholdType: LevelOfDetail.ProjectedScreenPixelSize - volumeOverride: BoundingSphere { - radius: 2. - } + thresholdType: LevelOfDetail.ProjectedScreenPixelSizeThreshold + volumeOverride: lod.createBoundingSphere(Qt.vector3d(0, 0, 0), 2.0) } ] } @@ -143,6 +141,7 @@ Entity { ] LevelOfDetailLoader { + id: lodLoader components: [ Transform { scale: .5 translation: Qt.vector3d(-8, 0, 0) @@ -150,8 +149,8 @@ Entity { camera: camera thresholds: [20, 35, 50, 65] - thresholdType: LevelOfDetail.DistanceToCamera - volumeOverride: null + thresholdType: LevelOfDetail.DistanceToCameraThreshold + volumeOverride: lodLoader.createBoundingSphere(Qt.vector3d(0, 0, 0), -1) sources: ["qrc:/SphereEntity.qml", "qrc:/CylinderEntity.qml", "qrc:/ConeEntity.qml", "qrc:/CuboidEntity.qml"] } } @@ -172,7 +171,7 @@ Entity { LevelOfDetailSwitch { camera: camera thresholds: [20, 35, 50, 65] - thresholdType: LevelOfDetail.DistanceToCamera + thresholdType: LevelOfDetail.DistanceToCameraThreshold } ] |