diff options
Diffstat (limited to 'demos/declarative/plasmapatrol/content')
11 files changed, 47 insertions, 47 deletions
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 |