summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BackgroundSwirls.qml20
-rw-r--r--samegame/SameGame.qml14
2 files changed, 17 insertions, 17 deletions
diff --git a/BackgroundSwirls.qml b/BackgroundSwirls.qml
index 01bccd0..68d85c4 100644
--- a/BackgroundSwirls.qml
+++ b/BackgroundSwirls.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import Qt.labs.particles 2.0
+import QtQuick.Particles 2.0
Item {
anchors.fill: parent
@@ -57,24 +57,24 @@ Item {
ParticleSystem{
id: particles
}
- ColoredParticle{
+ ImageParticle{
anchors.fill: parent
system: particles
- image: "images/particle.png"
+ source: "images/particle.png"
alpha: 0
colorVariation: 0.2
}
- TrailEmitter{
+ Emitter{
anchors.fill: parent
system: particles
- particlesPerSecond: Math.sqrt(parent.width * parent.height) / 30
- particleDuration: 2000
+ emitRate: Math.sqrt(parent.width * parent.height) / 30
+ lifeSpan: 2000
emitting: true
- particleSize: 4
- particleSizeVariation: 2
+ size: 4
+ sizeVariation: 2
- acceleration: AngleVector{ angle: 90; angleVariation: 360; magnitude: 10; }
- speed: AngleVector{ angle: -90; angleVariation: 360; magnitude: 5; }
+ acceleration: AngledDirection { angle: 90; angleVariation: 360; magnitude: 10; }
+ speed: AngledDirection { angle: -90; angleVariation: 360; magnitude: 5; }
}
diff --git a/samegame/SameGame.qml b/samegame/SameGame.qml
index f6356ea..0297f72 100644
--- a/samegame/SameGame.qml
+++ b/samegame/SameGame.qml
@@ -40,7 +40,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.particles 2.0
+import QtQuick.Particles 2.0
import "SamegameCore"
import "SamegameCore/samegame.js" as Logic
@@ -78,27 +78,27 @@ Rectangle {
}
Item{
ParticleSystem{ id: particleSystem; }
- ColoredParticle {
+ ImageParticle {
system: particleSystem
particles: ["red"]
color: Qt.darker("red");//Actually want desaturated...
- image: "SamegameCore/pics/particle.png"
+ source: "SamegameCore/pics/particle.png"
colorVariation: 0.4
alpha: 0.1
}
- ColoredParticle {
+ ImageParticle {
system: particleSystem
particles: ["green"]
color: Qt.darker("green");//Actually want desaturated...
- image: "SamegameCore/pics/particle.png"
+ source: "SamegameCore/pics/particle.png"
colorVariation: 0.4
alpha: 0.1
}
- ColoredParticle {
+ ImageParticle {
system: particleSystem
particles: ["blue"]
color: Qt.darker("blue");//Actually want desaturated...
- image: "SamegameCore/pics/particle.png"
+ source: "SamegameCore/pics/particle.png"
colorVariation: 0.4
alpha: 0.1
}