summaryrefslogtreecommitdiffstats
path: root/examples/qt3d
diff options
context:
space:
mode:
authorJean-Michaƫl Celerier <jean-michael.celerier@kdab.com>2020-07-10 18:42:31 +0200
committerPaul Lemire <paul.lemire@kdab.com>2020-08-05 12:55:03 +0200
commitcc8ab559714977615060a7436f22ae1f9189f4a3 (patch)
tree59673fae55f5107d691b71639479eb89c11287e2 /examples/qt3d
parent2b8eaa3350250bb7afc5105aba2da51685aaed88 (diff)
rhi: Start adding compute support
Change-Id: I37d0e1a0c56b874122e0db3ac60a90d19819630d Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'examples/qt3d')
-rw-r--r--examples/qt3d/compute-particles/ParticlesScene.qml1
-rw-r--r--examples/qt3d/compute-particles/main.qml21
2 files changed, 11 insertions, 11 deletions
diff --git a/examples/qt3d/compute-particles/ParticlesScene.qml b/examples/qt3d/compute-particles/ParticlesScene.qml
index e63c6cb91..2c74f51b5 100644
--- a/examples/qt3d/compute-particles/ParticlesScene.qml
+++ b/examples/qt3d/compute-particles/ParticlesScene.qml
@@ -117,7 +117,6 @@ Entity {
Buffer {
id: particleBuffer
- type: Buffer.VertexBuffer
// struct ParticleData
// {
// vec3 position; // Aligned to 4 floats
diff --git a/examples/qt3d/compute-particles/main.qml b/examples/qt3d/compute-particles/main.qml
index de5666fad..1375b312a 100644
--- a/examples/qt3d/compute-particles/main.qml
+++ b/examples/qt3d/compute-particles/main.qml
@@ -50,7 +50,7 @@
import QtQuick 2.0
import QtQuick.Scene3D 2.0
-import QtQuick.Controls 1.4
+import QtQuick.Controls 2.0
import QtQuick.Layouts 1.1
Item {
@@ -84,8 +84,8 @@ Item {
height: 35
id: stepSlider
Layout.fillWidth: true
- minimumValue: 0.0
- maximumValue: 2
+ from: 0.0
+ to: 2
value: 0.4
}
}
@@ -98,8 +98,8 @@ Item {
height: 35
id: collisionSlider
Layout.fillWidth: true
- minimumValue: 0.0
- maximumValue: 2
+ from: 0.0
+ to: 2
value: 0.2
}
}
@@ -114,31 +114,32 @@ Item {
text: "Particles Shape:"
color: "white"
}
- ExclusiveGroup {
+ ButtonGroup {
+ exclusive: true
id: particlesTypeGroup
}
CheckBox {
text: "Sphere"
checked: true
- exclusiveGroup: particlesTypeGroup
+ ButtonGroup.group: particlesTypeGroup
onClicked: scene.particlesShape = scene._SPHERE
}
CheckBox
{ text: "Cube"
checked: false
- exclusiveGroup: particlesTypeGroup
+ ButtonGroup.group: particlesTypeGroup
onClicked: scene.particlesShape = scene._CUBE
}
CheckBox {
text: "Cylinder"
checked: false
- exclusiveGroup: particlesTypeGroup
+ ButtonGroup.group: particlesTypeGroup
onClicked: scene.particlesShape = scene._CYLINDER
}
CheckBox {
text: "Torus"
checked: false
- exclusiveGroup: particlesTypeGroup
+ ButtonGroup.group: particlesTypeGroup
onClicked: scene.particlesShape = scene._TORUS
}
}