Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Make qdeclarativecomponent::creation() benchmark work again
The samegame files were out of date.

Change-Id: Idf25a3c1d327ae94a76717aa7dde9a9dd15af9bb
Reviewed-on: http://codereview.qt-project.org/5193
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
  • Loading branch information
Kent Hansen authored and Qt by Nokia committed Sep 20, 2011
1 parent 940069e commit 91a16c3
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 22 deletions.
Expand Up @@ -39,20 +39,26 @@
**
****************************************************************************/

import QtQuick 1.0
import Qt.labs.particles 1.0
import QtQuick 2.0
import QtQuick.Particles 2.0

Item { id:block
Item {
id: block
property bool dying: false
property bool spawned: false
property int type: 0
property int targetX: 0
property int targetY: 0
property ParticleSystem particleSystem

SpringFollow on x { enabled: spawned; to: targetX; spring: 2; damping: 0.2 }
SpringFollow on y { to: targetY; spring: 2; damping: 0.2 }
Behavior on x {
enabled: spawned;
SpringAnimation{ spring: 2; damping: 0.2 }
}
Behavior on y {
SpringAnimation{ spring: 2; damping: 0.2 }
}

Image { id: img
Image {
id: img
source: {
if(type == 0){
"pics/redStone.png";
Expand All @@ -66,30 +72,39 @@ Item { id:block
Behavior on opacity { NumberAnimation { duration: 200 } }
anchors.fill: parent
}

Particles { id: particles
width:1; height:1; anchors.centerIn: parent;
emissionRate: 0;
lifeSpan: 700; lifeSpanDeviation: 600;
angle: 0; angleDeviation: 360;
velocity: 100; velocityDeviation:30;
source: {
Emitter {
id: particles
system: particleSystem
group: {
if(type == 0){
"pics/redStar.png";
"red";
} else if (type == 1) {
"pics/blueStar.png";
"blue";
} else {
"pics/greenStar.png";
"green";
}
}
anchors.fill: parent

speed: TargetDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -60; magnitudeVariation: 60}
shape: EllipseShape{fill:true}
enabled: false;
lifeSpan: 700; lifeSpanVariation: 100
emitRate: 1000
maximumEmitted: 100 //only fires 0.1s bursts (still 2x old number)
size: 28
endSize: 14
}

states: [
State{ name: "AliveState"; when: spawned == true && dying == false
State {
name: "AliveState"; when: spawned == true && dying == false
PropertyChanges { target: img; opacity: 1 }
},
State{ name: "DeathState"; when: dying == true
StateChangeScript { script: particles.burst(50); }

State {
name: "DeathState"; when: dying == true
StateChangeScript { script: particles.pulse(0.1); }
PropertyChanges { target: img; opacity: 0 }
StateChangeScript { script: block.destroy(1000); }
}
Expand Down
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 91a16c3

Please sign in to comment.