From 91a16c3a6db8ac4cfe6779a0b2d95097377dd04f Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Tue, 20 Sep 2011 08:30:29 +0200 Subject: 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 Reviewed-by: Aaron Kennedy --- .../data/samegame/BoomBlock.qml | 59 +++++++++++++-------- .../data/samegame/pics/blueStar.png | Bin 278 -> 0 bytes .../data/samegame/pics/blueStone.png | Bin 2691 -> 3054 bytes .../data/samegame/pics/greenStar.png | Bin 273 -> 0 bytes .../data/samegame/pics/greenStone.png | Bin 2662 -> 2932 bytes .../data/samegame/pics/redStar.png | Bin 274 -> 0 bytes .../data/samegame/pics/redStone.png | Bin 2604 -> 2902 bytes .../data/samegame/pics/yellowStone.png | Bin 2667 -> 3056 bytes 8 files changed, 37 insertions(+), 22 deletions(-) delete mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStar.png delete mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStar.png delete mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStar.png (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml index 75538e9e61..ebc38f6b65 100644 --- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml +++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml @@ -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"; @@ -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); } } diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStar.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStar.png deleted file mode 100644 index ff9588f80a..0000000000 Binary files a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStar.png and /dev/null differ diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStone.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStone.png index bf342e0362..20e43c75b6 100644 Binary files a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStone.png and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStone.png differ diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStar.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStar.png deleted file mode 100644 index cd06854719..0000000000 Binary files a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStar.png and /dev/null differ diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStone.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStone.png index 5ac14a5a81..b568a1900c 100644 Binary files a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStone.png and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStone.png differ diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStar.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStar.png deleted file mode 100644 index 0a4dffe583..0000000000 Binary files a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStar.png and /dev/null differ diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStone.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStone.png index b099f6007a..36b09a2686 100644 Binary files a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStone.png and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStone.png differ diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/yellowStone.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/yellowStone.png index c56124a895..b1ce76212c 100644 Binary files a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/yellowStone.png and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/yellowStone.png differ -- cgit v1.2.3