diff options
Diffstat (limited to 'demos')
24 files changed, 213 insertions, 133 deletions
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml index 62c3397f08..46827ae3bb 100644 --- a/demos/declarative/flickr/content/ImageDetails.qml +++ b/demos/declarative/flickr/content/ImageDetails.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Flipable { id: container @@ -57,6 +57,8 @@ Flipable { property int rating: 2 property variant prevScale: 1.0 + property int flipDuration: 1600 + signal closed transform: Rotation { @@ -137,94 +139,172 @@ Flipable { slider.value = prevScale; } if (inBackState && bigImage.status == Image.Ready) - particleBox.imageInAnim(); + effectBox.imageInAnim(); } property bool inBackState: false onInBackStateChanged:{ if(inBackState && bigImage.status == Image.Ready) - particleBox.imageInAnim(); + effectBox.imageInAnim(); else if (!inBackState && bigImage.status == Image.Ready) - particleBox.imageOutAnim(); + effectBox.imageOutAnim(); } } + ShaderEffectSource{ + id: pictureSource + sourceItem: bigImage + smooth: true + //Workaround: Doesn't work below lines + width: bigImage.width + height: bigImage.width + visible: false + } + Turbulence{//only fill visible rect + id: turbulence + system: imageSystem + anchors.fill: parent + frequency: 100 + strength: 250 + active: false + } Item{ - id: particleBox + id: effectBox width: bigImage.width * bigImage.scale height: bigImage.height * bigImage.scale anchors.centerIn: parent - function imageInAnim(){ - cp.visible = true; - pixAffect.onceOff = false; bigImage.visible = false; + noiseIn.visible = true; endEffectTimer.start(); - pixelEmitter.pulse(1); } function imageOutAnim(){ - cp.visible = true; - pixAffect.onceOff = true; bigImage.visible = false; + noiseIn.visible = false; turbulence.active = true; endEffectTimer.start(); pixelEmitter.burst(2048); } Timer{ id: endEffectTimer - interval: 1000 + interval: flipDuration repeat: false running: false onTriggered:{ - bigImage.visible = true; turbulence.active = false; - cp.visible = false; + noiseIn.visible = false; + bigImage.visible = true; } } - ParticleSystem{ - id: imageSystem - } - ColoredParticle{ - id: cp - system: imageSystem - color: "gray" - alpha: 1 - image: "images/squareParticle.png" - colorVariation: 0 - } - Picture{ - id: pixAffect - system: imageSystem + ShaderEffectItem{ + id: noiseIn anchors.fill: parent - image: container.photoUrl; - onceOff: true - } - Turbulence{ - id: turbulence - system: imageSystem - anchors.fill: parent - frequency: 100 - strength: 250 - active: false + property real t: 0 + visible: false + onVisibleChanged: tAnim.start() + NumberAnimation{ + id: tAnim + target: noiseIn + property: "t" + from: 0.0 + to: 1.0 + duration: flipDuration + } + property variant source: pictureSource + property variant noise: ShaderEffectSource{ + sourceItem:Image{ + source: "images/noise.png" + } + hideSource: true + smooth: false + } + fragmentShader:" + uniform sampler2D noise; + uniform sampler2D source; + uniform highp float t; + uniform lowp float qt_Opacity; + varying highp vec2 qt_TexCoord0; + void main(){ + //Want to use noise2, but it always returns (0,0)? + if(texture2D(noise, qt_TexCoord0).w <= t) + gl_FragColor = texture2D(source, qt_TexCoord0) * qt_Opacity; + else + gl_FragColor = vec4(0.,0.,0.,0.); + } + " } - TrailEmitter{ - id: pixelEmitter0 - system: imageSystem - height: parent.height - particleSize: 4 - particleDuration: 1000 - particlesPerSecond: 4096 - speed: PointVector{x: 360; xVariation: 8; yVariation: 4} - emitting: false + ParticleSystem{ + id: imageSystem } - TrailEmitter{ + Emitter{ id: pixelEmitter system: imageSystem - anchors.fill: parent + //anchors.fill: parent + width: Math.min(bigImage.width * bigImage.scale, flickable.width); + height: Math.min(bigImage.height * bigImage.scale, flickable.height); + anchors.centerIn: parent particleSize: 4 - particleDuration: 1000 + particleDuration: flipDuration particlesPerSecond: 2048 emitting: false } + CustomParticle{ + id: blowOut + system: imageSystem + property real maxWidth: effectBox.width + property real maxHeight: effectBox.height + vertexShader:" + attribute highp vec2 vPos; + attribute highp vec2 vTex; + attribute highp vec4 vData; // x = time, y = lifeSpan, z = size, w = endSize + attribute highp vec4 vVec; // x,y = constant speed, z,w = acceleration + attribute highp float r; + + uniform highp float maxWidth; + uniform highp float maxHeight; + + uniform highp mat4 qt_ModelViewProjectionMatrix; + uniform highp float timestamp; + uniform lowp float qt_Opacity; + + varying highp vec2 fTex2; + varying lowp float fFade; + + void main() { + fTex2 = vec2(vPos.x / maxWidth, vPos.y / maxHeight); + highp float size = vData.z; + highp float endSize = vData.w; + + highp float t = (timestamp - vData.x) / vData.y; + + highp float currentSize = mix(size, endSize, t * t); + + if (t < 0. || t > 1.) + currentSize = 0.; + + highp vec2 pos = vPos + - currentSize / 2. + currentSize * vTex // adjust size + + vVec.xy * t * vData.y // apply speed vector.. + + 0.5 * vVec.zw * pow(t * vData.y, 2.); + + gl_Position = qt_ModelViewProjectionMatrix * vec4(pos.x, pos.y, 0, 1); + + highp float fadeIn = min(t * 10., 1.); + highp float fadeOut = 1. - max(0., min((t - 0.75) * 4., 1.)); + + fFade = 1.0;//fadeIn * fadeOut * qt_Opacity; + } + " + property variant pictureTexture: pictureSource + fragmentShader: " + uniform sampler2D pictureTexture; + varying highp vec2 fTex2; + varying highp float fFade; + void main() { + gl_FragColor = texture2D(pictureTexture, fTex2) * fFade; + }" + } + + } } @@ -268,7 +348,7 @@ Flipable { transitions: Transition { SequentialAnimation { PropertyAction { target: bigImage; property: "smooth"; value: false } - NumberAnimation { easing.type: Easing.InOutQuad; properties: "angle"; duration: 1000 } + NumberAnimation { easing.type: Easing.InOutQuad; properties: "angle"; duration: flipDuration } PropertyAction { target: bigImage; property: "smooth"; value: !flickable.movingVertically } } } diff --git a/demos/declarative/flickr/content/Progress.qml b/demos/declarative/flickr/content/Progress.qml index d403feebd1..30142b4e29 100644 --- a/demos/declarative/flickr/content/Progress.qml +++ b/demos/declarative/flickr/content/Progress.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item{ id: container @@ -59,17 +59,17 @@ Item{ running: container.visible id: barSys } - ColoredParticle{ + ImageParticle{ color: "lightsteelblue" alpha: 0.1 colorVariation: 0.05 image: "images/particle.png" system: barSys } - TrailEmitter{ + Emitter{ y: 2; height: parent.height-4; x: 2; width: Math.max(parent.width * progress - 4, 0); - speed: AngleVector{ angleVariation: 180; magnitudeVariation: 12 } + speed: AngledDirection{ angleVariation: 180; magnitudeVariation: 12 } system: barSys particlesPerSecond: width; particleDuration: 1000 diff --git a/demos/declarative/flickr/content/StreamView.qml b/demos/declarative/flickr/content/StreamView.qml index 26a3f35e63..22e7d5dcd2 100644 --- a/demos/declarative/flickr/content/StreamView.qml +++ b/demos/declarative/flickr/content/StreamView.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item{ id: container @@ -52,7 +52,7 @@ Item{ anchors.fill:parent overwrite: false } - DataParticle{ + ModelParticle{ id: mp fade: false system: sys @@ -66,35 +66,35 @@ Item{ } } property real emitterSpacing: parent.width/3 - TrailEmitter{ + Emitter{ system: sys width: emitterSpacing - 64 x: emitterSpacing*0 + 32 y: -128 height: 32 - speed: PointVector{ y: (container.height + 128)/12 } + speed: PointDirection{ y: (container.height + 128)/12 } particlesPerSecond: 0.4 particleDuration: 1000000//eventually -1 should mean a million seconds for neatness maxParticles: 15 } - TrailEmitter{ + Emitter{ system: sys width: emitterSpacing - 64 x: emitterSpacing*1 + 32 y: -128 height: 32 - speed: PointVector{ y: (container.height + 128)/12 } + speed: PointDirection{ y: (container.height + 128)/12 } particlesPerSecond: 0.4 particleDuration: 1000000//eventually -1 should mean a million seconds for neatness maxParticles: 15 } - TrailEmitter{ + Emitter{ system: sys width: emitterSpacing - 64 x: emitterSpacing*2 + 32 y: -128 height: 32 - speed: PointVector{ y: (container.height + 128)/12 } + speed: PointDirection{ y: (container.height + 128)/12 } particlesPerSecond: 0.4 particleDuration: 1000000//eventually -1 should mean a million seconds for neatness maxParticles: 15 diff --git a/demos/declarative/flickr/content/UnifiedDelegate.qml b/demos/declarative/flickr/content/UnifiedDelegate.qml index aaf4ccbd7a..f4c926763f 100644 --- a/demos/declarative/flickr/content/UnifiedDelegate.qml +++ b/demos/declarative/flickr/content/UnifiedDelegate.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Package { function photoClicked() { diff --git a/demos/declarative/flickr/content/images/noise.png b/demos/declarative/flickr/content/images/noise.png Binary files differnew file mode 100644 index 0000000000..abc3c18d5f --- /dev/null +++ b/demos/declarative/flickr/content/images/noise.png diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index 8543692998..b7ab19d791 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 import "content" Item { @@ -56,7 +56,7 @@ Item { id: bgParticles startTime: 16000 } - ColoredParticle { + ImageParticle { particles: ["trail"] image: "content/images/particle.png" color: "#1A1A6F" @@ -65,12 +65,12 @@ Item { blueVariation: 0.8 system: bgParticles } - TrailEmitter { + Emitter { particle: "drops" width: parent.width particlesPerSecond: 0.5 particleDuration: 20000 - speed: PointVector{ + speed: PointDirection{ y: {screen.height/18} } system: bgParticles @@ -87,7 +87,7 @@ Item { anchors.fill: parent emissionWidth: 16 emissionHeight: 16 - emissionShape: Ellipse{} + emissionShape: EllipseShape{} } VisualDataModel{ diff --git a/demos/declarative/minehunt/MinehuntCore/Explosion.qml b/demos/declarative/minehunt/MinehuntCore/Explosion.qml index 33eabf033c..668d7b1a19 100644 --- a/demos/declarative/minehunt/MinehuntCore/Explosion.qml +++ b/demos/declarative/minehunt/MinehuntCore/Explosion.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 1.0 -import Qt.labs.particles 1.0 +import QtQuick.Particles 1.0 Item { property bool explode : false diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml index 9fcd68b1ff..c6b3e1b577 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml +++ b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml @@ -85,7 +85,7 @@ Component { anchors.centerIn: parent; anchors.verticalCenterOffset: -30 path: Path { PathAttribute { name: 'z'; value: 9999.0 } - PathLine { x: 1; y: 1 } + PathLineShape { x: 1; y: 1 } PathAttribute { name: 'z'; value: 0.0 } } } diff --git a/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml b/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml index 8d36cdfb13..fb30cd008b 100644 --- a/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml +++ b/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item { id: container @@ -53,14 +53,14 @@ Item { width: 24 height: 24 - TrailEmitter{ + Emitter{ id: visualization particle: "blaster" system: container.system emitting: show anchors.fill: parent - shape: Ellipse{} - speed: DirectedVector{ targetX: width/2; targetY: width/2; magnitude: -1; proportionalMagnitude: true} + shape: EllipseShape{} + speed: TargetedDirection{ targetX: width/2; targetY: width/2; magnitude: -1; proportionalMagnitude: true} particleDuration: 1000 particlesPerSecond: 64 @@ -112,7 +112,7 @@ Item { rofTimer.repeat = false; } } - TrailEmitter{ + Emitter{ id: emitter particle: "blaster" emitting: false @@ -125,7 +125,7 @@ Item { particleSize: 24 particleEndSize:16 particleSizeVariation: 8 - speed: DirectedVector{ + speed: TargetedDirection{ id: blastVector targetX: target.x; targetY: target.y; magnitude: 1.1; proportionalMagnitude: true } diff --git a/demos/declarative/plasmapatrol/content/CannonHardpoint.qml b/demos/declarative/plasmapatrol/content/CannonHardpoint.qml index d9a307cc64..fd49e4dd6d 100644 --- a/demos/declarative/plasmapatrol/content/CannonHardpoint.qml +++ b/demos/declarative/plasmapatrol/content/CannonHardpoint.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item { id: container @@ -49,7 +49,7 @@ Item { width: 24 height: 24 - TrailEmitter{ + Emitter{ id: visualization particle: "cannon" emitting: container.show @@ -78,7 +78,7 @@ Item { } emitter.burst(1); } - TrailEmitter{ + Emitter{ id: emitter particle: "cannon" emitting: false @@ -89,7 +89,7 @@ Item { particlesPerSecond: 1 particleSize: 8 particleEndSize: 4 - speed: DirectedVector{ + speed: TargetedDirection{ id: blastVector targetX: target.x; targetY: target.y; magnitude: 1.1; proportionalMagnitude: true } diff --git a/demos/declarative/plasmapatrol/content/ChoiceBox.qml b/demos/declarative/plasmapatrol/content/ChoiceBox.qml index 6bdc4288ee..1e64a76225 100644 --- a/demos/declarative/plasmapatrol/content/ChoiceBox.qml +++ b/demos/declarative/plasmapatrol/content/ChoiceBox.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item{ id: container diff --git a/demos/declarative/plasmapatrol/content/Cruiser.qml b/demos/declarative/plasmapatrol/content/Cruiser.qml index 8b8073328e..71af0abffa 100644 --- a/demos/declarative/plasmapatrol/content/Cruiser.qml +++ b/demos/declarative/plasmapatrol/content/Cruiser.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item { id: container @@ -54,7 +54,7 @@ Item { property int gunType: 0 width: 128 height: 128 - TrailEmitter{ + Emitter{ //TODO: Cooler would be an 'orbiting' affector //TODO: On the subject, opacity and size should be grouped type 'overLife' if we can cram that in the particles system: container.system @@ -62,7 +62,7 @@ Item { anchors.centerIn: parent width: 64 height: 64 - shape: Ellipse{} + shape: EllipseShape{} particlesPerSecond: hp > 0 ? hp * 1 + 20 : 0 particleDuration: 2400 @@ -72,13 +72,13 @@ Item { particleSizeVariation: 16 particleEndSize: 16 - speed: AngleVector{angleVariation:360; magnitudeVariation: 32} + speed: AngledDirection{angleVariation:360; magnitudeVariation: 32} } - TrailEmitter{ + Emitter{ system: container.system particle: "cruiserArmor" anchors.fill: parent - shape: Ellipse{ fill: false } + shape: EllipseShape{ fill: false } emitting: hp>0 particlesPerSecond: 16 diff --git a/demos/declarative/plasmapatrol/content/Frigate.qml b/demos/declarative/plasmapatrol/content/Frigate.qml index 54f629268f..f18de0154a 100644 --- a/demos/declarative/plasmapatrol/content/Frigate.qml +++ b/demos/declarative/plasmapatrol/content/Frigate.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item { id: container @@ -54,7 +54,7 @@ Item { property int gunType: 0 width: 128 height: 128 - TrailEmitter{ + Emitter{ system: container.system particle: "frigateShield" anchors.centerIn: parent @@ -63,13 +63,13 @@ Item { particleDuration: 4800 emitting: hp > 0 } - TrailEmitter{ + Emitter{ system: container.system particle: container.shipParticle anchors.centerIn: parent width: 64 height: 16 - shape: Ellipse{} + shape: EllipseShape{} particleSize: 16 particleSizeVariation: 8 diff --git a/demos/declarative/plasmapatrol/content/Hardpoint.qml b/demos/declarative/plasmapatrol/content/Hardpoint.qml index 184c750a79..3d4edb38f8 100644 --- a/demos/declarative/plasmapatrol/content/Hardpoint.qml +++ b/demos/declarative/plasmapatrol/content/Hardpoint.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item { id: container diff --git a/demos/declarative/plasmapatrol/content/HelpScreens.qml b/demos/declarative/plasmapatrol/content/HelpScreens.qml index 8896aeee4a..7e4fb9f1c9 100644 --- a/demos/declarative/plasmapatrol/content/HelpScreens.qml +++ b/demos/declarative/plasmapatrol/content/HelpScreens.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 SequentialLoader { id: hLdr diff --git a/demos/declarative/plasmapatrol/content/LaserHardpoint.qml b/demos/declarative/plasmapatrol/content/LaserHardpoint.qml index d6d470a15b..3705d29287 100644 --- a/demos/declarative/plasmapatrol/content/LaserHardpoint.qml +++ b/demos/declarative/plasmapatrol/content/LaserHardpoint.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item { id: container @@ -49,14 +49,14 @@ Item { width: 24 height: 24 - TrailEmitter{ + Emitter{ id: visualization particle: "laser" system: container.system anchors.fill: parent emitting: container.show - shape: Ellipse{} - speed: DirectedVector{ targetX: width/2; targetY: width/2; magnitude: -1; proportionalMagnitude: true } + shape: EllipseShape{} + speed: TargetedDirection{ targetX: width/2; targetY: width/2; magnitude: -1; proportionalMagnitude: true } particleDuration: 1000 particlesPerSecond: 64 @@ -84,7 +84,7 @@ Item { emitter.pulse(0.10); // console.log("Fire box: " + Math.min(container.width/2, target.x) + "," + Math.min(container.height/2, target.y) + " " + (Math.max(container.width/2, target.x) - Math.min(container.width/2, target.x)) + "," + (Math.max(container.height/2, target.y) - Math.min(container.height/2, target.y))); } - TrailEmitter{ + Emitter{ id: emitter particle: "laser" emitting: false @@ -93,7 +93,7 @@ Item { width: Math.max(container.width/2, target.x) - x; y: Math.min(container.height/2, target.y); height: Math.max(container.height/2, target.y) - y; - shape: Line{ + shape: LineShape{ mirrored: (emitter.y < 0 || emitter.x < 0) && !(emitter.y < 0 && emitter.x < 0 )//I just want XOR } @@ -103,6 +103,6 @@ Item { particleSize: 16 particleEndSize: 0 - speed: PointVector{xVariation: 4; yVariation: 4} + speed: PointDirection{xVariation: 4; yVariation: 4} } } diff --git a/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml b/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml index 7a6fcb96d0..26d5f21359 100644 --- a/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml +++ b/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml @@ -39,11 +39,11 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item{ property ParticleSystem sys - ColoredParticle{ + ImageParticle{ system: sys particles: ["default"] image: "pics/blur-circle3.png" @@ -51,7 +51,7 @@ Item{ colorVariation: 0.1 z: 0 } - ColoredParticle{ + ImageParticle{ system: sys particles: ["redTeam"] image: "pics/blur-circle3.png" @@ -59,7 +59,7 @@ Item{ colorVariation: 0.1 z: 0 } - ColoredParticle{ + ImageParticle{ system: sys particles: ["greenTeam"] image: "pics/blur-circle3.png" @@ -67,7 +67,7 @@ Item{ colorVariation: 0.1 z: 0 } - ColoredParticle{ + ImageParticle{ system: sys particles: ["blaster"] image: "pics/star2.png" @@ -76,7 +76,7 @@ Item{ colorVariation: 0.2 z: 2 } - ColoredParticle{ + ImageParticle{ system: sys particles: ["laser"] image: "pics/star3.png" @@ -85,7 +85,7 @@ Item{ colorVariation: 0.2 z: 2 } - ColoredParticle{ + ImageParticle{ system: sys particles: ["cannon"] image: "pics/particle.png" @@ -93,7 +93,7 @@ Item{ colorVariation: 0.1 z: 2 } - ColoredParticle{ + ImageParticle{ system: sys particles: ["cannonCore"] image: "pics/particle.png" @@ -101,7 +101,7 @@ Item{ colorVariation: 0.8 z: 1 } - ColoredParticle{ + ImageParticle{ system: sys particles: ["cannonWake"] image: "pics/star.png" @@ -109,7 +109,7 @@ Item{ colorVariation: 0.2 z: 1 } - ColoredParticle{ + ImageParticle{ system: sys particles: ["frigateShield"] image: "pics/blur-circle2.png" @@ -119,7 +119,7 @@ Item{ greenVariation: 0.1 z: 3 } - SpriteParticle{ + ImageParticle{ system: sys particles: ["cruiserArmor"] z: 1 @@ -150,7 +150,7 @@ Item{ follow: "cannon" particlesPerParticlePerSecond: 64 particleDuration: 600 - speed: AngleVector{ angleVariation: 360; magnitude: 48} + speed: AngledDirection{ angleVariation: 360; magnitude: 48} particleSize: 16 particleEndSize: 8 particleSizeVariation: 2 diff --git a/demos/declarative/plasmapatrol/content/Ship.qml b/demos/declarative/plasmapatrol/content/Ship.qml index 0ccea94221..ce8fb6073f 100644 --- a/demos/declarative/plasmapatrol/content/Ship.qml +++ b/demos/declarative/plasmapatrol/content/Ship.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item { id: me diff --git a/demos/declarative/plasmapatrol/content/Sloop.qml b/demos/declarative/plasmapatrol/content/Sloop.qml index 1b9bce7333..20b60c5621 100644 --- a/demos/declarative/plasmapatrol/content/Sloop.qml +++ b/demos/declarative/plasmapatrol/content/Sloop.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item { id: container @@ -55,19 +55,19 @@ Item { property int gunType: 0 width: 128 height: 128 - TrailEmitter{ + Emitter{ id: emitter //TODO: Cooler would be an 'orbiting' affector //TODO: On the subject, opacity and size should be grouped type 'overLife' if we can cram that in the particles system: container.system particle: container.shipParticle - shape: Ellipse{} + shape: EllipseShape{} particlesPerSecond: hp > 0 ? hp + 20 : 0 particleDuration: blinkInterval maxParticles: (maxHP + 20) - acceleration: AngleVector{angleVariation: 360; magnitude: 8} + acceleration: AngledDirection{angleVariation: 360; magnitude: 8} particleSize: 24 particleEndSize: 4 diff --git a/demos/declarative/plasmapatrol/plasmapatrol.qml b/demos/declarative/plasmapatrol/plasmapatrol.qml index 3a7b217618..c490dfd322 100644 --- a/demos/declarative/plasmapatrol/plasmapatrol.qml +++ b/demos/declarative/plasmapatrol/plasmapatrol.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 import "content" Rectangle { @@ -93,18 +93,18 @@ Rectangle { id: title width: root.width height: 240 - TrailEmitter{ + Emitter{ anchors.fill: parent system: particles emitting: true particle: "default" particlesPerSecond: 1200 particleDuration: 1200 - shape: Mask{source:"content/pics/TitleText.png"} + shape: MaskShape{source:"content/pics/TitleText.png"} particleSize: 16 particleEndSize: 0 particleSizeVariation: 8 - speed: AngleVector{angleVariation:360; magnitudeVariation: 6} + speed: AngledDirection{angleVariation:360; magnitudeVariation: 6} } } Button{ diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/demos/declarative/samegame/SamegameCore/BoomBlock.qml index 3d11fb9df2..b234688f8e 100644 --- a/demos/declarative/samegame/SamegameCore/BoomBlock.qml +++ b/demos/declarative/samegame/SamegameCore/BoomBlock.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.particles 2.0 +import QtQuick.Particles 2.0 Item { id: block @@ -71,7 +71,7 @@ Item { Behavior on opacity { NumberAnimation { duration: 200 } } anchors.fill: parent } - TrailEmitter { + Emitter { id: particles system: particleSystem particle: { @@ -85,12 +85,12 @@ Item { } anchors.fill: parent - speed: DirectedVector{targetX: block.width/2; targetY: block.height/2; magnitude: -60; magnitudeVariation: 60} - shape: Ellipse{fill:true} + speed: TargetedDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -60; magnitudeVariation: 60} + shape: EllipseShape{fill:true} emitting: false; particleDuration: 700; particleDurationVariation: 100 particlesPerSecond: 1000 - maxParticles: 100 //only fires 0.1s bursts (still 2x old number, ColoredParticle wants less than 16000 max though) + maxParticles: 100 //only fires 0.1s bursts (still 2x old number, ImageParticle wants less than 16000 max though) particleSize: 28 particleEndSize: 14 } diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index 0defdeec3c..c547e1afa7 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/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 @@ -77,7 +77,7 @@ Rectangle { } Item{ ParticleSystem{ id: particleSystem; } - ColoredParticle { + ImageParticle { system: particleSystem particles: ["red"] color: Qt.darker("red");//Actually want desaturated... @@ -85,7 +85,7 @@ Rectangle { colorVariation: 0.4 alpha: 0.1 } - ColoredParticle { + ImageParticle { system: particleSystem particles: ["green"] color: Qt.darker("green");//Actually want desaturated... @@ -93,7 +93,7 @@ Rectangle { colorVariation: 0.4 alpha: 0.1 } - ColoredParticle { + ImageParticle { system: particleSystem particles: ["blue"] color: Qt.darker("blue");//Actually want desaturated... diff --git a/demos/declarative/snake/content/Cookie.qml b/demos/declarative/snake/content/Cookie.qml index a076978999..6efed6a154 100644 --- a/demos/declarative/snake/content/Cookie.qml +++ b/demos/declarative/snake/content/Cookie.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 1.0 -import Qt.labs.particles 1.0 +import QtQuick.Particles 1.0 Item { id: root diff --git a/demos/declarative/snake/content/Link.qml b/demos/declarative/snake/content/Link.qml index 8c1f4866bb..4c58c4dd5c 100644 --- a/demos/declarative/snake/content/Link.qml +++ b/demos/declarative/snake/content/Link.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 1.0 -import Qt.labs.particles 1.0 +import QtQuick.Particles 1.0 Item { id:link property bool dying: false |
