summaryrefslogtreecommitdiffstats
path: root/examples/qt3d
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2016-04-27 08:48:21 +0100
committerMike Krus <mike.krus@kdab.com>2016-05-02 08:49:22 +0000
commit617e4c768616868a3e306668630efdfca69604d7 (patch)
tree5dbcdada95beab8e7fac10a06abad44f0ff6547e /examples/qt3d
parented6d778b20d0cdf2968e8d68085d33791ac33c49 (diff)
Fixed picking example
Change-Id: I6255a1857d8de02bdc5f9ee6326a76b7c36d258e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d')
-rw-r--r--examples/qt3d/picking-qml/PickableEntity.qml5
-rw-r--r--examples/qt3d/picking-qml/main.qml12
2 files changed, 4 insertions, 13 deletions
diff --git a/examples/qt3d/picking-qml/PickableEntity.qml b/examples/qt3d/picking-qml/PickableEntity.qml
index b79de127a..f3cdb790b 100644
--- a/examples/qt3d/picking-qml/PickableEntity.qml
+++ b/examples/qt3d/picking-qml/PickableEntity.qml
@@ -50,6 +50,7 @@
import Qt3D.Core 2.0
import Qt3D.Render 2.0
+import Qt3D.Extras 2.0
Entity {
id: root
@@ -64,7 +65,6 @@ Entity {
property real z: 0
property alias scale: transform.scale
property alias hoverEnabled: objectPicker.hoverEnabled
- property alias recursive: debugVolume.recursive
property alias diffuseColor: material.diffuse
property alias ambientColor: material.ambient
readonly property bool containsMouse: objectPicker.containsMouse
@@ -81,7 +81,6 @@ Entity {
onExited: root.exited();
}
- BoundingVolumeDebug { id: debugVolume }
PhongMaterial { id: material }
Transform {
@@ -94,6 +93,6 @@ Entity {
names: "content"
}
- components: [mesh, material, transform, debugVolume, objectPicker, layer]
+ components: [mesh, material, transform, objectPicker, layer]
}
diff --git a/examples/qt3d/picking-qml/main.qml b/examples/qt3d/picking-qml/main.qml
index fcc122e47..64b79f819 100644
--- a/examples/qt3d/picking-qml/main.qml
+++ b/examples/qt3d/picking-qml/main.qml
@@ -162,9 +162,6 @@ Entity {
onClicked: {
console.log("Clicked cube 2")
toggled = !toggled
- sceneItem.width = _view.width * (toggled ? .7 : .5)
- sceneItem.height = _view.height * (toggled ? .7 : .5)
- console.log(sceneItem.width, sceneItem.height)
}
}
PickableEntity {
@@ -195,11 +192,7 @@ Entity {
onExited: cube4.material.diffuse = "blue"
}
- readonly property BoundingVolumeDebug debugVolume: BoundingVolumeDebug {
- recursive: true
- }
-
- components: [objectPicker, debugVolume]
+ components: [objectPicker]
Entity {
id: cube4
@@ -212,10 +205,9 @@ Entity {
translation: Qt.vector3d(3, 4, 0)
}
readonly property Layer layer: Layer { names: "content" }
- readonly property BoundingVolumeDebug debugVolume: BoundingVolumeDebug {}
readonly property PhongMaterial material: PhongMaterial { diffuse: "red" }
- components: [cubeMesh, transform, material, debugVolume, layer]
+ components: [cubeMesh, transform, material, layer]
}
}
}